summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* Improve discussion_line_code set and update notes_controller_specLuke "Jared" Bennett2017-10-211-0/+5
* Merge branch 'not-found-in-commits' into 'master'Douwe Maan2017-10-191-2/+29
|\
| * Renders 404 in commits controller if no commits are foundGuilherme Vieira2017-10-181-2/+29
* | Merge branch 'sh-security-fix-backports-master' into 'master'Robert Speicher2017-10-182-34/+67
|\ \
| * \ Merge branch 'master' into sh-security-fix-backports-masterStan Hu2017-10-176-83/+478
| |\ \
| * | | Merge branch 'security-10-1' into '10-1-stable'Jen-Shin Lin2017-10-172-34/+67
* | | | Merge branch '30140-restore-readme-only-preference' into 'master'Douwe Maan2017-10-181-0/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | Add readme only option as project viewAnnabel Dunstone Gray2017-10-161-0/+8
| |/ /
* | | Merge branch 'zj-gitaly-n-1-call-test' into 'master'Douwe Maan2017-10-171-11/+21
|\ \ \
| * | | Allow testing on Gitaly call countZeger-Jan van de Weg2017-10-161-11/+21
* | | | Merge branch 'bvl-group-trees' into 'master'Douwe Maan2017-10-175-72/+457
|\ \ \ \ | |_|/ / |/| | |
| * | | Make sure we always return an array of hierarchiesBob Van Landuyt2017-10-131-0/+9
| * | | Nest the group_children_path inside the canonical group pathBob Van Landuyt2017-10-122-270/+277
| * | | Fix spinach featuresBob Van Landuyt2017-10-111-1/+0
| * | | Merge branch 'master' into bvl-group-treesBob Van Landuyt2017-10-1014-60/+640
| |\ \ \ | | |/ /
| * | | Don't load unneeded elements in GroupsController#showBob Van Landuyt2017-10-101-45/+44
| * | | Only expand ancestors when searchingBob Van Landuyt2017-10-091-1/+12
| * | | Make sure all ancestors are loaded when searching groupsBob Van Landuyt2017-10-051-2/+2
| * | | Return an empty array when no matches are foundBob Van Landuyt2017-10-041-0/+10
| * | | Fix bug with project paginationBob Van Landuyt2017-10-041-5/+7
| * | | Only preload ancestors for search results in the specified parentBob Van Landuyt2017-10-041-0/+10
| * | | Make sure all queries are limited to the page sizeBob Van Landuyt2017-10-041-3/+3
| * | | Fix nesting bug when rendering children of a shared subgroupBob Van Landuyt2017-10-041-0/+26
| * | | Minimize the number of queries by preloading counts and ancestorsBob Van Landuyt2017-10-041-23/+11
| * | | Improve number of queriesBob Van Landuyt2017-10-041-25/+25
| * | | Include pagination when rendering expanded hierarchiesBob Van Landuyt2017-10-041-0/+12
| * | | [WIP] improve number of queries when rendering a hierarchyBob Van Landuyt2017-10-041-12/+19
| * | | Search subgroups on dashboard and explore viewsBob Van Landuyt2017-10-042-2/+23
| * | | Reuse the groups tree for explore and dashboard.Bob Van Landuyt2017-10-044-75/+168
| * | | Use same response-body in groups-dashboard as we do for group-homeBob Van Landuyt2017-10-041-0/+29
| * | | Limit the amount of queries per rowBob Van Landuyt2017-10-041-6/+79
| * | | Allow filtering children for a groupBob Van Landuyt2017-10-041-0/+30
| * | | Add pagination for childrenBob Van Landuyt2017-10-041-0/+18
| * | | Update `children` route to handle projects and groupsBob Van Landuyt2017-10-041-21/+61
| * | | Remove the subgroups path on a groupBob Van Landuyt2017-10-041-0/+1
* | | | 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
View Lorry Controller Status