summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Resolve "Projects::MergeRequestsController#show is slow (implement skeleton l...Simon Knox2018-03-131-0/+6
* Merge branch '43770-change-clear-runners-cache-ujs-action-to-an-axios-request...Kamil Trzciński2018-03-081-4/+6
|\
| * [ci skip] Merge branch 'master' into 43770-change-clear-runners-cache-ujs-act...Filipa Lacerda2018-03-074-7/+18
| |\
| * \ [ci skip] Merge branch 'master' into 43770-change-clear-runners-cache-ujs-act...Filipa Lacerda2018-03-078-31/+150
| |\ \
| * \ \ [ci skip] Merge branch 'master' into 43770-change-clear-runners-cache-ujs-act...Filipa Lacerda2018-03-0615-64/+69
| |\ \ \
| * | | | Make Projects::Settings:CiCdController#reset_cache a json endpointMatija Čupić2018-03-011-4/+6
* | | | | Merge branch 'ce-jej/github-project-service-for-ci' into 'master'Douwe Maan2018-03-081-12/+21
|\ \ \ \ \
| * | | | | Service integration displays validation errors on test failJames Edwards-Jones2018-03-071-12/+16
| * | | | | Backport changes from EE's GithubService integrationJames Edwards-Jones2018-03-071-0/+5
* | | | | | Merge branch 'master' into 'ce-3839-ci-cd-only-github-projects-fe'ce-3839-ci-cd-only-github-projects-feDouwe Maan2018-03-076-13/+38
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'bvl-allow-maintainer-to-push' into 'master'Douwe Maan2018-03-074-7/+22
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Allow maintainers to edit directly in a forkBob Van Landuyt2018-03-073-7/+21
| | * | | | | Allow a user to select `allow maintainer to push`Bob Van Landuyt2018-03-071-0/+1
| | |/ / / /
| * | | | | Merge branch 'jivl-new-modal-project-labels-milestones' into 'master'Filipa Lacerda2018-03-072-6/+16
| |\ \ \ \ \
| | * | | | | used respond_to formats for persisting flash messages insteadjivl-new-modal-project-labels-milestonesJose Ivan Vargas2018-03-062-5/+15
| | * | | | | Add persistent flash messagesJose Ivan Vargas2018-03-012-3/+5
| | * | | | | Added vue based promotion modals for labels and milestonesJose Ivan Vargas2018-03-012-4/+2
* | | | | | | CE backport for creating CI/CD projects from GitHubRubén Dávila2018-03-071-4/+14
|/ / / / / /
* | | | | | Merge remote-tracking branch 'dev/master'Robert Speicher2018-03-071-0/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Merge branch 'sh-fix-otp-backup-invalidation-10-5' into 'security-10-5'Douwe Maan2018-03-071-0/+1
| |/ / / /
* | | | | Merge branch 'mr-commit-optimization' into 'master'Sean McGivern2018-03-071-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Use persisted/memoized value for MRs shas instead of doing git lookupsAlejandro Rodríguez2018-03-061-1/+1
* | | | | Merge branch 'issue_38337' into 'master'Sean McGivern2018-03-064-8/+94
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into 'issue_38337'Felipe Artur2018-03-069-37/+64
| |\ \ \ \ \
| * | | | | | Address review commentsFelipe Artur2018-03-051-7/+6
| * | | | | | Bring one group board to CEFelipe Artur2018-03-034-9/+96
* | | | | | | Merge remote-tracking branch 'upstream/master' into 5029-support-cluster-metr...5029-support-cluster-metrics-cePawel Chojnacki2018-03-0630-196/+272
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Fix Gitaly n+1 in NetworkController#showAndrew Newdigate2018-03-061-14/+11
| * | | | | | Merge branch '40187-project-branch-dashboard-with-active-stale-branches' into...Rémy Coutable2018-03-061-5/+36
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Add overview of branches and a filter for active/stale branchesTakuya Noguchi2018-03-061-5/+36
| * | | | | | Merge branch 'ce-3839-ci-cd-only-projects-fe' into 'master'Robert Speicher2018-03-051-3/+11
| |\ \ \ \ \ \
| | * | | | | | CI/CD-only projects FEEric Eastwood2018-03-051-1/+5
| | * | | | | | Backport BE changes from CI/CD projects ee!4567Eric Eastwood2018-03-021-2/+6
| | | |/ / / / | | |/| | | |
| * | | | | | Merge branch 'dz-use-less-deprecated-methods' into 'master'Douwe Maan2018-03-054-4/+4
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Replace deprecated name_with_namespace with full_name in app and specDmitriy Zaporozhets2018-03-054-4/+4
| | |/ / / /
| * | | | | Merge branch 'fix-impersonate-ui' into 'master'Rémy Coutable2018-03-051-1/+0
| |\ \ \ \ \
| | * | | | | Remove impersonate token from flash scopejulien MILLAU2018-03-021-1/+0
| | | |_|/ / | | |/| | |
| * | | | | Merge branch '37430-projects-comparecontroller-show-is-calling-gitaly-n-1-tim...Rémy Coutable2018-03-051-4/+2
| |\ \ \ \ \
| | * | | | | Fix n+1 issue by not reloading fully loaded blobsAlejandro Rodríguez2018-03-051-4/+2
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'remove-ide' into 'master'Tim Zallmann2018-03-051-6/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Remove IDE from CEPhil Hughes2018-03-021-6/+0
| | |/ / /
| * | | | Merge branch 'feature/fetch-commit-signs-from-gitaly-in-batch' into 'master'Sean McGivern2018-03-021-25/+19
| |\ \ \ \
| | * | | | Fetch commit signatures from Gitaly in batchesfeature/fetch-commit-signs-from-gitaly-in-batchAhmad Sherif2018-03-011-25/+19
| * | | | | Allow to include also descendant group labelsJan Provaznik2018-03-021-1/+2
| * | | | | Support additional LabelsFinder parameters for group labelsJan Provaznik2018-03-022-2/+8
| | |/ / / | |/| | |
| * | | | Merge branch 'feature/move_oauth_modules_to_auth_dir_structure' into 'master'Douwe Maan2018-03-014-19/+19
| |\ \ \ \
| | * | | | Moved o_auth/saml/ldap modules under gitlab/authHoratiu Eugen Vlad2018-02-284-19/+19
| * | | | | Merge branch '42643-persist-external-ip-of-ingress-controller-gke' into 'master'Kamil Trzciński2018-03-011-0/+5
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Merge branch 'master' into 42643-persist-external-ip-of-ingress-controller-gkeDylan Griffith2018-02-238-14/+32
| | |\ \ \ \
| | * | | | | Simplify retrying for ClusterWaitForIngressIpAddressWorker and style changesDylan Griffith2018-02-231-3/+3