summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez2017-10-121-4/+4
* Refactor conflict resolution to contain git ops within Gitlab::GitAlejandro Rodríguez2017-10-121-4/+4
* Stop using `branch_names.include?` and use `branch_exists?`Andrew Newdigate2017-10-101-1/+1
* Replaces `tag: true` into `:tag` in the specsJacopo2017-10-071-1/+1
* Add a project forks spec helperBob Van Landuyt2017-10-075-40/+35
* Show confirmation modal before deleting accountWinnie Hellmann2017-10-061-4/+60
* Merge branch 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-serv...Kamil Trzciński2017-10-062-0/+357
|\
| * Improve redirect uri state and fix all remaining testsKamil Trzcinski2017-10-062-8/+7
| * Use short path project_clusters_urlShinya Maeda2017-10-061-1/+1
| * Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-064-14/+87
| |\
| * | Security fix: redirection in google_api/authorizations_controllerShinya Maeda2017-10-061-8/+15
| * | Fix almost all unresolved comments from Docs and UX reviewKamil Trzcinski2017-10-051-1/+1
| * | Add ClusterPresenter. Fix Static Analysys.Shinya Maeda2017-10-061-11/+9
| * | Merge branch 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-serv...Kamil Trzcinski2017-10-051-0/+43
| |\ \
| | * | spec/features/projects/clusters_spec. Fix static analysysShinya Maeda2017-10-051-1/+1
| | * | authorizations_controller_spec. cluster_policy_spec.Shinya Maeda2017-10-051-0/+43
| * | | Added cluster controller specsKamil Trzcinski2017-10-051-0/+310
* | | | Merge branch '18608-lock-issues-v2' into 'master'Sean McGivern2017-10-061-0/+50
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge remote-tracking branch 'origin/master' into 18608-lock-issuesLuke "Jared" Bennett2017-09-203-0/+76
| |\ \ \
| * | | | Create system notes for MR too, improve doc + clean up codeJarka Kadlecova2017-09-141-0/+9
| * | | | Check the discussion lock only for issuables & clean styleJarka Kadlecova2017-09-141-2/+2
| * | | | Support discussion locking in the backendJarka Kadlecova2017-09-141-0/+41
* | | | | Merge branch '34102-online-view-of-artifacts-fe' into 'master'Nick Thomas2017-10-051-11/+59
|\ \ \ \ \
| * | | | | Test against public projectsZeger-Jan van de Weg2017-10-051-1/+20
| * | | | | Incorporate feedbackZeger-Jan van de Weg2017-10-041-9/+33
| * | | | | Merge branch 'master' into 34102-online-view-of-artifacts-feEric Eastwood2017-10-046-182/+195
| |\ \ \ \ \
| * | | | | | Redirect to pages daemonZeger-Jan van de Weg2017-10-031-4/+9
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'zj-gitaly-namespace-service' into 'master'Douwe Maan2017-10-052-2/+3
|\ \ \ \ \ \
| * | | | | | Fix namespace deletion testsZeger-Jan van de Weg2017-10-051-1/+1
| * | | | | | Gitaly namespace service enabled for GitLabZeger-Jan van de Weg2017-10-051-1/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'save-a-query-on-todos-with-no-filters' into 'master'Yorick Peterse2017-10-051-1/+25
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Save a query on the todos index pagesave-a-query-on-todos-with-no-filtersSean McGivern2017-10-041-1/+25
| |/ / / /
* | | | | Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_e...Douwe Maan2017-10-058-210/+313
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '31050-registry-image-lists' into 'master'Grzegorz Bizon2017-10-042-16/+118
| |\ \ \ \
| | * | | | Fix rubocop error31050-registry-image-listsFilipa Lacerda2017-10-031-1/+1
| | * | | | Fix rubocop failuresKamil Trzcinski2017-10-031-8/+8
| | * | | | Add serializer matchersKamil Trzcinski2017-10-022-16/+118
| | |/ / /
| * | | | Merge branch '36876-mr-show-json-controller-perf-improvements' into 'master'Douwe Maan2017-10-041-12/+0
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Reduce method calls while evaluating Projects::MergeRequestsController#show.json36876-mr-show-json-controller-perf-improvementsOswaldo Ferreira2017-10-041-12/+0
| | |/ /
| * | | Resolve "Precompiled assets with digest strings are ignored in CI"Mike Greiling2017-10-033-3/+3
| * | | Merge branch '36670-remove-edit-form' into 'master'Sean McGivern2017-10-031-179/+140
| |\ \ \
| | * | | refactor issues_controller_spec `update` actionJarka Kadlecova2017-10-031-157/+140
| | * | | Remove edit action for issuesJarka Kadlecova2017-10-031-29/+7
| | |/ /
| * | | Merge branch 'sh-improve-perf-notes-actions' into 'master'Douwe Maan2017-10-031-0/+34
| |\ \ \
| | * | | Improve performance of filtering notes in NotesControllersh-improve-perf-notes-actionsStan Hu2017-10-021-0/+34
| | |/ /
| * | | Pulling merge_method spec for project_controller_spec from EE[ci skip]Valery Sizov2017-09-201-0/+18
| |/ /
* | | spacing and small optimisationsAlexandra2017-10-011-3/+4
* | | must now set the devise default scope (since we now have an :email scope)Brett Walker2017-09-241-1/+1
* | | allow a verified secondary email to be use as the primary withoutBrett Walker2017-09-231-0/+14
* | | fixes for rubocopBrett Walker2017-09-231-2/+2
View Lorry Controller Status