summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jej/add-protected-branch-policy' into 'master'Nick Thomas2018-03-273-13/+17
|\
| * DestroyService for protected tags/branches used from controllerJames Edwards-Jones2018-03-263-13/+17
* | Merge branch '40781-os-to-ce' into 'master'Sean McGivern2018-03-274-20/+35
|\ \
| * \ Merge remote-tracking branch 'origin/master' into 40781-os-to-ceMicaël Bergeron2018-03-221-0/+6
| |\ \
| * \ \ Merge remote-tracking branch 'origin/master' into 40781-os-to-ceMicaël Bergeron2018-03-0821-146/+220
| |\ \ \
| * | | | fixing some broken mergesMicaël Bergeron2018-03-022-4/+3
| * | | | remove geo specific codeMicaël Bergeron2018-03-011-8/+24
| * | | | Merge remote-tracking branch 'origin/master' into object-storage-ee-to-ce-bac...object-storage-ee-to-ce-backportKamil Trzciński2018-02-289-49/+59
| |\ \ \ \
| * \ \ \ \ Merge commit '7e424eb852716495073881710e8a8851b4a4cd5a' into object-storage-e...Kamil Trzciński2018-02-2816-52/+165
| |\ \ \ \ \
| * \ \ \ \ \ Merge commit '8af23def1d6' into object-storage-ee-to-ce-backportKamil Trzciński2018-02-289-56/+82
| |\ \ \ \ \ \
| | * | | | | | Revert "Merge branch '3867-port-to-ce' into 'master'"Kamil Trzciński2018-02-282-15/+8
| * | | | | | | Merge branch 'feature/sm/artifacts-trace-ee' into 'master'Kamil Trzciński2018-02-281-0/+2
| * | | | | | | Merge branch '4163-move-uploads-to-object-storage' into 'master'Sean McGivern2018-02-282-8/+15
| * | | | | | | Merge commit '4b92efd90cedaa0aff218d11fdce279701128bea' into object-storage-e...Kamil Trzciński2018-02-2818-36/+120
| |\ \ \ \ \ \ \
| * | | | | | | | Merge branch 'zj-multiple-artifacts-ee' into 'master'Grzegorz Bizon2018-02-281-3/+2
| * | | | | | | | Merge commit '7fabc892f251740dbd9a4755baede662e6854870' into object-storage-e...Kamil Trzciński2018-02-2824-158/+269
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge commit 'f2f58a60b76acd479e37bdbc9246ec9f9b2bea82' into object-storage-e...Kamil Trzciński2018-02-2817-164/+123
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge commit '11c67e7c2f992299ff5918ce67995b73d1e0be6d' into object-storage-e...Kamil Trzciński2018-02-2825-96/+302
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Merge branch 'jej/lfs-object-storage' into 'master'Douwe Maan2018-02-283-7/+6
* | | | | | | | | | | | Merge branch '43316-controller-parameters-handling-sensitive-information-shou...Kamil Trzciński2018-03-262-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | Make Variable key not secret43316-controller-parameters-handling-sensitive-information-should-use-a-more-specific-nameMatija Čupić2018-03-222-2/+2
| * | | | | | | | | | | Use secret_key and secret_value in Pipeline Schedule variablesMatija Čupić2018-03-171-1/+1
| * | | | | | | | | | | Alias secret_key and secret_value to key and valueMatija Čupić2018-03-171-6/+1
| * | | | | | | | | | | Use secret_key and secret_value in Variables controllerMatija Čupić2018-03-161-2/+7
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'pages_force_https' into 'master'Nick Thomas2018-03-231-0/+22
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add HTTPS-only pagesRob Watson2018-03-221-0/+22
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch '43482-enabling-auto-devops-on-an-empty-project-gives-you-wrong-...Kamil Trzciński2018-03-231-4/+13
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Refactor AutoDevops pipeline logic into methodMatija Čupić2018-03-221-8/+13
| * | | | | | | | | | Add empty repo check before running AutoDevOps pipelineMatija Čupić2018-03-111-2/+6
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | 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-073-7/+17
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ [ci skip] Merge branch 'master' into 43770-change-clear-runners-cache-ujs-act...Filipa Lacerda2018-03-074-23/+56
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ [ci skip] Merge branch 'master' into 43770-change-clear-runners-cache-ujs-act...Filipa Lacerda2018-03-065-31/+28
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | 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 'bvl-allow-maintainer-to-push' into 'master'Douwe Maan2018-03-073-5/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Allow maintainers to edit directly in a forkBob Van Landuyt2018-03-072-5/+15
| * | | | | | | | | | | | | 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
* | | | | | | | | | | | | 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 remote-tracking branch 'upstream/master' into 5029-support-cluster-metr...5029-support-cluster-metrics-cePawel Chojnacki2018-03-0612-114/+151
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |