summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '34758-deployment-cluster' into 'master'Kamil Trzciński2018-12-051-2/+6
|\
| * Unify into :group_clusters feature flagThong Kuah2018-12-051-2/+6
* | Rename project's pipelines relationFrancisco Javier López2018-12-053-7/+7
* | Merge branch 'osw-fix-grouping-by-file-path' into 'master'Nick Thomas2018-12-051-5/+2
|\ \
| * | Avoid 500's when serializing legacy diff notesosw-fix-grouping-by-file-pathOswaldo Ferreira2018-12-041-5/+2
* | | Merge branch 'bw-serializer-tech-debit-2' into 'master'Douwe Maan2018-12-051-11/+5
|\ \ \ | |_|/ |/| |
| * | Extract code into IssueBoardEntityBrett Walker2018-12-041-11/+5
| |/
* | Merge branch 'ce-jej/group-saml-unlink-from-account' into 'master'Stan Hu2018-12-041-1/+7
|\ \
| * | Replace @user with current_user on Account pageJames Edwards-Jones2018-12-041-1/+1
| * | Backport GroupSAML unlink changesJames Edwards-Jones2018-12-041-1/+7
* | | Merge branch 'ce-7210-add-sort-direction-button-sort-dropdown' into 'master'Sean McGivern2018-12-041-1/+27
|\ \ \ | |_|/ |/| |
| * | [CE backport]Add sort direction button with sort dropdown for epicsFelipe Artur2018-12-031-1/+27
| |/
* | Merge branch 'dm-default-request-format-html' into 'master'Sean McGivern2018-12-044-49/+0
|\ \
| * | Revert "Rails5 fix format in uploads actions"Douwe Maan2018-12-031-13/+0
| * | Revert "[Rails5] Set request.format in commits_controller"Douwe Maan2018-12-031-14/+0
| * | Revert "[Rails5] Set request.format for artifacts_controller"Douwe Maan2018-12-031-9/+0
| * | Revert "[Rails5] Explicitly set request.format for blob_controller"Douwe Maan2018-12-031-13/+0
| |/
* | Merge branch 'render-text-deprecated' into 'master'Robert Speicher2018-12-035-10/+10
|\ \ | |/ |/|
| * Fix deprecation: render :text is deprecated because it does not actually rend...Jasper Maes2018-11-295-10/+10
* | Add config to disable impersonationImre Farkas2018-11-293-12/+31
|/
* Merge branch 'security-fix-uri-xss-applications' into 'master'Cindy Pallares2018-11-281-1/+1
* Merge branch 'security-fix-pat-web-access' into 'master'Cindy Pallares2018-11-2811-30/+52
* Merge branch 'security-guest-comments' into 'master'Cindy Pallares2018-11-281-0/+10
* Merge branch 'security-issue_51301' into 'master'Cindy Pallares2018-11-281-4/+17
* Merge branch 'security-private-group' into 'master'Cindy Pallares2018-11-281-0/+10
* Merge branch '50341-cleanup-useless-project-import-attributes' into 'master'Douwe Maan2018-11-281-5/+11
|\
| * Small code refactoring for condition circuit breaking50341-cleanup-useless-project-import-attributesTiago Botelho2018-11-281-1/+1
| * Removes all the irrelevant import related code and columnsTiago Botelho2018-11-271-5/+11
* | Merge branch 'rs-to_h-deprecation' into 'master'Douwe Maan2018-11-281-2/+6
|\ \
| * | Remove `options` assignment from ExtractsPathRobert Speicher2018-11-271-2/+6
| |/
* | Suggests issues when typing titlePhil Hughes2018-11-271-0/+7
|/
* Set content disposition attachment to several endpointsFrancisco Javier López2018-11-231-1/+2
* Merge branch 'rails5-deprecation-render-nothing' into 'master'Rémy Coutable2018-11-233-3/+3
|\
| * render :nothing option is deprecated, Use head method to respond with empty r...Jasper Maes2018-11-233-3/+3
* | Merge branch 'rails5-env-deprecated' into 'master'Sean McGivern2018-11-232-2/+2
|\ \ | |/ |/|
| * Rails5: env is deprecated and will be removed from Rails 5.1Jasper Maes2018-11-152-2/+2
* | Merge branch '49565-ssh-push-mirroring' into 'master'Robert Speicher2018-11-201-0/+4
|\ \
| * | SSH public-key authentication for push mirroringNick Thomas2018-11-191-0/+4
* | | Merge branch 'if-ee-726-smartcard_auth-ce_port' into 'master'Douwe Maan2018-11-191-2/+2
|\ \ \ | |/ / |/| |
| * | Backport of ee/8120: Smartcard authenticationif-ee-726-smartcard_auth-ce_portImre Farkas2018-11-181-2/+2
* | | Merge branch '52385-search-bar-for-dashboard-list' into 'master'Sean McGivern2018-11-194-29/+25
|\ \ \
| * | | Refactor whitelisting of filter paramsHeinrich Lee Yu2018-11-153-31/+23
| * | | Fix testsHeinrich Lee Yu2018-11-132-2/+5
| * | | Apply new search bar on issues and merge request dashboardsHeinrich Lee Yu2018-11-131-3/+4
| | |/ | |/|
* | | Fix enabling project deploy key for adminssh-fix-issue-53783-ceStan Hu2018-11-161-6/+5
| |/ |/|
* | Merge branch 'if-53347_fix_impersonation_tokens' into 'master'Stan Hu2018-11-151-0/+3
|\ \
| * | Display impersonation token value only after creationif-53347_fix_impersonation_tokensImre Farkas2018-11-121-0/+3
* | | Remove display of local Sidekiq process in /admin/sidekiqStan Hu2018-11-151-5/+0
* | | Remove 'comment_on_any_diff_line' feature flagosw-remove-comment-on-any-diff-line-ffOswaldo Ferreira2018-11-141-6/+1
| |/ |/|
* | Removes feature flag for ciEnvironmentsStatusChangesFilipa Lacerda2018-11-121-3/+0
View Lorry Controller Status