summaryrefslogtreecommitdiff
path: root/app/services
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...fix-git-hooks-when-creating-fileLin Jen-Shin2017-02-025-62/+153
|\
| * Merge branch '395-fix-notification-when-group-set-to-watch' into 'master'Sean McGivern2017-01-311-4/+4
| |\
| | * Fix notification when global=disabled, group=watch395-fix-notification-when-group-set-to-watchamaia2017-01-301-4/+4
| * | Merge branch '24021-Migrate-Projects-Labels-to-Group-Labels' into 'master'27283-fix-wrong-label-hide-show-whitespaceSean McGivern2017-01-311-0/+71
| |\ \
| | * | Abillity to promote project labels to group labelsRitave2017-01-311-0/+71
| * | | refactor merge request build serviceRydkin Maxim2017-01-311-57/+72
| | |/ | |/|
| * | Improve search within group logicDmitriy Zaporozhets2017-01-301-2/+1
| * | Include nested groups items into search resultsDmitriy Zaporozhets2017-01-301-1/+5
| |/
| * Add a system hook for when a project is updated.Tommy Beadle2017-01-261-0/+2
* | Try to check if branch diverged explicitlyLin Jen-Shin2017-01-261-6/+13
* | Make GitHooksService#execute return block valueLin Jen-Shin2017-01-262-8/+4
* | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2017-01-2620-104/+358
|\ \ | |/
| * Merge branch 'refresh-authorizations-fork-join' into 'master' Douwe Maan2017-01-251-1/+1
| |\
| | * Fix race conditions for AuthorizedProjectsWorkerrefresh-authorizations-fork-joinYorick Peterse2017-01-251-1/+1
| * | Merge branch 'fix-ci-requests-concurrency' into 'master' Grzegorz Bizon2017-01-251-2/+4
| |\ \
| | * | Return struct instead of multiple valuesKamil Trzcinski2017-01-251-2/+4
| | * | Fix picking CI buildsKamil Trzcinski2017-01-251-2/+2
| * | | Merge branch 'backport-ee-changes-for-build-minutes' into 'master' Grzegorz Bizon2017-01-251-17/+39
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'origin/master' into backport-ee-changes-for-bui...Kamil Trzcinski2017-01-243-23/+23
| | |\ \
| | * | | Backport changes introduced by https://gitlab.com/gitlab-org/gitlab-ee/merge_...Kamil Trzcinski2017-01-201-17/+39
| * | | | Merge branch 'backport-ee-1067-deal-with-repo-size-limit-as-byte' into 'master' Yorick Peterse2017-01-253-11/+29
| |\ \ \ \
| | * | | | Extract set_project_name_from_path methodbackport-ee-1067-deal-with-repo-size-limit-as-byteOswaldo Ferreira2017-01-231-11/+15
| | * | | | EE backport for new application settings serviceOswaldo Ferreira2017-01-232-0/+14
| | | |_|/ | | |/| |
| * | | | Merge branch 'dz-nested-groups-access-improvements' into 'master' Dmitriy Zaporozhets2017-01-251-1/+2
| |\ \ \ \
| | * | | | Add User#nested_groups and User#nested_projects methodsDmitriy Zaporozhets2017-01-251-1/+2
| * | | | | Merge branch 'no_project_notes' into 'master' Sean McGivern2017-01-254-11/+23
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | address commentsJarka Kadlecova2017-01-253-19/+15
| | * | | | Support notes without projectJarka Kadlecova2017-01-183-12/+28
| * | | | | Merge branch 'backport-ee-1051-approvals-reset-on-closed-mr' into 'master' Sean McGivern2017-01-242-23/+15
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Backport EE changes on approvals reset for closed MRsbackport-ee-1051-approvals-reset-on-closed-mrOswaldo Ferreira2017-01-232-23/+15
| * | | | | Add missing specs for update build queue servicefix-shared-runners-queue-updateGrzegorz Bizon2017-01-201-1/+3
| * | | | | Fix shared runners queue updateKamil Trzcinski2017-01-201-0/+6
| | |_|_|/ | |/| | |
| * | | | Merge remote-tracking branch 'origin/master' into 21698-redis-runner-last-buildKamil Trzcinski2017-01-193-7/+48
| |\ \ \ \ | | |/ / /
| | * | | Mark MR as WIP when pushing WIP commitsjurre2017-01-192-0/+25
| | * | | Merge branch '23524-notify-automerge-user-of-failed-build' into 'master' Sean McGivern2017-01-191-7/+23
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Notify the user who set auto-merge when merge conflict occurstwonegatives2017-01-141-1/+14
| | | * | Notify the user who set auto-merge when a build failstwonegatives2016-12-161-6/+9
| * | | | Fix specsKamil Trzcinski2017-01-191-1/+1
| * | | | Merge remote-tracking branch 'origin/master' into 21698-redis-runner-last-buildKamil Trzcinski2017-01-1923-111/+404
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'time-tracking-api' into 'master' Sean McGivern2017-01-182-14/+3
| | |\ \ \
| | | * | | Add some API endpoints for time tracking.Ruben Davila2017-01-182-14/+3
| | * | | | Merge branch 'backport-time-tracking-ce' into 'master' Douwe Maan2017-01-183-1/+123
| | |\ \ \ \ | | | |/ / /
| | | * | | Backport backend work for time tracking.Ruben Davila2017-01-153-1/+123
| | | | |/ | | | |/|
| | * | | Merge branch '24915_merge_slash_command' into 'master' Sean McGivern2017-01-174-5/+35
| | |\ \ \
| | | * | | Address MR commentsJarka Kadlecova2017-01-131-3/+3
| | | * | | support `/merge` slash comand for MRsJarka Kadlecova2017-01-114-5/+35
| | | |/ /
| | * | | Synchronize all project authorization refreshingrefresh-authorizations-tighter-leaseYorick Peterse2017-01-161-21/+20
| | * | | Add a spec and actually display the flash noticeRémy Coutable2017-01-161-2/+5
| | * | | Fix to display notice when project settings updated.sandish chen2017-01-151-0/+1
| | |/ /
| | * | Merge branch 'remove-project-authorizations-id-column' into 'master' Douwe Maan2017-01-091-2/+2
| | |\ \
View Lorry Controller Status