summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
* SubmoduleHelper - Project is not always available as an instance variable49061-submodule-helper-fixMario de la Ossa2018-07-151-4/+4
|
* Merge branch 'dz-manifest-import' into 'master'Douwe Maan2018-07-121-4/+7
|\ | | | | | | | | Add manifest import See merge request gitlab-org/gitlab-ce!20304
| * More reliable manifest parser and group-only selectorDmitriy Zaporozhets2018-07-111-4/+7
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Revert "Merge branch 'ee-5481-epic-todos' into 'master'"Jarka Kadlecová2018-07-112-22/+1
|/ | | | | This reverts commit 4d9a3f42f1fd3be21555e19872b7121cca65015e, reversing changes made to ecf9c145f6e4d170cd059df88743393d9e63c489.
* Add daylight saving time support for pipeline schedulesCollen2018-07-101-1/+1
|
* Resolve "Disable GCP free credit banner at instance level"Dennis Tang2018-07-102-0/+2
|
* Update time_helper.rb to fix output for exact minutes.Marcel Amirault2018-07-101-2/+6
|
* Use proper markdown rendering for previewsBrett Walker2018-07-063-1/+5
|
* Merge branch 'bvl-wrap-cross-project-group-permissions' into 'master'Douwe Maan2018-07-061-2/+4
|\ | | | | | | | | Create cross project group features See merge request gitlab-org/gitlab-ce!20333
| * Create cross project group featuresBob Van Landuyt2018-07-061-2/+4
| | | | | | | | | | This allows us to check specific abilities in views, while still enabling/disabling them at once.
* | Fix User role displayed on projects dashboardFrancisco Javier López2018-07-062-0/+9
|/
* Merge branch 'ee-5481-epic-todos' into 'master'Sean McGivern2018-07-042-1/+22
|\ | | | | | | | | Port of Todos for epics See merge request gitlab-org/gitlab-ce!19908
| * Move group_dropdown_label to ce helperJarka Kadlecová2018-07-041-0/+13
| |
| * More EE->CE fixesJan Provaznik2018-07-031-3/+1
| |
| * Move todo_group_options to CEJan Provaznik2018-07-031-0/+10
| |
| * Support todos for epics backportJarka Kadlecová2018-07-031-1/+1
| |
* | Merge branch 'remove-is-shared-from-ci-runners' into 'master'Grzegorz Bizon2018-07-041-1/+1
|\ \ | |/ |/| | | | | Remove the use of `is_shared` of `Ci::Runner` See merge request gitlab-org/gitlab-ce!20172
| * Remove the use of `is_shared` of `Ci::Runner`remove-is-shared-from-ci-runnersKamil Trzciński2018-06-261-1/+1
| |
* | Add `&` support for epics autocompletionKushal Pandya2018-07-021-0/+1
| |
* | Performance Improvements to Vue MR pageTim Zallmann2018-06-301-1/+1
| |
* | Fix merge requests data source key to be camelCaseKushal Pandya2018-06-271-1/+1
| |
* | Merge remote-tracking branch 'dev/master'Alessio Caiazza2018-06-251-1/+2
|\ \
| * \ Merge branch 'security-html_escape_usernames' into 'master'Alessio Caiazza2018-06-251-1/+2
| |\ \ | | |/ | |/| | | | | | | [master] HTML escape the name of the user in ProjectsHelper#link_to_member See merge request gitlab/gitlabhq!2401
| | * HTML escape the name of the user in ProjectsHelper#link_to_memberImre Farkas2018-06-151-1/+2
| | |
* | | Merge branch 'kp-make-gfm-autocomplete-configurable' into 'master'Phil Hughes2018-06-251-1/+8
|\ \ \ | | | | | | | | | | | | | | | | Make GFM Autocomplete configurable See merge request gitlab-org/gitlab-ce!20066
| * | | Add default autocomplete configKushal Pandya2018-06-251-1/+8
| |/ /
* | | Update project sidebar to work with EE feature Security DashboardOlivier Gonzalez2018-06-251-0/+8
|/ /
* | Changes tab VUE refactoringFelipe Artur2018-06-212-3/+5
| |
* | Backport code from gitlab-ee!6182Lukas Eipert2018-06-201-5/+42
| |
* | More gitaly disk access blocksJacob Vosmaer (GitLab)2018-06-201-0/+1
| |
* | Merge branch '46861-issuable-title-with-longer-username' into 'master'Clement Ho2018-06-181-1/+1
|\ \ | |/ |/| | | | | | | | | Buttons disappear on merge request page in some case Closes #46861 and #14348 See merge request gitlab-org/gitlab-ce!19176
| * Fix CSS for buttons not to be hidden on issues/MR titleTakuya Noguchi2018-06-031-1/+1
| |
* | Merge branch '47851-bump-cache-for-old-master-permission' into 'master'Dmitriy Zaporozhets2018-06-141-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Reference to master still cached" Closes #47851 See merge request gitlab-org/gitlab-ce!19827
| * | Flush cache for project list47851-bump-cache-for-old-master-permissionMark Chao2018-06-141-1/+1
| | | | | | | | | | | | For master->maintainer permission rename
* | | Invalidate cache with project details when repository is updatedrd-33733-showing-created-date-instead-of-updated-date-in-project-listsRubén Dávila2018-06-131-0/+1
|/ / | | | | | | | | The partial using this cache key was showing stale information due to the cache not being invalidated.
* | Merge branch 'fix-loading-icon' into 'master'Annabel Gray2018-06-081-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Fix loading icon in activity view Closes #47508 See merge request gitlab-org/gitlab-ce!19566
| * | Fix loading icon in activity viewfix-loading-iconClement Ho2018-06-071-1/+1
| | |
* | | Fix tasks completed headerClement Ho2018-06-071-1/+1
|/ /
* | Merge branch 'feature/customizable-favicon' into 'master'Douwe Maan2018-06-072-4/+8
|\ \ | | | | | | | | | | | | | | | | | | Customizable favicon Closes #15661 See merge request gitlab-org/gitlab-ce!14497
| * | hint the allowed image formats on favicon uploadAlexis Reigel2018-06-061-0/+7
| | |
| * | call Gitlab::Favicon.status in serializerAlexis Reigel2018-06-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | this ways we can keep the `lib/gitlab/ci/status/*` classes to return the bare favicon name as it was before. also the favicon uploader versions are now have the same names as the stock favicons (+ `favicon_` prefix), which makes working with the status names easier.
| * | extract favicon logic to lib classAlexis Reigel2018-06-052-9/+1
| | |
| * | use custom main faviconAlexis Reigel2018-06-052-0/+5
| | |
* | | Merge remote-tracking branch 'origin/master' into ↵Luke Bennett2018-06-063-7/+10
|\ \ \ | | | | | | | | | | | | 39549-label-list-page-redesign-with-draggable-labels
| * \ \ Merge branch 'blackst0ne-rails5-fix-specs-with-text-plain-charset-utf-8' ↵Rémy Coutable2018-06-061-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "[Rails5] Fix specs with "text/plain; charset=utf-8"" Closes #47378 See merge request gitlab-org/gitlab-ce!19462
| | * | | [Rails5] Fix response headers sending through workhorseblackst0ne2018-06-061-1/+1
| | | | |
| * | | | Fix invisible rows on importer statusStan Hu2018-06-061-3/+3
| |/ / /
| * | | Find and mark more Git disk access locationsJacob Vosmaer (GitLab)2018-06-051-1/+4
| | | |
| * | | Merge branch '42751-rename-mr-maintainer-push' into 'master'Robert Speicher2018-06-051-2/+2
| |\ \ \ | | |/ / | |/| | | | | | | | | | Rephrase Merge Request Maintainer Edit See merge request gitlab-org/gitlab-ce!19061
| | * | Rephrase "maintainer" to more precise "members who can merge to the target ↵42751-rename-mr-maintainer-pushMark Chao2018-06-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | branch" "Maintainer" will be freed to be used for #42751