summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Test remove potentially unused filech-test-removalClement Ho2017-07-261-1/+0
* Merge branch 'fix/gb/handle-max-pages-artifacts-size-correctly' into 'master'Kamil Trzciński2017-07-261-1/+5
|\
| * Refactor max_size method in update pages servicefix/gb/handle-max-pages-artifacts-size-correctlyGrzegorz Bizon2017-07-261-3/+5
| * Handle maximum pages artifacts size correctlyGrzegorz Bizon2017-07-251-1/+3
* | Merge branch '29289-project-destroy-clean-up-after-failure' into 'master'Sean McGivern2017-07-266-38/+69
|\ \
| * | Move exception handling to executeTiago Botelho2017-07-266-32/+47
| * | Refactors Project Destroy service and worker codeTiago Botelho2017-07-202-21/+28
| * | Add specs for ProjectDestroyWorkerTiago Botelho2017-07-206-21/+16
| * | WIP: Display a project's `delete_error` on the project homepage.Timothy Andrew2017-07-202-0/+10
| * | Handle errors while a project is being deleted asynchronously.Timothy Andrew2017-07-202-4/+8
* | | Add missing colonMax Raab2017-07-261-1/+1
* | | Resolve "Memory usage notice doesn't link anywhere"Tim Zallmann2017-07-263-3/+17
* | | Merge branch '35453-pending-delete-projects-error-in-admin-dashboard-fix' int...Sean McGivern2017-07-261-1/+1
|\ \ \
| * | | Fixes 500 error caused by pending delete projects in admin dashboard35453-pending-delete-projects-error-in-admin-dashboard-fixTiago Botelho2017-07-251-1/+1
* | | | Merge branch 'zj-repo-exists-gitaly' into 'master'Sean McGivern2017-07-261-3/+10
|\ \ \ \
| * | | | Implement GRPC call to RepositoryServiceZ.J. van de Weg2017-07-261-3/+10
* | | | | Merge branch '35338-deploy-keys-should-not-show-pending-delete-projects' into...Sean McGivern2017-07-261-1/+1
|\ \ \ \ \
| * | | | | Pending delete projects should not show in deploy keys35338-deploy-keys-should-not-show-pending-delete-projectsTiago Botelho2017-07-251-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch '31129-jira-project-key-elim' into 'master'Sean McGivern2017-07-261-15/+3
|\ \ \ \ \
| * | | | | Remove project_key from the Jira configurationJarka Kadlecova2017-07-251-15/+3
* | | | | | Merge branch 'fix-conflict-pluralized' into 'master'Clement Ho2017-07-251-1/+1
|\ \ \ \ \ \
| * | | | | | fix conflict pluralizedEmilien Mottet2017-07-241-1/+1
* | | | | | | Merge branch '2971-multiproject-grah-ce-port' into 'master'Phil Hughes2017-07-251-1/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix vertical alignment in firefox and safari for pipeline mini graph2971-multiproject-grah-ce-portFilipa Lacerda2017-07-251-1/+2
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch '30634-protected-pipeline' into 'master'Kamil Trzciński2017-07-258-42/+87
|\ \ \ \ \ \ \
| * | | | | | | Extract validationsLin Jen-Shin2017-07-211-24/+24
| * | | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-20126-206/+634
| |\ \ \ \ \ \ \
| * | | | | | | | Use struct instead of hashLin Jen-Shin2017-07-201-2/+3
| * | | | | | | | Make permission checks easier to understandLin Jen-Shin2017-07-201-6/+6
| * | | | | | | | Use hash to return multiple objectsLin Jen-Shin2017-07-201-4/+4
| * | | | | | | | Fix tests and fine tweak permission error messageLin Jen-Shin2017-07-191-5/+5
| * | | | | | | | Eliminate N+1 queries on checking different protected refsLin Jen-Shin2017-07-191-4/+5
| * | | | | | | | Try to merge permission checks into oneLin Jen-Shin2017-07-191-10/+10
| * | | | | | | | Rename :user_cannot_update to :protected_refLin Jen-Shin2017-07-182-4/+4
| * | | | | | | | Rename can_push_or_merge_to_branch? to can_update_branch?Lin Jen-Shin2017-07-183-5/+9
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-1813-95/+113
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-17648-4331/+5912
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make message and code more clearLin Jen-Shin2017-07-061-2/+5
| * | | | | | | | | | Merge allowed_to_create? into CreatePipelineServiceLin Jen-Shin2017-07-054-31/+22
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-0533-128/+224
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Make sure that retryable_builds would preload projectLin Jen-Shin2017-07-041-1/+1
| * | | | | | | | | | | Fix bad conflict resolutionLin Jen-Shin2017-07-042-11/+13
| * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-04123-1252/+1647
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Consistently check permission for creating pipelines,Lin Jen-Shin2017-07-043-7/+25
| * | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-06-291-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-06-29740-8791/+13477
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-06-0738-463/+812
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Still allow legacy triggers, feedback:Lin Jen-Shin2017-06-061-5/+3
| * | | | | | | | | | | | | | | Try to report why it's failing and fix testsLin Jen-Shin2017-06-062-2/+3
| * | | | | | | | | | | | | | | Disallow legacy trigger without a ownerLin Jen-Shin2017-06-061-3/+5
View Lorry Controller Status