summaryrefslogtreecommitdiff
path: root/app/services
Commit message (Expand)AuthorAgeFilesLines
* Make `#hashed_storage?` require feature argument3674-hashed-storage-attachmentsGabriel Mazetto2017-10-311-1/+1
* Merge branch 'bvl-fix-push-event-service-for-forks' into 'master'Douwe Maan2017-10-231-2/+2
|\
| * Only cache the event for the fork-source when it existsbvl-fix-push-event-service-for-forksBob Van Landuyt2017-10-221-2/+2
* | Use wiki.disk_pathNick Thomas2017-10-181-1/+1
|/
* Merge branch 'master' into sh-security-fix-backports-masterStan Hu2017-10-171-1/+1
|\
| * Fix errors when deleting a forked projectBob Van Landuyt2017-10-171-1/+1
* | Merge branch 'security-10-1' into '10-1-stable'Jen-Shin Lin2017-10-171-7/+0
|/
* Merge branch '38236-remove-build-failed-todo-if-it-has-been-auto-retried' int...Grzegorz Bizon2017-10-162-1/+3
|\
| * Don't create build failed todo when build is retried38236-remove-build-failed-todo-if-it-has-been-auto-retriedSean McGivern2017-10-162-1/+3
* | Merge branch 'conflict-resolution-refactor' into 'master'Sean McGivern2017-10-162-48/+4
|\ \
| * | Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez2017-10-121-1/+1
| * | Refactor conflict resolution to contain git ops within Gitlab::GitAlejandro Rodríguez2017-10-122-3/+3
| * | Encapsulate git operations for conflict resolution into libAlejandro Rodríguez2017-10-121-46/+2
| |/
* | added date parameter for time trackinggitlab-ee-1312-time-spent-atVlad2017-10-132-6/+12
|/
* Merge branch '26763-grant-registry-auth-scope-to-admins' into 'master'Kamil Trzciński2017-10-121-3/+14
|\
| * refactor access handlingVratislav Kalenda2017-10-101-5/+12
| * remove whitespaceVratislav Kalenda2017-10-081-1/+0
| * Issue JWT token with registry:catalog:* scope when requested by GitLab adminVratislav Kalenda2017-10-081-0/+5
* | Merge branch '34897-delete-branch-after-merge' into 'master'Sean McGivern2017-10-121-7/+11
|\ \
| * | fix a whitespace34897-delete-branch-after-mergeMicael Bergeron2017-10-121-1/+1
| * | fix for discussionMicael Bergeron2017-10-121-3/+4
| * | fix the merger override to remove source branchmicael.bergeron2017-10-111-5/+8
* | | Merge branch '37691-subscription-fires-multiple-notifications' into 'master'Sean McGivern2017-10-121-1/+1
|\ \ \ | |/ / |/| |
| * | fix multiple notifications from being sent for multiple labelsmicael.bergeron2017-10-101-1/+1
* | | Stop using `branch_names.include?` and use `branch_exists?`Andrew Newdigate2017-10-101-1/+1
* | | Fix text for the merge request lock system noteJarka Kadlecova2017-10-101-1/+1
* | | Merge branch '34284-add-changes-to-issuable-webhook-data' into 'master'Douwe Maan2017-10-094-16/+16
|\ \ \
| * | | Start adding Gitlab::HookData::IssuableBuilderRémy Coutable2017-10-093-9/+9
| * | | Include the changes in issuable webhook payloadsRémy Coutable2017-10-094-16/+16
| | |/ | |/|
* | | Don't create todos for old issue assigneesJarka Kadlecova2017-10-092-5/+6
|/ /
* | Merge branch 'tc-geo-read-only-idea' into 'master'Douwe Maan2017-10-072-1/+3
|\ \
| * | Create idea of read-only databasetc-geo-read-only-ideaToon Claes2017-10-062-1/+3
* | | Store the name of a project that's a root of a fork networkBob Van Landuyt2017-10-071-0/+7
* | | Remove membership from fork network when unlinkingBob Van Landuyt2017-10-071-0/+1
* | | Create a fork network when forking a projectBob Van Landuyt2017-10-071-0/+20
* | | Merge branch 'master' into '37970-ci-sections-tracking'Kamil Trzciński2017-10-0714-15/+254
|\ \ \ | |/ /
| * | Merge branch 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-serv...Kamil Trzciński2017-10-067-0/+221
| |\ \
| | * | Fix almost all unresolved comments from Docs and UX reviewKamil Trzcinski2017-10-051-2/+4
| | * | Added cluster controller specsKamil Trzcinski2017-10-051-1/+1
| | * | Merge remote-tracking branch 'origin/master' into feature/sm/35954-create-kub...Kamil Trzcinski2017-10-055-15/+14
| | |\ \
| | * | | fetch_kubernetes_token_service_spec. Fix static analysys.Shinya Maeda2017-10-051-0/+2
| | * | | integrate_cluster_service_spec. provision_cluster_service_spec. update_cluste...Shinya Maeda2017-10-051-1/+1
| | * | | Remove status enum from Gcp::Cluster, use state_machine#stateKamil Trzcinski2017-10-041-1/+0
| | * | | Fix cluster event names to be prefixed with: `make_`Kamil Trzcinski2017-10-044-9/+9
| | * | | Add google_api to TOP_LEVEL_ROUTES. Import/Export model failure fix. Fix stat...Shinya Maeda2017-10-043-8/+7
| | * | | Specify defaults, fix policies, fix db columnsKamil Trzcinski2017-10-041-1/+1
| | * | | Gcp::Cluster improvementsKamil Trzcinski2017-10-031-1/+9
| | * | | Rename to ClusterProvisionWorker and CreateGkeClusterService.new.executeKamil Trzcinski2017-10-032-6/+6
| | * | | Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-042-0/+29
| | |\ \ \
| | * \ \ \ Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-048-140/+128
| | |\ \ \ \
View Lorry Controller Status