summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | Merge branch 'rs-redactor-filter' into 'master' Douwe Maan2015-10-171-5/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Separate rendering of Markdown reference links from redacting those the user doesn't have access to and extracting referenced objects Related: !1014 See merge request !1090
| * \ \ \ \ \ \ \ Merge branch 'master' into rs-redactor-filterrs-redactor-filterDouwe Maan2015-10-165-5/+30
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| * | | | | | | | Merge branch 'master' into rs-redactor-filterDouwe Maan2015-10-153-17/+17
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | / | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Pass project to RedactorFilterDouwe Maan2015-10-131-2/+2
| | | | | | | |
| * | | | | | | Refactor reference gathering to use a dedicated filterDouwe Maan2015-10-071-3/+8
| | | | | | | |
| * | | | | | | Return strings where expectedDouwe Maan2015-10-071-2/+2
| | | | | | | |
| * | | | | | | Merge branch 'master' into rs-redactor-filterDouwe Maan2015-10-0723-67/+381
| |\ \ \ \ \ \ \
| * | | | | | | | Basic support for an Atom-specific rendering pipelineRobert Speicher2015-09-031-4/+6
| | | | | | | | |
| * | | | | | | | Return early from markdown and gfm when text is emptyRobert Speicher2015-09-031-0/+4
| | | | | | | | |
| * | | | | | | | Add post_process method to Gitlab::MarkdownRobert Speicher2015-09-011-2/+4
| | | | | | | | |
| * | | | | | | | Remove `current_user` context from markdown and gfm helpersRobert Speicher2015-09-011-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These helpers are no longer dependent on the current user state. Hooray!
* | | | | | | | | Hide Builds tab is GitLab CI is not enabledhide-builds-tabDmitriy Zaporozhets2015-10-171-1/+1
| |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | Merge branch 'filter-label' into 'master' Robert Speicher2015-10-161-5/+13
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | Allow dashboard and group issues/MRs to be filtered by label See merge request !1591
| * | | | | | | Allow dashboard and group issues/MRs to be filtered by labelDouwe Maan2015-10-141-5/+13
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Make the builds view and warning notice nicerKamil Trzcinski2015-10-151-1/+1
| | | | | | |
* | | | | | | Merge branch 'view-issue-performance'Dmitriy Zaporozhets2015-10-152-4/+8
|\ \ \ \ \ \ \
| * | | | | | | Re-use User for avatars in link_to_memberYorick Peterse2015-10-151-1/+1
| | | | | | | |
| * | | | | | | Allow avatar_icon to operate on a UserYorick Peterse2015-10-151-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the User object is already known before calling this method being able to re-use said object can save us an extra SQL query.
* | | | | | | | Merge branch 'builds-view' into 'master' Kamil Trzciński2015-10-153-0/+21
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added builds view ![Screen_Shot_2015-10-13_at_19.02.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/95bb3a7d9d603678fdd077558637045d/Screen_Shot_2015-10-13_at_19.02.48.png) /cc @dzaporozhets @vsizov See merge request !1593
| * | | | | | | Added builds viewKamil Trzcinski2015-10-143-0/+21
| |/ / / / / /
* | | | | | | Simplify the `issues_sentence` helperrs-issues_sentenceRobert Speicher2015-10-141-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Fix warning signshow_pending_warningKamil Trzcinski2015-10-141-1/+1
| | | | | |
* | | | | | Show warning if build doesn't have runners with specified tags or runners ↵Kamil Trzcinski2015-10-141-15/+11
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | didn't connect recently Slightly refactor runner status detection: moving it to Runner class Signed-off-by: Kamil Trzcinski <ayufan@ayufan.eu>
* | | | | Restore placeholders in issue filters from "Any" to "Milestone" and "Label"Stan Hu2015-10-082-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | 1f11096c included new filters but made it hard to determine which dropdown did what. This patch restores the original placeholders.
* | | | | Support filtering by "Any" milestone or issue and fix "No Milestone" and "No ↵Stan Hu2015-10-071-1/+3
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Label" filters Closes #2619 Closes https://github.com/gitlabhq/gitlabhq/issues/9631
* | | | Fix ci build routing and few testsci-build-pageDmitriy Zaporozhets2015-10-061-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Cleanup CI code after refactoring and fix several 500 errorsDmitriy Zaporozhets2015-10-062-24/+4
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Link ci_status_path to new ci commit pageci-commit-pageDmitriy Zaporozhets2015-10-061-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'user-preferences-layout-option' of ↵Dmitriy Zaporozhets2015-10-052-1/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/gopeter/gitlabhq into gopeter-user-preferences-layout-option Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | improved code style and layout option namingPeter Göbel2015-10-052-3/+3
| | | | |
| * | | | added user preference to change layout widthPeter Göbel2015-10-052-1/+8
| | | | |
* | | | | Fix next round of testsKamil Trzcinski2015-10-051-4/+0
| | | | |
* | | | | Refactor commit and buildKamil Trzcinski2015-10-053-3/+3
|/ / / /
* | | | Merge remote-tracking branch 'upstream/master'Guilherme Garnier2015-10-031-1/+1
|\ \ \ \
| * | | | Update README cache key to use full project namespaceStan Hu2015-10-021-1/+1
| | | | |
* | | | | Fix rubocop warnings in appGuilherme Garnier2015-10-031-1/+1
|/ / / /
* | | | Merge pull request #9684 from NKMR6194/masterStan Hu2015-10-011-1/+1
|\ \ \ \ | | | | | | | | | | Fix link with emoji
| * | | | Fix link with emojiSAKATA Sinji2015-10-021-1/+1
| | | | |
* | | | | Fix 500 error on compare pagefix-500-compareDmitriy Zaporozhets2015-10-011-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Include full path of source and target branch names in New Merge Request pageStan Hu2015-09-301-0/+13
|/ / / / | | | | | | | | | | | | | | | | | | | | Previous title would only show the group name, which could be confusing. Closes #2875
* | | | Merge branch 'fix-removed-file-in-diff' into 'master' Dmitriy Zaporozhets2015-09-301-0/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug when removed file was not appearing in merge request diff Finally we can see removed files in merge request diff :sparkles: Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes #2533 See merge request !1471
| * | | | Fix bug when removed file was not appearing in merge request diffDmitriy Zaporozhets2015-09-301-0/+19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Refactor CI helpersDmitriy Zaporozhets2015-09-2911-141/+92
|/ / / / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Move CI project settings page to CE project settings areamove-ci-settingsDmitriy Zaporozhets2015-09-291-2/+2
| |/ / |/| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'krb_auth_helper_ce' into 'master' Douwe Maan2015-09-291-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove 'kerberos' from auth_helper.rb for gitlab-CE. There is no Kerberos auth in gitlab-ce, so it shouldn't be noted as a form-driven auth mechanism in app/helpers/auth_helper.rb. This breaks using Kerberos as a custom omniauth provider. See issue #2510 (https://gitlab.com/gitlab-org/gitlab-ce/issues/2510). @DouweM suggested I send in this merge request. See merge request !1430
| * | | Remove 'kerberos' from auth_helper.rb for gitlab-CE.Ben Rosser2015-09-241-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | There is no Kerberos auth in gitlab-ce, so it shouldn't be noted as a form-driven auth mechanism in app/helpers/auth_helper.rb. This breaks using Kerberos as a custom omniauth provider. See issue #2510
* | | Merge branch 'move-runners-page'Dmitriy Zaporozhets2015-09-281-0/+8
|\ \ \
| * | | Move runners page to project settingsDmitriy Zaporozhets2015-09-251-0/+8
| |/ / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Add user preference to view project activity and starred project activity as ↵Stan Hu2015-09-261-1/+3
|/ / | | | | | | | | | | default dashboard Closes #2662
* | Merge branch 'remove-routes-helper' into 'master' Dmitriy Zaporozhets2015-09-241-29/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix Slack notification URL and remove the usage of Ci::RoutesHelper Fix for #2644 /cc @dzaporozhets @rspeicher See merge request !1391
View Lorry Controller Status