delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Move shared examples into the only file where usedextract_creates_cluster_from_project_clusters_controller	Thong Kuah	2018-10-17	2	-75/+87
\| \| \| \| \|	This will make it easier to perform in place adjustments, etc for future MRs involving group clusters.
*	Extracts creation of cluster to controller concern	Thong Kuah	2018-10-17	12	-277/+403
\| \| \| \| \| \| \| \| \| \|	Extracted from `Projects::ClustersController#new`, `#create_gcp`, `#create_user` into new common module, with shared views and shared examples. This will allow when we have Groups::ClustersController to share most of the code. Address ModuleWithInstanceVariables warnings by moving to render with locals
*	Merge branch 'refactor-project-cluster-controller-specs' into 'master'	Grzegorz Bizon	2018-10-16	1	-180/+106
\|\ \| \| \| \| \| \| \| \|	Project::ClustersController spec improvement See merge request gitlab-org/gitlab-ce!22346
\| *	Revert back to go but use arguments for some cases	Thong Kuah	2018-10-16	1	-114/+99
\| \| \| \| \| \| \| \| \| \| \| \|	It has been pointed out that `go` is used quite extensively so it's not an unknown idiam here at GitLab. And we have arguments with `go` which is a plus.
\| *	Use subject in controller spec	Thong Kuah	2018-10-15	1	-261/+202
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Swap out `go` method with subject which is the convention. Re-organize 'PUT update' to remove un-necessary context nesting. DRY up repeated blocks to `add_maintainer` and `sign_in`
* \|	Merge branch '51972-prometheus-not-showing-as-installed-even-though-it-is' ↵	Sean McGivern	2018-10-16	14	-76/+127
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Prometheus not showing as installed, even though it is" Closes #51972 See merge request gitlab-org/gitlab-ce!22356
\| * \|	Show available clusters when installed or updated	Peter Leitzen	2018-10-16	14	-76/+127
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Before this commit updating Prometheus (e.g. adding alerts) made it "updated" therefore not installed.
* \| \|	Merge branch 'ce-7015-epic-states-notes' into 'master'	Kamil Trzciński	2018-10-16	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make source param optional according to EE change See merge request gitlab-org/gitlab-ce!22283
\| * \| \|	Make source param optional according to EE change	Jarka Košanová	2018-10-11	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'rails5-fix-utf' into 'master'	Sean McGivern	2018-10-16	2	-8/+22
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use InvalidUTF8ErrorHandler only for rails 4 Closes #51908 See merge request gitlab-org/gitlab-ce!22340
\| * \| \|	Use InvalidUTF8ErrorHandler only for rails 4	Jan Provaznik	2018-10-13	2	-8/+22
\| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In Rails 5 catches invalid UTF8 characters in querystring in a params middleware, errors are handled by a params middleware and raises a BadRequest exception. This means that these UTF8 errors are not raised deeper in application stack and these can't also be handled on application level. If we would want to have custom handler for these errors, we would have to create a new middleware and insert it before actionpack's params middleware and rescue BadRequest exceptions there. But there is no need to do this currently (see discussion on https://gitlab.com/gitlab-org/gitlab-ce/issues/51908)
* \| \|	Merge branch 'docs-update-maintenance-path-typo-ck' into 'master'	Achilleas Pipinellis	2018-10-16	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo: 9.5.8 => 9.5.10 See merge request gitlab-org/gitlab-ce!22368
\| * \| \|	Fix typo: 9.5.8 => 9.5.10	Chenjerai Katanda	2018-10-15	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'docs/fix-link-to-when-delayed' into 'master'	Achilleas Pipinellis	2018-10-16	3	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix link to 'when delayed' YAML configuration item See merge request gitlab-org/gitlab-ce!22349
\| * \| \| \|	Fix link to 'when delayed' YAML configuration item	Evan Read	2018-10-16	3	-2/+2
\|/ / / /
* \| \| \|	Merge branch 'da-fix-does-not-import-projects-over-ssh' into 'master'	Stan Hu	2018-10-16	5	-28/+57
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Does not allow a SSH URI when importing a project See merge request gitlab-org/gitlab-ce!22309
\| * \| \| \|	Does not allow an import_url with SSH protocol	Douglas Barbosa Alexandre	2018-10-15	5	-28/+57
\| \| \| \| \|
* \| \| \| \|	Merge branch 'revert-f90fc922' into 'master'	Mike Greiling	2018-10-15	22	-117/+38
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'ce-6983-promote-starting-a-gitlab-com-trial' into 'master'" See merge request gitlab-org/gitlab-ce!22315
\| * \| \| \| \|	Revert "Merge branch 'ce-6983-promote-starting-a-gitlab-com-trial' into ↵	Luke Bennett	2018-10-12	22	-117/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master'" This reverts merge request !21551
* \| \| \| \| \|	Merge branch 'docs-fix-img-shadow' into 'master'	Achilleas Pipinellis	2018-10-15	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Fixes image shadow See merge request gitlab-org/gitlab-ce!22366
\| * \| \| \| \| \|	Fixes image shadow	Marcia Ramos	2018-10-15	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'define-stage-labels-in-issue-workflow' into 'master'	Mek Stittri	2018-10-15	1	-0/+34
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Define Stage labels in issue workflow See merge request gitlab-org/gitlab-ce!22313
\| * \| \| \| \| \| \|	Define Stage labels in issue workflow	Fabio Busatto	2018-10-15	1	-0/+34
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'docs-update-remove-push-rules-feauture-not-yet-available' into ↵	Douwe Maan	2018-10-15	1	-1/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' docs remove reference to push rules as not yet implemented for groups See merge request gitlab-org/gitlab-ce!22305
\| * \| \| \| \| \| \|	Update doc/user/group/index.md	Alexander Strachan	2018-10-12	1	-1/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'replace-i-to-icons-in-vue-components' into 'master'	Clement Ho	2018-10-15	22	-87/+99
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace `<i>` in vue components with `<icon>` See merge request gitlab-org/gitlab-ce!20748
\| * \| \| \| \| \| \|	Replace `<i>` in vue components with `<icon>`	George Tsiolis	2018-10-15	22	-87/+99
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'sh-remove-koding' into 'master'	Douwe Maan	2018-10-15	78	-1052/+27
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Koding integration and documentation Closes #39697 See merge request gitlab-org/gitlab-ce!22334
\| * \| \| \| \| \| \|	Remove unneeded I8N text for Koding	Stan Hu	2018-10-12	30	-90/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove Koding integration and documentation	Stan Hu	2018-10-12	78	-962/+27
\| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This integration no longer works and does not appear to be supported. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/39697
* \| \| \| \| \| \|	Merge branch ↵	Clement Ho	2018-10-15	4	-32/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'52532-unable-to-toggle-issuable-sidebar-out-of-collapsed-state' into 'master' Allow Issue and Merge Request sidebar to be toggled from collapsed state Closes #52532 See merge request gitlab-org/gitlab-ce!22353
\| * \| \| \| \| \| \|	Remove unused eslint disable	Clement Ho	2018-10-15	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove obsolete usage of gl.lazyLoader.loadCheck	Lukas Eipert	2018-10-15	4	-31/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In [!21565][0] we removed the loadCheck function from the LazyLoader for images. The function seemed to be obsolete before anyhow, because we make use of the MutationObserver in order to detect elements added / removed from the DOM. [0]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21565
* \| \| \| \| \| \| \|	Merge branch 'qa-add-a-cop-to-forbit-element-with-pattern' into 'master'	Stan Hu	2018-10-15	48	-152/+298
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a new QA::ElementWithPattern cop Closes #52516 See merge request gitlab-org/gitlab-ce!22298
\| * \| \| \| \| \| \| \|	Disable the QA/ElementWithPattern cop for existing offenses	Rémy Coutable	2018-10-15	43	-152/+160
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	Add a new QA::ElementWithPattern cop	Rémy Coutable	2018-10-15	5	-0/+138
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This cop forbids the use of `element :foo, 'pattern'` and `element :bar, /pattern/` in QA files. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch 'bvl-merge-base-multiple-revisions' into 'master'	Douwe Maan	2018-10-15	7	-16/+29
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow getting the merge base of multiple revisions Closes #52573 See merge request gitlab-org/gitlab-ce!22295
\| * \| \| \| \| \| \| \|	Allow getting the merge base of multiple revisions	Bob Van Landuyt	2018-10-12	7	-16/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As we now support getting the merge base for multiple revisions in gitaly, we can provide this functionality in our API
* \| \| \| \| \| \| \| \|	Merge branch 'ready-for-review-doc' into 'master'	Douwe Maan	2018-10-15	1	-1/+15
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation how to assign a merge request for review See merge request gitlab-org/gitlab-ce!21327
\| * \| \| \| \| \| \| \| \|	Add documentation how to assign a merge request for review	Jarka Kadlecová	2018-10-15	1	-1/+15
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'zj-remove-linguist' into 'master'	Robert Speicher	2018-10-15	23	-90/+5846
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove dependencies on Linguist Closes #35450 See merge request gitlab-org/gitlab-ce!21008
\| * \| \| \| \| \| \| \| \|	Remove dependencies on Linguist	Zeger-Jan van de Weg	2018-10-12	23	-90/+5846
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This saves about 128 MB of baseline RAM usage per Unicorn and Sidekiq process (!). Linguist wasn't detecting languages anymore from CE/EE since 9ae8b57467ac8b38f1fa9020a466d94a93cbb9dd. However, Linguist::BlobHelper was still being depended on by BlobLike and others. This removes the Linguist gem, given it isn't required anymore. EscapeUtils were pulled in as dependency, but given Banzai depends on it, it is now added explicitly. Previously, Linguist was used to detect the best ACE mode. Instead, we rely on ACE to guess the best mode based on the file extension.
* \| \| \| \| \| \| \| \|	Merge branch '34758-refactor-cluster-services' into 'master'	Dmitriy Zaporozhets	2018-10-15	5	-26/+30
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor Cluster services to enable groups or projects See merge request gitlab-org/gitlab-ce!22181
\| * \| \| \| \| \| \| \| \|	Pass in project as kwarg for CreateService	Thong Kuah	2018-10-15	5	-26/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This enables us to have other options in the future such as passing in `group:`. Also, remove project arg from UpdateService, as un-used. This will help group cluster controller to re-use this services.
* \| \| \| \| \| \| \| \| \|	Merge branch '52669-fixes-quick-actions-preview' into 'master'	Douglas Barbosa Alexandre	2018-10-15	4	-2/+16
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes close/reopen quick actions preview for issues and merge_requests Closes #52669 See merge request gitlab-org/gitlab-ce!22343
\| * \| \| \| \| \| \| \| \| \|	Fixes close/reopen quick actions preview for issues and merge_requests	Jacopo	2018-10-15	4	-2/+16
\| \| \|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Close/reopen quick actions preview wasn't shown properly, now the preview is shown as expected.
* \| \| \| \| \| \| \| \| \|	Merge branch '34758-fix-code-reuse-clusters-applications_controller' into ↵	Dmitriy Zaporozhets	2018-10-15	8	-43/+174
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Fix code reuse issue in Projects::Clusters::ApplicationController#index See merge request gitlab-org/gitlab-ce!22182
\| * \| \| \| \| \| \| \| \|	Remove un-used inheritance from service	Thong Kuah	2018-10-15	7	-26/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove the inheritance from ::BaseService which is causing us to inherit the initializer that has project as the first arg, as we will not have access to project with forthcoming group clusters. Also call install service from create service - 1 less thing to re-use Extract TestRequest code into a spec helper. Given that we need different behaviour for Rails 5.0 (and again in Rails 5.1!), it's handy to have that branching behaviour in one place
\| * \| \| \| \| \| \| \| \|	Move non-controller code into dedicated service	Thong Kuah	2018-10-15	4	-27/+137
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This should help with code re-use when we create applications for group level cluster next. Change `find_or_initialize_by` to explicitly find or build the right association based on the application name. The benefit here is that we use the associations on @cluster rather than querying from the other side of the association.
* \| \| \| \| \| \| \| \|	Merge branch ↵	Phil Hughes	2018-10-15	34	-112/+494
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'49417-improve-settings-pages-design-by-prioritizing-content-group-settings' into 'master' Prioritize group settings, improve panel titles, disable submit without changes Closes #49417 See merge request gitlab-org/gitlab-ce!21115