summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'security-11-6' of dev.gitlab.org:gitlab/gitlabhq into 11-6-stableJohn Jarvis2018-12-273-3/+18
|\
| * Merge branch 'security-fix/security-group-user-removal-11-6' into 'security-1...John Jarvis2018-12-271-1/+3
| |\
| | * Merge branch 'security-11-6' into 'security-fix/security-group-user-removal-1...James Lopez2018-12-272-3/+4
| | |\
| | * | Add subresources removal to member destroy serviceJames Lopez2018-12-131-1/+3
| * | | Merge remote-tracking branch 'origin/security-48259-private-snippet-11-6' int...John Jarvis2018-12-272-2/+15
| |\ \ \ | | |_|/ | |/| |
| | * | Block private snippets from being embeddableMark Chao2018-12-202-2/+15
| | |/
* | | Merge branch 'security-11-6' of dev.gitlab.org:gitlab/gitlabhq into 11-6-stableJohn Jarvis2018-12-272-3/+4
|\ \ \ | |/ /
| * | Merge branch 'security-11-6-group-cicd-settings-accessible-to-maintainer' int...John Jarvis2018-12-271-3/+3
| |\ \
| | * | Check for group admin permissionsMatija Čupić2018-12-241-3/+3
| | |/
| * | Project guests no longer are able to see refs pageTiago Botelho2018-12-101-0/+1
| |/
* | Merge branch 'fj-fix-action-name-jobscontroller' into 'master'Rémy Coutable2018-12-181-1/+1
* | Merge branch 'fj-remove-forced-disposition-attachment-ssh-keys' into 'master'Douwe Maan2018-12-181-1/+0
* | Merge branch '55230-remove-project-cleanup-feature-flag' into 'master'Douwe Maan2018-12-181-5/+0
* | Merge branch 'remove-issue-suggestions-flag' into 'master'Douwe Maan2018-12-182-3/+2
* | Merge branch 'sh-reject-refs-with-invalid-chars' into 'master'Douwe Maan2018-12-173-6/+11
* | Merge branch '53147-utilize-new-charting-library-for-metrics-dashboard' into ...Clement Ho2018-12-171-0/+4
* | Merge branch 'osw-suggest-diff-line-change' into 'master'Phil Hughes2018-12-141-1/+9
* | Merge branch 'issue_55024' into 'master'Nick Thomas2018-12-141-0/+2
* | Merge branch '55090-fix-group-clusters-no-project-namespace' into 'master'Kamil Trzciński2018-12-111-6/+6
* | Merge branch 'cert-manager-email' into 'master'Dmitriy Zaporozhets2018-12-071-1/+1
|\ \
| * | Allows user to override default issuer email for cert managerAmit Rathi2018-12-071-1/+1
* | | Merge branch '51243-further-improvements-to-project-overview-ui' into 'master'Mike Greiling2018-12-071-3/+7
|\ \ \
| * | | Further design iteration on project overviewDennis Tang2018-12-071-3/+7
* | | | Merge branch 'store-correlation-logs' into 'master'Stan Hu2018-12-071-2/+6
|\ \ \ \
| * | | | Log and pass correlation-id between Unicorn, Sidekiq and GitalyKamil Trzciński2018-12-061-2/+6
* | | | | Merge branch '22548-reopen-error-message' into 'master'Filipa Lacerda2018-12-071-4/+8
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Inline the new checks into normal update error handlingNick Thomas2018-12-071-13/+8
| * | | | Link to conflicting MR in reopening error messageAkos Gyimesi2018-12-061-3/+8
| * | | | Improve error message when attempting to reopen MR and there's a new open MR ...Akos Gyimesi2018-12-061-0/+4
* | | | | Merge branch 'move-group-issues-search-cte-up-the-chain' into 'master'Douwe Maan2018-12-071-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add a flag to use a subquery for group issues searchSean McGivern2018-11-301-1/+1
| | |_|/ | |/| |
* | | | Add feature flag for workhorse content type calculationFrancisco Javier López2018-12-063-1/+20
* | | | Merge branch '19376-post-bfg-cleanup' into 'master'Douglas Barbosa Alexandre2018-12-061-0/+19
|\ \ \ \
| * | | | Use BFG object maps to clean projectsNick Thomas2018-12-061-0/+19
| | |/ / | |/| |
* | | | Introduce Knative Serverless TabDylan Griffith2018-12-061-0/+37
|/ / /
* | | Sort issues and merge requests in ascending and descending orderFatih Acet2018-12-061-6/+0
| |/ |/|
* | 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