summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Expand)AuthorAgeFilesLines
* Use Diff::File blob methods from diff highlighterdm-highlight-diff-file-blobDouwe Maan2017-06-081-3/+5
* Merge branch 'allow-reporters-to-promote-group-labels' into 'master'Douwe Maan2017-06-081-3/+3
|\
| * Allow group reporters to promote labelsallow-reporters-to-promote-group-labelsSean McGivern2017-06-081-3/+3
* | Merge branch 'zj-i18n-pipeline-schedules' into 'master'Douwe Maan2017-06-081-2/+2
|\ \
| * | Allow translation of Pipeline SchedulesZ.J. van de Weg2017-06-081-2/+2
| |/
* | Blob#load_all_data! doesn’t need an argumentblob-load-all-dataDouwe Maan2017-06-071-3/+3
|/
* Merge branch 'expand-backlog-closed-lists-issue-boards' into 'master'Douwe Maan2017-06-071-1/+3
|\
| * moved creating backlog list into list servicePhil Hughes2017-06-061-2/+2
| * Expand/collapse close & backlog lists in issue boardsPhil Hughes2017-05-311-0/+2
* | Merge branch '3191-deploy-keys-update' into 'master'Rémy Coutable2017-06-071-2/+27
|\ \
| * | Implement ability to update deploy keysAlexander Randa2017-06-021-2/+27
* | | Merge branch 'feature/gb/persist-pipeline-stages' into 'master'Kamil Trzciński2017-06-071-1/+1
|\ \ \
| * \ \ Merge branch 'feature/gb/migrate-pipeline-stages' into feature/gb/persist-pip...Grzegorz Bizon2017-06-066-89/+31
| |\ \ \
| * \ \ \ Merge branch 'master' into feature/gb/persist-pipeline-stagesGrzegorz Bizon2017-06-0516-167/+293
| |\ \ \ \
| * | | | | Rename pipeline methods related to legacy stagesGrzegorz Bizon2017-06-011-1/+1
* | | | | | Merge branch '12910-snippets-description' into 'master'Phil Hughes2017-06-071-1/+1
|\ \ \ \ \ \
| * | | | | | Support descriptions for snippetsJarka Kadlecova2017-05-311-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Add a rubocop rule to check if a method 'redirect_to' is used without explici...31840-add-a-rubocop-that-forbids-redirect_to-inside-a-controller-destroy-action-without-an-explicit-statusblackst0ne2017-06-0716-20/+31
| |_|_|/ / |/| | | |
* | | | | Merge branch 'pull-mirror-overhaul-ce-backport' into 'master'Douwe Maan2017-06-051-8/+1
|\ \ \ \ \
| * | | | | backports changed import logic from pull mirroring feature into CETiago Botelho2017-06-051-8/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'mk-fix-git-over-http-rejections' into 'master'Douwe Maan2017-06-052-78/+21
|\ \ \ \ \
| * | | | | Refactor to let GitAccess errors bubble upMichael Kozono2017-06-051-35/+14
| * | | | | Refactor to let `GitAccess` check protocol configMichael Kozono2017-06-051-10/+0
| * | | | | Move CI access logic into GitAccessMichael Kozono2017-06-052-25/+11
| * | | | | RefactorMichael Kozono2017-06-051-4/+0
| * | | | | Check disabled commands in GitAccess insteadMichael Kozono2017-06-051-4/+0
| * | | | | Render GitAccess message if authorizedMichael Kozono2017-06-051-5/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jej-backport-protected-tag-ee-role-refactorings' into 'master'Tim Zallmann2017-06-053-3/+9
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Backport EE refactorings for Protected Tag EE-only functionalityjej-backport-protected-tag-ee-role-refactoringsJames Edwards-Jones2017-05-313-3/+9
| | |/ / | |/| |
* | | | Merge branch 'fix-realtime-edited-text-for-issues-9-3' into 'master'Phil Hughes2017-06-051-3/+10
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/master' into fix-realtime-edited-text-fo...Luke "Jared" Bennett2017-06-0211-141/+228
| |\ \ \ \
| * | | | | Port fix-realtime-edited-text-for-issues 9-2-stable fix to master.Luke "Jared" Bennett2017-05-311-3/+10
| | |/ / / | |/| | |
* | | | | Merge remote-tracking branch 'origin/master' into zj-job-view-goes-real-timeKamil Trzcinski2017-06-026-18/+32
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch '31511-jira-settings' into 'master'Sean McGivern2017-06-021-14/+25
| |\ \ \ \
| | * | | | Address review comments31511-jira-settingsJarka Kadlecova2017-06-021-2/+2
| | * | | | Add feature tests for improved JIRA settingsJarka Kadlecova2017-06-011-7/+12
| | * | | | simplify test&save actions when setting a service integrationJarka Kadlecova2017-06-011-13/+19
| * | | | | Merge branch 'zj-realtime-env-list' into 'master'Kamil Trzciński2017-06-011-0/+2
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into zj-realtime-env-listZ.J. van de Weg2017-06-0111-146/+240
| | |\ \ \ \ \ | | | |/ / / /
| | * | | | | Merge branch 'master' into zj-realtime-env-listZ.J. van de Weg2017-05-251-0/+1
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Test etag caching router and incorporate reviewZ.J. van de Weg2017-05-241-1/+1
| | * | | | | Use etag caching for environments JSONZ.J. van de Weg2017-05-221-0/+2
| * | | | | | Merge branch '24196-protected-variables' into 'master'Kamil Trzciński2017-06-011-1/+2
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Merge branch 'master' into '24196-protected-variables'Kamil Trzciński2017-06-011-1/+1
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | * | | | | Merge remote-tracking branch 'upstream/master' into 24196-protected-variablesLin Jen-Shin2017-06-015-122/+195
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into '24196-protected-variables'Lin Jen-Shin (godfat)2017-05-265-23/+44
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | * | | | | | Frontend implementation, tests, and changelogLin Jen-Shin2017-05-251-1/+2
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'dm-collapsed-blob' into 'master'Sean McGivern2017-06-013-3/+3
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Consistent diff and blob size limit namesDouwe Maan2017-05-293-3/+3
| | | |/ / / | | |/| | |
* | | | | | Merge remote-tracking branch 'origin/master' into zj-job-view-goes-real-timeZ.J. van de Weg2017-06-011-1/+1
|\ \ \ \ \ \ | |/ / / / /
View Lorry Controller Status