summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Make sure all queries are limited to the page sizeBob Van Landuyt2017-10-041-3/+3
| | | | | | | | | | | | | | | | And fix some pagination bugs
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By preloading the count of members, projects and subgroups of a group, we don't need to query them later. We also preload the entire hierarchy for a search result and include the counts so we don't need to query for them again
| * | | Improve number of queriesBob Van Landuyt2017-10-041-25/+25
| | | | | | | | | | | | | | | | And document what extra queries are still being performed.
| * | | 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
| | | | | | | | | | | | | | | | | | | | When fetching children for a group with a filter, we will search all nested groups for results and render them in an expanded tree
| * | | 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
| | | | | | | | | | | | | | | | Rename classes to (hopefully) clearer names while we're doing that.
* | | | Refactor conflict resolution to contain git ops within Gitlab::GitAlejandro Rodríguez2017-10-121-4/+4
| |/ / |/| | | | | | | | | | | This prepares the codebase for a Gitaly migration. See https://gitlab.com/gitlab-org/gitaly/issues/553
* | | 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
| | | | | | | | | | | | | | | | | | Replaces all the explicit include metadata syntax in the specs (tag: true) into the implicit one (:tag). Added a cop to prevent future errors and handle autocorrection.
* | | Add a project forks spec helperBob Van Landuyt2017-10-075-40/+35
| | | | | | | | | | | | | | | The helper creates a fork of a project with all provided attributes, but skipping the creation of the repository on disk.
* | | Show confirmation modal before deleting accountWinnie Hellmann2017-10-061-4/+60
| | |
* | | Merge branch ↵Kamil Trzciński2017-10-062-0/+357
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service' into 'master' Create Kubernetes cluster on GKE from k8s service Closes #35954 See merge request gitlab-org/gitlab-ce!14470
| * | | 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 ↵Shinya Maeda2017-10-064-14/+87
| |\ \ \ | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| * | | | 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 ↵Kamil Trzcinski2017-10-051-0/+43
| |\ \ \ \ | | | | | | | | | | | | | | | | | | 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service' of gitlab.com:gitlab-org/gitlab-ce into feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| | * | | | 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
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Resolve "Lock issue and merge request" Closes #18608 See merge request gitlab-org/gitlab-ce!14531
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add external link for online artifacts Closes #34102 See merge request gitlab-org/gitlab-ce!14399
| * | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitaly namespace service enabled for GitLab See merge request gitlab-org/gitlab-ce!14274
| * | | | | | 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 page See merge request gitlab-org/gitlab-ce!14686
| * | | | | Save a query on the todos index pagesave-a-query-on-todos-with-no-filtersSean McGivern2017-10-041-1/+25
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | When there are no filters, we can get the total todos count from the cached count on the user object, instead of performing a DB query. This query takes about 80ms for me on GitLab.com.
* | | | | Merge branch 'master' into ↵Douwe Maan2017-10-058-210/+313
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | digitalmoksha/gitlab-ce-feature/verify_secondary_emails # Conflicts: # app/controllers/admin/users_controller.rb # app/controllers/confirmations_controller.rb # app/controllers/profiles/emails_controller.rb # app/models/user.rb # app/services/emails/base_service.rb # app/services/emails/destroy_service.rb # app/views/devise/mailer/confirmation_instructions.html.haml # lib/api/users.rb # spec/services/emails/destroy_service_spec.rb
| * | | | Merge branch '31050-registry-image-lists' into 'master'Grzegorz Bizon2017-10-042-16/+118
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lazy load and paginate registry image list Closes #31050 See merge request gitlab-org/gitlab-ce!14303
| | * | | | Fix rubocop error31050-registry-image-listsFilipa Lacerda2017-10-031-1/+1
| | | | | |
| | * | | | Fix rubocop failuresKamil Trzcinski2017-10-031-8/+8
| | | | | |
View Lorry Controller Status