summaryrefslogtreecommitdiff
path: root/spec/services
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \
| * | | Start adding Gitlab::HookData::IssuableBuilderRémy Coutable2017-10-091-2/+3
| * | | Include the changes in issuable webhook payloadsRémy Coutable2017-10-092-5/+5
| | |/ | |/|
* | | Don't create todos for old issue assigneesJarka Kadlecova2017-10-091-0/+24
|/ /
* | Merge branch 'tc-geo-read-only-idea' into 'master'Douwe Maan2017-10-072-1/+13
|\ \
| * | Create idea of read-only databasetc-geo-read-only-ideaToon Claes2017-10-062-1/+13
* | | Store the name of a project that's a root of a fork networkBob Van Landuyt2017-10-071-0/+13
* | | Remove membership from fork network when unlinkingBob Van Landuyt2017-10-071-8/+22
* | | Add a project forks spec helperBob Van Landuyt2017-10-077-35/+33
* | | Create a fork network when forking a projectBob Van Landuyt2017-10-071-0/+27
* | | Merge branch 'master' into '37970-ci-sections-tracking'Kamil Trzciński2017-10-0715-19/+428
|\ \ \
| * | | Commenting on image diffsFelipe Artur2017-10-071-3/+3
| |/ /
| * | Merge branch 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-serv...Kamil Trzciński2017-10-067-0/+372
| |\ \
| | * \ Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-071-0/+10
| | |\ \
| | * \ \ Merge remote-tracking branch 'origin/master' into feature/sm/35954-create-kub...Kamil Trzcinski2017-10-054-14/+22
| | |\ \ \
| | * | | | fetch_kubernetes_token_service_spec. Fix static analysys.Shinya Maeda2017-10-051-6/+53
| | * | | | integrate_cluster_service_spec. provision_cluster_service_spec. update_cluste...Shinya Maeda2017-10-053-12/+125
| | * | | | Fix Rubocop failuresKamil Trzcinski2017-10-041-2/+2
| | * | | | fetch_gcp_operation_service_spec. finalize_cluster_creation_service_spec. wai...Shinya Maeda2017-10-052-9/+72
| | * | | | create_cluster_service_spec. cluster_provision_worker_spec. cluster_queue_spec.Shinya Maeda2017-10-041-2/+30
| | * | | | Add spec/models/gcp/cluster_spec.rbShinya Maeda2017-10-047-0/+121
| * | | | | Merge branch '18608-lock-issues-v2' into 'master'Sean McGivern2017-10-062-2/+21
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issu...Jarka Kadlecova2017-10-0312-118/+155
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issuesJarka Kadlecova2017-09-251-0/+63
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Merge remote-tracking branch 'origin/master' into 18608-lock-issuesLuke "Jared" Bennett2017-09-207-7/+16
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into 18608-lock-issuesLuke "Jared" Bennett2017-09-186-7/+75
| | |\ \ \ \ \ \
| | * | | | | | | Create system notes for MR too, improve doc + clean up codeJarka Kadlecova2017-09-142-0/+14
| | * | | | | | | Support discussion locking in the backendJarka Kadlecova2017-09-142-2/+7
| * | | | | | | | Add some basic specs and refactor model and validationsRubén Dávila2017-10-051-0/+10
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_e...Douwe Maan2017-10-0513-148/+321
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |