summaryrefslogtreecommitdiff
path: root/app/services
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into single-file-diffsSean McGivern2016-07-111-8/+3
|\
| * Enable Style/IdenticalConditionalBranches Rubocop copGrzegorz Bizon2016-07-081-8/+3
* | Remove unused argument to CompareService#executeSean McGivern2016-07-081-1/+1
|/
* Merge branch 'new-diff-notes' into 'master' Douwe Maan2016-07-075-10/+38
|\
| * Automatically update diff note positions when MR is pushed toDouwe Maan2016-07-063-3/+33
| * Rename MergeRequest methods that return commits or shas to be more clear and ...Douwe Maan2016-07-063-7/+5
* | Merge branch 'services_refactoring1' into 'master' Dmitriy Zaporozhets2016-07-0718-43/+37
|\ \ | |/ |/|
| * Services: code style fixes, minor refactoringservices_refactoring1Valery Sizov2016-07-0618-43/+37
* | Merge branch '15094-throttling-pushes_since_gc' into 'master' Douwe Maan2016-07-061-2/+8
|\ \
| * | Throttle the update of `project.pushes_since_gc` to 1 minute15094-throttling-pushes_since_gcPaco Guzman2016-07-051-2/+8
* | | Merge branch 'fix/project-export-error' into 'master' Rémy Coutable2016-07-061-0/+4
|\ \ \ | |_|/ |/| |
| * | add more debug info to project exportJames Lopez2016-07-051-0/+4
| |/
* | Revert back to not defining a default Git access protocol.Patricio Cano2016-07-052-2/+2
* | Default Git access protocol to `web`Patricio Cano2016-07-052-2/+2
* | Rename ENV['PROTOCOL'] to ENV['GL_PROTOCOL'] to conform to what GitLab Shell ...Patricio Cano2016-07-052-2/+2
|/
* Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2016-07-041-1/+1
|\
| * Merge branch 'master' into dev-masterTomasz Maczukin2016-07-0214-17/+7
| |\
| * | Ensure logged-out users can't see private refsSean McGivern2016-06-301-1/+1
* | | Handle custom Git hook result in GitLab UIValery Sizov2016-07-041-1/+4
* | | Better message for git hooks and file locksValery Sizov2016-07-044-8/+10
| |/ |/|
* | Enable Style/EmptyLines cop, remove redundant onesrubocop/enable-cops-for-empty-linesGrzegorz Bizon2016-07-0110-10/+0
* | Refactor repository paths handling to allow multiple git mount pointsAlejandro Rodríguez2016-06-294-7/+7
|/
* Correctly returns todo ID after creating todomark-done-todo-idPhil Hughes2016-06-271-1/+2
* Merge branch 'fix-auto-mr-close' into 'master' Douwe Maan2016-06-221-1/+1
|\
| * Fix auto-MR-close text from branch namefix-auto-mr-closeSean McGivern2016-06-211-1/+1
* | Merge branch '18755-fix-destroy-project-causes-post_decline_request-to-be-exe...Douwe Maan2016-06-222-14/+28
|\ \ | |/ |/|
| * Raise a new Gitlab::Access::AccessDeniedError when permission is not enough t...Rémy Coutable2016-06-181-20/+6
| * Don't send the "access declined" email on access request withdrawalRémy Coutable2016-06-181-1/+3
| * New Members::DestroyServiceRémy Coutable2016-06-182-14/+40
* | Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-pr...Lin Jen-Shin2016-06-205-51/+186
|\ \
| * | fixed a couple of errors spotted in productionJames Lopez2016-06-201-1/+1
| |/
| * Merge branch 'issue_12758' into 'master' Douwe Maan2016-06-171-35/+81
| |\
| | * Merge master into issue_12758issue_12758Felipe Artur2016-06-176-61/+101
| | |\
| | * \ Re-use notifications dropdown/modal for user profileFelipe Artur2016-06-171-6/+26
| | |\ \
| | | * | Re-use notifications dropdown on user profileFelipe Artur2016-06-161-6/+24
| | | * | Refactor custom notifications controller code and add specsFelipe Artur2016-06-141-1/+2
| | | * | Remove schema from branch historyFelipe Artur2016-06-131-0/+5
| | | * | Improve notification settings event keys and add some specsFelipe Artur2016-06-131-29/+33
| | | * | Implement custom notification level optionsFelipe Artur2016-06-131-22/+38
| | * | | Implement custom notification level optionsFelipe Artur2016-06-151-34/+60
| * | | | Merge branch '18034-cache-todo-counter' into 'master' Yorick Peterse2016-06-171-1/+11
| |\ \ \ \
| | * | | | Cache todo counters (pending/done)18034-cache-todo-counterPaco Guzman2016-06-171-1/+11
| * | | | | Fix a 'wrong number of arguments' errorRémy Coutable2016-06-171-1/+1
| |/ / / /
| * | | | Merge branch 'fix-toggling-task-should-not-generate-todo' into 'master' Robert Speicher2016-06-171-1/+6
| |\ \ \ \
| | * | | | Fix error when editing an issuable with a task listfix-toggling-task-should-not-generate-todoDouglas Barbosa Alexandre2016-06-171-1/+6
| | | |_|/ | | |/| |
| * | | | Merge branch 'feature/project-export' into 'master' Douwe Maan2016-06-174-13/+87
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | fixed merge conflicts on UI branchJames Lopez2016-06-166-27/+85
| | |\ \ \
| | | * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project...feature/project-exportJames Lopez2016-06-166-27/+85
| | | |\ \ \
| | | * | | | Revert "squashed merge and fixed conflicts"James Lopez2016-06-166-85/+27
| | | * | | | squashed merge and fixed conflictsJames Lopez2016-06-166-27/+85