summaryrefslogtreecommitdiff
path: root/app/services
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dm-meer-blauw-op-straat' into 'master' Robert Speicher2017-02-2311-28/+23
|\
| * Revert "Enable Style/DotPosition"Douwe Maan2017-02-2314-50/+50
| * Revert "Prefer leading style for Style/DotPosition"Douwe Maan2017-02-2327-111/+111
| * Enable Rails/DelegateDouwe Maan2017-02-232-6/+2
| * Enable Style/WordArrayDouwe Maan2017-02-231-1/+1
| * Enable Style/ClassCheckDouwe Maan2017-02-231-1/+1
| * Prefer leading style for Style/DotPositionDouwe Maan2017-02-2327-111/+111
| * Fix code for copsDouwe Maan2017-02-231-6/+7
| * Enable Style/ConditionalAssignmentDouwe Maan2017-02-231-3/+3
| * Enable Style/ColonMethodCallDouwe Maan2017-02-231-1/+1
| * Enable Performance/RedundantMergeDouwe Maan2017-02-233-8/+6
| * Enable Style/MutableConstantDouwe Maan2017-02-236-6/+6
| * Enable Style/DotPositionDouwe Maan2017-02-2314-50/+50
* | Merge branch 'fix/gb/pipeline-retry-skipped-jobs' into 'master' Kamil Trzciński2017-02-231-0/+6
|\ \ | |/ |/|
| * Process skipped jobs in the pipeline when retrying itGrzegorz Bizon2017-02-231-10/+9
| * Reprocess jobs in stages once when retrying pipelineGrzegorz Bizon2017-02-221-5/+10
| * Fix reprocessing skipped jobs when retrying pipelineGrzegorz Bizon2017-02-221-0/+2
* | Merge branch 'fix-test-for-build-attributes' into 'master' Kamil Trzciński2017-02-231-3/+4
|\ \
| * | We actually want to clone project and remove gl_project_idfix-test-for-build-attributesLin Jen-Shin2017-02-211-2/+2
| * | Fix build attributes test, see:Lin Jen-Shin2017-02-211-3/+4
* | | Merge branch 'update-ci-skip-regex-to-accept-underscores-and-hyphens' into 'm...Robert Speicher2017-02-221-1/+2
|\ \ \
| * | | updated ci skip regex to accept underscores and hyphensupdate-ci-skip-regex-to-accept-underscores-and-hyphensLuke "Jared" Bennett2017-02-221-1/+2
* | | | Merge branch '22132-rename-branch-name-params-to-branch' into 'master' Rémy Coutable2017-02-221-4/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Change branch_name param to branch throughout V4 API22132-rename-branch-name-params-to-branchOswaldo Ferreira2017-02-211-4/+4
* | | | Merge branch 'issue_28051_2' into 'master'Sean McGivern2017-02-221-11/+15
|\ \ \ \
| * | | | Create compare object with default branch when target branch is missingissue_28051_2Felipe Artur2017-02-211-11/+15
| | |/ / | |/| |
* | | | Merge branch '28093-snippet-and-issue-spam-check-on-edit' into 'master'Sean McGivern2017-02-227-45/+91
|\ \ \ \ | |_|_|/ |/| | |
| * | | Spam check and reCAPTCHA improvements28093-snippet-and-issue-spam-check-on-editOswaldo Ferreira2017-02-217-45/+91
| |/ /
* | | No more and/orDouwe Maan2017-02-211-1/+1
| |/ |/|
* | Add user deletion permission check in `Users::DestroyService`sh-delete-user-permission-checkStan Hu2017-02-201-0/+4
|/
* Prevent project team from being truncated too early during project destructionsh-fix-project-team-truncation-in-destroyStan Hu2017-02-191-2/+1
* Merge branch '25465-todo-done-clicking-is-kind-of-unsafe' into 'master' Clement Ho2017-02-181-6/+19
|\
| * Todo done clicking is kind of unusable.Jacopo2017-02-171-6/+19
* | Merge branch 'fix-merge-service-with-no-source' into 'master' Rémy Coutable2017-02-171-1/+1
|\ \
| * | Fix merge service error with no sourcefix-merge-service-with-no-sourceSean McGivern2017-02-171-1/+1
| |/
* | Remove support for locking in pipeline retry serviceGrzegorz Bizon2017-02-171-9/+1
* | Merge branch 'master' into fix/gb/pipeline-retry-builds-startedGrzegorz Bizon2017-02-1716-96/+157
|\ \
| * \ Merge branch 'use-update-runner-service' into 'master' Kamil Trzciński2017-02-171-0/+15
| |\ \ | | |/ | |/|
| | * Merge remote-tracking branch 'upstream/master' into use-update-runner-serviceLin Jen-Shin2017-02-1521-85/+143
| | |\
| | * | Only tick queue if anything is updatedLin Jen-Shin2017-02-071-2/+2
| | * | Merge remote-tracking branch 'upstream/master' into use-update-runner-serviceLin Jen-Shin2017-02-078-14/+286
| | |\ \
| | * \ \ Merge remote-tracking branch 'upstream/master' into use-update-runner-serviceLin Jen-Shin2017-02-0433-208/+598
| | |\ \ \
| | * | | | Prefer service object over after_save hookLin Jen-Shin2017-01-211-0/+15
| * | | | | Merge branch 'sh-namespace-cleanup-deleted-projects' into 'master' Douwe Maan2017-02-161-1/+3
| |\ \ \ \ \
| | * | | | | Fix a number of race conditions that can occur during namespace deletionsh-namespace-cleanup-deleted-projectsStan Hu2017-02-151-1/+3
| * | | | | | Merge branch '28124-mrs-don-t-show-all-merge-errors' into 'master' Rémy Coutable2017-02-161-8/+10
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Show merge errors in merge request widgetSean McGivern2017-02-161-8/+10
| * | | | | | Merge branch 'move_tags_service_to_namespace' into 'master'Rémy Coutable2017-02-154-72/+76
| |\ \ \ \ \ \
| | * | | | | | Move tag services to `Tags` namespacedixpac2017-02-144-72/+76
| | |/ / / / /
| * | | | | | Merge branch 'master' into 'dz-nested-groups-improvements-3'Dmitriy Zaporozhets2017-02-141-0/+11
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |