summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-076-77/+118
|\
| * Merge branch 'dosuken123/gitlab-ce-2989-run-cicd-pipelines-on-a-schedule-idea...Sean McGivern2017-04-071-8/+7
| |\
| | * Fix ref referenceKamil Trzcinski2017-04-071-3/+2
| | * create_params and update_params into trigger_paramsShinya Maeda2017-04-071-11/+4
| | * Add def trigger_schedule in Trigger. Use persisted? for checling existanceShinya Maeda2017-04-072-2/+0
| | * Use allow_destroy. Remove condtion from form.haml.Shinya Maeda2017-04-071-4/+6
| | * Add form for scheduled triggerShinya Maeda2017-04-072-2/+9
| * | Merge branch 'optimise-builds' into 'master' Sean McGivern2017-04-071-0/+5
| |\ \
| | * | Count number of queriesKamil Trzcinski2017-04-071-0/+5
| | |/
| * | Merge branch '18471-restrict-tag-pushes-protected-tags' into 'master' Douwe Maan2017-04-074-69/+106
| |\ \ | | |/ | |/|
| | * Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-0613-90/+203
| | |\
| | * \ Merge branch 'last-green-master' into 18471-restrict-tag-pushes-protected-tagsJames Edwards-Jones2017-04-069-57/+46
| | |\ \
| | * | | Protected Tags backend review changesJames Edwards-Jones2017-04-063-41/+16
| | * | | Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-0633-136/+172
| | |\ \ \
| | * | | | Renamed ProtectedTag push_access_levels to create_access_levelsJames Edwards-Jones2017-04-042-4/+3
| | * | | | Cleaned up duplication with ProtectedRefAccess concernJames Edwards-Jones2017-04-041-10/+9
| | * | | | Fix typos in ProtectedRef concern and whitespace detected by rubocopJames Edwards-Jones2017-04-033-3/+0
| | * | | | Created ProtectedRefsController to reduce Tags/Branches duplicationJames Edwards-Jones2017-04-033-80/+84
| | * | | | Clean up non TODO rubocop errorsJames Edwards-Jones2017-04-031-1/+1
| | * | | | Extracted ProtectableDropdown to clean up Project#open_branchesJames Edwards-Jones2017-04-031-18/+7
| | * | | | Settings::RepositoryController includes protected tags in JSJames Edwards-Jones2017-03-311-7/+23
| | * | | | Protected tags copy/paste from protected branchesJames Edwards-Jones2017-03-311-0/+58
* | | | | | Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-073-20/+86
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Add /-/readiness /-/liveness and /-/health_metrics endpoints to track applica...Paweł Chojnacki2017-04-073-20/+86
* | | | | | Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussionLuke "Jared" Bennett2017-04-074-2/+10
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '8998_skip_pending_commits_if_not_head' into 'master' Kamil Trzciński2017-04-072-2/+2
| |\ \ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'upstream/master' into 8998_skip_pending_commits...Lin Jen-Shin2017-04-0713-90/+203
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Merge remote-tracking branch 'upstream/master' into 8998_skip_pending_commits...Lin Jen-Shin2017-04-069-57/+46
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Merge remote-tracking branch 'upstream/master' into 8998_skip_pending_commits...Lin Jen-Shin2017-04-066-14/+31
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | replaced one more helper with presenterRydkin Maxim2017-04-041-1/+1
| | * | | | | add auto-cancel for pending pipelines on branch, if they are not HEADRydkin Maxim2017-04-041-1/+1
| * | | | | | Enable polling for pipelines table other pagesToon Claes2017-04-062-0/+6
| * | | | | | Set the Etag cache polling intervalToon Claes2017-04-061-0/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'master' into new-resolvable-discussionDouwe Maan2017-04-0613-90/+203
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'tc-show-pipeline-coverage-if-avail' into 'master' Kamil Trzciński2017-04-061-1/+1
| |\ \ \ \ \
| | * | | | | Show the test coverage if it is availabletc-show-pipeline-coverage-if-availToon Claes2017-04-061-1/+1
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'feature/multi-level-container-registry-images' into 'master' Kamil Trzciński2017-04-064-34/+87
| |\ \ \ \ \
| | * \ \ \ \ Merge commit '46e4ed6bd0c8c256bce6d35b4bb992d77fd09971' into feature/multi-le...feature/multi-level-container-registry-imagesGrzegorz Bizon2017-04-069-57/+46
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | * | | | | Merge branch 'master' into feature/multi-level-container-registry-imagesGrzegorz Bizon2017-04-067-14/+34
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | * | | | | Add minor improvements to container registry codeGrzegorz Bizon2017-04-061-4/+2
| | * | | | | Remove redundant code from container registry classesGrzegorz Bizon2017-04-051-1/+1
| | * | | | | Require container registry entities in controllersGrzegorz Bizon2017-04-052-3/+5
| | * | | | | Merge branch 'master' into feature/multi-level-container-registry-imagesGrzegorz Bizon2017-04-048-5/+9
| | |\ \ \ \ \
| | * | | | | | Fix wording in registry tags controller notificationsGrzegorz Bizon2017-04-041-2/+2
| | * | | | | | Improve wording in registry notifications in the UIGrzegorz Bizon2017-04-041-2/+2
| | * | | | | | Fix Rubocop offenses in code related to the registryGrzegorz Bizon2017-04-031-1/+1
| | * | | | | | Ensure root container repository when visiting registryGrzegorz Bizon2017-04-031-0/+16
| | * | | | | | Merge branch 'master' into feature/multi-level-container-registry-imagesGrzegorz Bizon2017-04-0313-80/+75
| | |\ \ \ \ \ \
| | * | | | | | | Add serveral minor improvements to container registryGrzegorz Bizon2017-03-312-2/+4
| | * | | | | | | Move code related to registry to multiple controllersGrzegorz Bizon2017-03-313-33/+31