summaryrefslogtreecommitdiff
path: root/app/services
Commit message (Expand)AuthorAgeFilesLines
* Fix concurrent access on builds/registerKamil Trzcinski2017-03-011-12/+24
* Merge branch '28808-fix-top-level-constant-referenced' into 'master' Rémy Coutable2017-03-011-1/+7
|\
| * Don't declare constants in Struct28808-fix-top-level-constant-referencedRémy Coutable2017-02-281-1/+7
* | Merge branch 'dm-nested-group-shared-projects' into 'master' Dmitriy Zaporozhets2017-02-281-2/+14
|\ \
| * | Fix access to projects shared with a nested groupdm-nested-group-shared-projectsDouwe Maan2017-02-281-2/+14
| |/
* | Use exceptions for MergeService error handling28769-raise-custom-exception-in-all-methods-of-mergeservice-that-want-to-inform-the-userSean McGivern2017-02-281-11/+9
|/
* Merge branch 'only-create-unmergeable-todo-once' into 'master' Kamil Trzciński2017-02-281-1/+5
|\
| * Only create unmergeable todos onceonly-create-unmergeable-todo-onceSean McGivern2017-02-241-1/+5
* | Make nested groups deletion synchronous to avoid potential raceStan Hu2017-02-271-1/+2
* | Merge branch 'dm-fix-web-edit-new-lines' into 'master' Robert Speicher2017-02-245-12/+36
|\ \
| * | Fix specdm-fix-web-edit-new-linesDouwe Maan2017-02-243-5/+5
| * | Add newlineDouwe Maan2017-02-241-0/+1
| * | Raise error when no content is providedDouwe Maan2017-02-243-7/+23
| * | Address reviewDouwe Maan2017-02-241-6/+6
| * | Rename commit_file, commit_dir and remove_file and update specsDouwe Maan2017-02-243-4/+3
| * | Consistently create, update, and delete files, taking CRLF settings into accountDouwe Maan2017-02-241-3/+11
| |/
* | Don't allow deleting a ghost user.Timothy Andrew2017-02-241-1/+1
* | Implement final review comments from @DouweM and @rymaiTimothy Andrew2017-02-241-4/+9
* | Use a `ghost` boolean to track ghost users.Timothy Andrew2017-02-241-1/+0
* | Implement review comments from @DouweM and @nick.thomas.Timothy Andrew2017-02-241-2/+2
* | Deleting a user shouldn't delete associated issues.Timothy Andrew2017-02-241-0/+14
* | Don't send notifications to ghost users.Timothy Andrew2017-02-241-0/+1
|/
* Merge branch 'create_branch_repo_less' into 'master' Robert Speicher2017-02-231-0/+14
|\
| * Create master branch first if project is repository-lessValery Sizov2017-02-231-0/+14
* | 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
| | |/ / | |/| |
View Lorry Controller Status