summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Adds feature flag for Group ClustersMayra Cabrera2018-11-083-29/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As the frontend is still in progress and other related backend is still in prgress we need a feature flag to turn off Group Clusters.
| * | | | | | Add active and connection disabled badges to clustersMike Greiling2018-11-081-0/+4
| | | | | | |
| * | | | | | Fix vertical padding between clusters in index pageMike Greiling2018-11-081-0/+4
| | | | | | |
| * | | | | | Redesign cluster indexMike Greiling2018-11-083-14/+40
| | | | | | |
| * | | | | | Remove integration toggle from cluster index pageMike Greiling2018-11-084-40/+8
| | | | | | |
| * | | | | | Define cluster types in a constant within frontendMike Greiling2018-11-082-3/+10
| | | | | | |
| * | | | | | Remove "project namespace" from cluster index pageMike Greiling2018-11-082-7/+2
| | | | | | |
| * | | | | | Create disabled add cluster button partial to match EEMike Greiling2018-11-082-0/+5
| | | | | | |
| * | | | | | Hide project-specific cluster apps in non-project clustersMike Greiling2018-11-083-2/+16
| | | | | | |
| * | | | | | Remove unnecessary component registrationMike Greiling2018-11-081-5/+2
| | | | | | |
| * | | | | | Let CSS determine which application row is lastMike Greiling2018-11-081-0/+6
| | | | | | |
| * | | | | | Do not allow applications for group clustersThong Kuah2018-11-082-9/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These applications will need further work in future issues to enable them to work with groups of projects.
| * | | | | | Group clusters will have no actual_namespaceThong Kuah2018-11-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the requirement to have actual_namespace before using kubeclient.
| * | | | | | Extend clusters_controller for group type clustersThong Kuah2018-11-0819-97/+913
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add pages javascripts to intialize clusters for group pages - Move specs asserting gcp specific validations from controller into UpdateService spec - Also teach Clusters::ApplicationController about groups
| * | | | | | Adds Kubernetes sidebar for groupsThong Kuah2018-11-082-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As this is the only item in this menu, make Kubernetes the link for the sidebar item too.
| * | | | | | Add policy for clusters on group levelThong Kuah2018-11-086-8/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - maintainer for group can read, create, update, and admin cluster - project user, at any level, cannot do anything with group cluster
* | | | | | | Merge branch 'qa-git-protocol-v2-http-spec' into 'master'Nick Thomas2018-11-091-0/+49
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add e2e test of push via HTTP via Git protocol v2 See merge request gitlab-org/gitlab-ce!22925
| * | | | | | | Add e2e test of push via HTTP via Git protocol v2qa-git-protocol-v2-http-specMark Lapierre2018-11-081-0/+49
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Adds a new end-to-end test to check that Git protocol v2 can be used to push over HTTP
* | | | | | | Merge branch 'fj-remove-wiki-page-created-at' into 'master'Douwe Maan2018-11-091-6/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove created_at from WikiPage See merge request gitlab-org/gitlab-ce!22905
| * | | | | | | Remove created_at from WikiPageFrancisco Javier López2018-11-091-6/+0
|/ / / / / / /
* | | | | | | Merge branch 'docs-improve-review-apps-doc' into 'master'Marin Jankovski2018-11-091-42/+50
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | Improve the Review Apps documentation a bit See merge request gitlab-org/gitlab-ce!22910
| * | | | | | Improve the Review Apps documentation a bitdocs-improve-review-apps-docRémy Coutable2018-11-081-42/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'always-proxy-reports' into 'master'Grzegorz Bizon2018-11-094-17/+51
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | backport: Always proxy reports downloads See merge request gitlab-org/gitlab-ce!22889
| * | | | | | backport: Always proxy reports downloadsalways-proxy-reportsKamil Trzciński2018-11-074-17/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes to always proxy reports
* | | | | | | Merge branch 'revert_issue_board_entity' into 'master'Stan Hu2018-11-0911-118/+34
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Extract code into IssueBoardEntity" See merge request gitlab-org/gitlab-ce!22928
| * | | | | | | Revert "Extract code into IssueBoardEntity"revert_issue_board_entityThong Kuah2018-11-0911-118/+34
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | This reverts commit 8c126525faba40032244328187ba73a53b6eaf4c.
* | | | | | | Merge branch 'patch-31' into 'master'Evan Read2018-11-091-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Parameter per_page added See merge request gitlab-org/gitlab-ce!22818
| * | | | | | | Parameter per_page addedAlvaro Junqueira2018-11-091-0/+1
|/ / / / / / /
* | | | | | | Merge branch 'patch-31' into 'master'Evan Read2018-11-091-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Typo fix stoping -> stopping in the CI README.md See merge request gitlab-org/gitlab-ce!22890
| * | | | | | Typo fix stoping -> stopping in the CI README.mdBryce Chidester2018-11-071-1/+1
| | | | | | |
* | | | | | | Merge branch 'support-gitlab-qa-post-status-to-upstream-commit' into 'master'Robert Speicher2018-11-081-1/+2
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | Allow to override the gitlab-qa ref for the downstream trigger See merge request gitlab-org/gitlab-ce!22521
| * | | | | | Allow to override the gitlab-qa ref for the downstream triggersupport-gitlab-qa-post-status-to-upstream-commitRémy Coutable2018-11-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'docs/fix-dead-link' into 'master'Achilleas Pipinellis2018-11-081-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken link See merge request gitlab-org/gitlab-ce!22917
| * | | | | | | Fix broken linkBrendan O'Leary 🐢2018-11-081-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'remove-duplicate-primary-button-in-dashboard-snippets' into ↵Dmitriy Zaporozhets2018-11-082-5/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Remove duplicate primary button in dashboard snippets Closes #53706 See merge request gitlab-org/gitlab-ce!22902
| * | | | | | | Remove duplicate primary button in dashboard snippetsGeorge Tsiolis2018-11-082-5/+5
| | | | | | | |
* | | | | | | | Merge branch '51259-ci-cd-tooltips' into 'master'Clement Ho2018-11-0811-53/+41
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces tooltip directive with gl-tooltip directive See merge request gitlab-org/gitlab-ce!22769
| * | | | | | | | Replaces tooltip directive with gl-tooltip directiveFilipa Lacerda2018-11-0811-53/+41
|/ / / / / / / /
* | | | | | | | Merge branch 'notes-multiple-discussion-fetches' into 'master'Filipa Lacerda2018-11-081-0/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop multiple discussion requests See merge request gitlab-org/gitlab-ce!22908
| * | | | | | | | Stop multiple discussion requestsnotes-multiple-discussion-fetchesPhil Hughes2018-11-081-0/+6
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With multiple discussion requests we loose the reactivity of the previously stored discussions state. This means that certain features, toggling line discussions for example, are no longer reactive.
* | | | | | | | Merge branch 'limit-parallel-to-100' into 'master'Grzegorz Bizon2018-11-083-2/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit parallel to 50 Closes #53711 See merge request gitlab-org/gitlab-ce!22907
| * | | | | | | | Limit parallel to 100limit-parallel-to-100Kamil Trzciński2018-11-083-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents some of the abusive behaviors, of someone putting 100000 and creating out of memory condition easily
* | | | | | | | | Merge branch '53640-follow-up-from-resolve-redesign-activity-feed' into 'master'Phil Hughes2018-11-082-1/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Follow-up from "Resolve "Redesign activity feed""" Closes #53640 See merge request gitlab-org/gitlab-ce!22899
| * | | | | | | | | Resolve "Follow-up from "Resolve "Redesign activity feed"""Martin Wortschack2018-11-082-1/+5
|/ / / / / / / / /
* | | | | | | | | Merge branch 'update-dependencies-list-11-5' into 'master'Sean McGivern2018-11-081-27/+25
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update license list See merge request gitlab-org/gitlab-ce!22904
| * | | | | | | | | Update license listupdate-dependencies-list-11-5Steve Azzopardi2018-11-081-27/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of part 5 on feature freeze day, we update the license list https://gitlab.com/gitlab-org/release/docs/blob/7a3b6468aed8b254a26c202e98d8476ec3d6c046/general/release-candidates.md#step-5-update-the-dependencies-license-list-on-gitlab-ce
* | | | | | | | | | Merge branch 'upgrade-workhorse-7-1-0' into 'master'Nick Thomas2018-11-082-1/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update GitLab-Workhorse to 7.1.0 See merge request gitlab-org/gitlab-ce!22883
| * | | | | | | | | | Update GitLab-Workhorse to 7.1.0upgrade-workhorse-7-1-0Andrew Newdigate2018-11-072-1/+6
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'update-templates' into 'master'Douwe Maan2018-11-0813-12/+165
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run rake gitlab:update_templates See merge request gitlab-org/gitlab-ce!22903
| * | | | | | | | | | | Run rake gitlab:update_templatesSteve Azzopardi2018-11-0813-12/+165
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As part of step 4 on feature freeze day, we need to update the templates. https://gitlab.com/gitlab-org/release/docs/blob/7a3b6468aed8b254a26c202e98d8476ec3d6c046/general/release-candidates.md#step-4-update-the-gitignore-and-dockerfile-templates-on-gitlab-ce