summaryrefslogtreecommitdiff
path: root/spec/services
Commit message (Expand)AuthorAgeFilesLines
* Remove 10.3 comments (Tracked by a tech debts issue). Refactor spec factory n...refactor-clustersShinya Maeda2017-11-064-56/+3
* Merge branch 'master' into refactor-clustersShinya Maeda2017-11-052-0/+56
|\
| * Merge branch 'bvl-unlink-fixes' into 'master'Douwe Maan2017-11-031-0/+18
| |\
| | * Unlink a project from a fork network when it's source was deleted.Bob Van Landuyt2017-11-031-0/+18
| * | Add system hooks user_rename and group_renameWinnie Hellmann2017-11-031-0/+38
* | | Merge branch 'master' into refactor-clustersEric Eastwood2017-11-031-0/+13
|\ \ \ | |/ /
| * | Merge branch 'refactor-services-for-audit-events-ce' into 'master'Grzegorz Bizon2017-11-031-0/+13
| |\ \
| | * | fix specsJames Lopez2017-11-021-1/+2
| | * | add applications controller logicJames Lopez2017-10-311-0/+12
* | | | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-031-0/+49
|\ \ \ \ | |/ / /
| * | | CE port of code changed for epicsjk-epic-changes-ce-portJarka Kadlecova2017-11-021-0/+49
| | |/ | |/|
* | | Fix some testsShinya Maeda2017-11-032-58/+49
* | | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-022-0/+38
|\ \ \ | |/ /
| * | Refactor/group links controllerFrancisco Javier López2017-11-012-0/+38
* | | Revert back FetchKubernetesTokenServiceKamil Trzcinski2017-11-011-0/+64
* | | Fix spec. Fix usage ping. Fix warnings by adding new models and attributes.Shinya Maeda2017-11-012-3/+3
* | | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-015-51/+84
|\ \ \ | |/ /
| * | Allow promoting project milestones to group milestonesFelipe Artur2017-10-311-0/+77
| * | Merge branch '3674-hashed-storage-attachments' into 'master'Douwe Maan2017-10-311-1/+1
| |\ \ | | |/ | |/|
| | * Make `#hashed_storage?` require feature argument3674-hashed-storage-attachmentsGabriel Mazetto2017-10-311-1/+1
| * | Merge branch 'make-merge-jid-handling-less-stateful' into 'master'Sean McGivern2017-10-301-49/+0
| |\ \
| | * | Make merge_jid handling less stateful in MergeServiceOswaldo Ferreira2017-10-271-49/+0
| | |/
| * | Use the correct project visibility in system hooksBob Van Landuyt2017-10-301-0/+6
| |/
| * Only cache the event for the fork-source when it existsbvl-fix-push-event-service-for-forksBob Van Landuyt2017-10-221-1/+0
* | specs for featureShinya Maeda2017-11-011-42/+107
* | specs for services. Improved details.Shinya Maeda2017-10-3013-372/+450
|/
* Merge branch 'master' into sh-security-fix-backports-masterStan Hu2017-10-171-0/+17
|\
| * Fix errors when deleting a forked projectBob Van Landuyt2017-10-171-0/+17
* | Merge branch 'security-10-1' into '10-1-stable'Jen-Shin Lin2017-10-171-14/+0
|/
* Merge branch '38236-remove-build-failed-todo-if-it-has-been-auto-retried' int...Grzegorz Bizon2017-10-161-1/+2
|\
| * Don't create build failed todo when build is retried38236-remove-build-failed-todo-if-it-has-been-auto-retriedSean McGivern2017-10-161-1/+2
* | Merge branch 'conflict-resolution-refactor' into 'master'Sean McGivern2017-10-162-14/+21
|\ \
| * | Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez2017-10-121-6/+6
| * | Refactor conflict resolution to contain git ops within Gitlab::GitAlejandro Rodríguez2017-10-122-14/+21
| * | Encapsulate git operations for conflict resolution into libAlejandro Rodríguez2017-10-121-1/+1
| |/
* | Merge branch '35853-pages-missing-dotfiles' into 'master'Kamil Trzciński2017-10-161-0/+5
|\ \
| * | Include a .hidden directory in pages artifact extraction testsNick Thomas2017-10-121-0/+5
* | | added date parameter for time trackinggitlab-ee-1312-time-spent-atVlad2017-10-131-2/+54
| |/ |/|
* | Merge branch '26763-grant-registry-auth-scope-to-admins' into 'master'Kamil Trzciński2017-10-121-1/+49
|\ \ | |/ |/|
| * fix code style issuesVratislav Kalenda2017-10-101-2/+10
| * fix lintVratislav Kalenda2017-10-081-6/+3
| * remove whitespaceVratislav Kalenda2017-10-081-3/+1
| * Issue JWT token with registry:catalog:* scope when requested by GitLab adminVratislav Kalenda2017-10-081-0/+45
* | Merge branch '34897-delete-branch-after-merge' into 'master'Sean McGivern2017-10-121-7/+16
|\ \
| * | add specmicael.bergeron2017-10-111-7/+16
* | | Merge branch '37691-subscription-fires-multiple-notifications' into 'master'Sean McGivern2017-10-121-0/+12
|\ \ \
| * | | fix multiple notifications from being sent for multiple labelsmicael.bergeron2017-10-101-0/+12
* | | | Backport EE change for setting up forked projectbackport-ee-change-for-testLin Jen-Shin2017-10-111-5/+1
| |/ / |/| |
* | | Fix text for the merge request lock system noteJarka Kadlecova2017-10-102-2/+40
* | | Merge branch '34284-add-changes-to-issuable-webhook-data' into 'master'Douwe Maan2017-10-092-6/+7
|\ \ \