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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove :livesum from RubySampler metrics64974-remove-livesum-from-ruby-sampler-metrics	Aleksei Lipniagov	2019-07-23	2	-4/+9
\|
*	Merge branch 'tz-update-stylelint' into 'master'	Fatih Acet	2019-07-23	2	-214/+309
\|\ \| \| \| \| \| \| \| \|	Updates all our stylelint dependencies See merge request gitlab-org/gitlab-ce!31028
\| *	Updates all our stylelint dependencies	Tim Zallmann	2019-07-23	2	-214/+309
\|/ \| \| \| \|	Removed stylelint-error-string-formatter as this was having a circular reference fail
*	Merge branch '6544-remove-scss-diff-ce' into 'master'	Phil Hughes	2019-07-23	3	-0/+15
\|\ \| \| \| \| \| \| \| \|	Resolve difference in app/assets/stylesheets/application.scss See merge request gitlab-org/gitlab-ce!31007
\| *	Resolve difference in app/assets/stylesheets/application.scss6544-remove-scss-diff-ce	Lukas Eipert	2019-07-22	3	-0/+15
\| \|
* \|	Merge branch 'leipert-resolve-ee-diff' into 'master'	Phil Hughes	2019-07-23	1	-0/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Port common class only used in EE See merge request gitlab-org/gitlab-ce!31008
\| * \|	Port common class only used in EEleipert-resolve-ee-diff	Lukas Eipert	2019-07-22	1	-0/+1
\| \| \|
* \| \|	Merge branch 'issue/61207' into 'master'	Phil Hughes	2019-07-23	3	-20/+37
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	hoverable area on collapsed sidebar icons Closes #61207 See merge request gitlab-org/gitlab-ce!30974
\| * \| \|	hoverable area on collapsed sidebar icons	Michel Engelen	2019-07-23	3	-20/+37
\|/ / /
* \| \|	Merge branch 'rs-fixtures-parity' into 'master'	Lin Jen-Shin	2019-07-23	1	-3/+15
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE-EE parity for pipelines development fixture See merge request gitlab-org/gitlab-ce!30870
\| * \| \|	CE pipelines don't respond to sourced_pipelinesrs-fixtures-parity	Robert Speicher	2019-07-22	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We also scope the `rescue`s to only those raised by ActiveRecord, which would have allowed us to spot this logic error sooner.
\| * \| \|	CE-EE parity for pipelines development fixture	Robert Speicher	2019-07-22	1	-1/+13
\| \| \| \|
* \| \| \|	Merge branch 'update-gitlab-runner-helm-chart-to-0-7-0' into 'master'	Grzegorz Bizon	2019-07-23	2	-1/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update GitLab Runner Helm Chart to 0.7.0/12.1.0 See merge request gitlab-org/gitlab-ce!30950
\| * \| \| \|	Update GitLab Runner Helm Chart to 0.7.0update-gitlab-runner-helm-chart-to-0-7-0	Steve Azzopardi	2019-07-19	2	-1/+6
\| \| \| \| \|
* \| \| \| \|	Merge branch 'sh-update-webpack-bundle-analyzer' into 'master'	Kushal Pandya	2019-07-23	2	-15/+16
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update webpack-bundle-analyzer to 3.3.2 See merge request gitlab-org/gitlab-ce!31035
\| * \| \| \| \|	Update webpack-bundle-analyzer to 3.3.2sh-update-webpack-bundle-analyzer	Stan Hu	2019-07-22	2	-15/+16
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is needed to fix an issue where updating to the latest Webpack causes an acorn dependency error: https://github.com/webpack-contrib/webpack-bundle-analyzer/issues/245 Seen while trying to update dependencies for Mermaid in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/30985
* \| \| \| \|	Merge branch 'docs-saml-sso-updates' into 'master'	Evan Read	2019-07-23	2	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Update old SAML settings screenshot See merge request gitlab-org/gitlab-ce!31031
\| * \| \| \| \|	Docs: Update old SAML settings screenshot	Tristan Williams	2019-07-23	2	-1/+1
\|/ / / / /
* \| \| \| \|	Merge branch 'pl-flat_map-qa' into 'master'	Dan Davison	2019-07-22	4	-9/+7
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	QA: Prefer `flat_map` over `map` + `flatten` See merge request gitlab-org/gitlab-ce!30883
\| * \| \| \| \|	QA: Prefer `flat_map` over `map` + `flatten`	Peter Leitzen	2019-07-22	4	-9/+7
\|/ / / / /
* \| \| \| \|	Merge branch 'ce-4946-resolve-ee-config' into 'master'	Robert Speicher	2019-07-22	1	-0/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Port EE specific settings to CE See merge request gitlab-org/gitlab-ce!30998
\| * \| \| \| \|	Port EE specific settings to CE	Lin Jen-Shin	2019-07-22	1	-0/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '64091-fix-sprockets-paths' into 'master'	Stan Hu	2019-07-22	2	-1/+9
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix xterm CSS not loading Closes #64091 See merge request gitlab-org/gitlab-ce!31023
\| * \| \| \| \| \|	Add CHANGELOG.md entry	Mike Greiling	2019-07-22	1	-0/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix xterm CSS not loading	Mike Greiling	2019-07-22	1	-1/+4
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'sh-make-githost-json' into 'master'	Mayra Cabrera	2019-07-22	3	-9/+16
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Convert githost.log to JSON format See merge request gitlab-org/gitlab-ce!30967
\| * \| \| \| \| \| \|	Convert githost.log to JSON format	Stan Hu	2019-07-22	3	-9/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will make it easier to parse this in production and adds the `correlation_id` if available.
* \| \| \| \| \| \| \|	Merge branch 'group_with_cluster_factory' into 'master'	Robert Speicher	2019-07-22	2	-6/+6
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds cluster_for_group factory for convenience See merge request gitlab-org/gitlab-ce!30826
\| * \| \| \| \| \| \|	Adds cluster_for_group factory for convienencegroup_with_cluster_factory	Thong Kuah	2019-07-19	2	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also means we don't have to resort to an update statement to set parent for child groups who also have clusters. This is much shorter than ``` create(:cluster, :provided_by_gcp, :group, groups: [group]) ```
* \| \| \| \| \| \| \|	Merge branch 'fix-params-name-bug' into 'master'	Mayra Cabrera	2019-07-22	2	-5/+69
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix wrong name of params in events controller See merge request gitlab-org/gitlab-ce!30738
\| * \| \| \| \| \| \| \|	Add review remarks	Gosia Ksionek	2019-07-22	2	-5/+69
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add cr remarks Add cr remarks
* \| \| \| \| \| \| \|	Merge branch 'resolve-remaining-import-export-differences' into 'master'	Robert Speicher	2019-07-22	3	-2/+9
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve remaining import export differences See merge request gitlab-org/gitlab-ce!31012
\| * \| \| \| \| \| \|	Backport import/export spec changes from EEresolve-remaining-import-export-differences	Yorick Peterse	2019-07-22	2	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This backports remaining import/export spec changes from EE to CE.
\| * \| \| \| \| \| \|	Backport project.json fixture from EE	Yorick Peterse	2019-07-22	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This backports all changes made to an import/export fixture file from EE to CE.
* \| \| \| \| \| \| \|	Merge branch '64930-fix-node-sass-compilation-error' into 'master'	Stan Hu	2019-07-22	1	-3/+3
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use debian based node images for qa tests Closes #64930 See merge request gitlab-org/gitlab-ce!31020
\| * \| \| \| \| \| \|	Use debian based node images for qa tests64930-fix-node-sass-compilation-error	Lukas Eipert	2019-07-22	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The alpine images do not contain a full build toolchain, so if the pre-compiled node-sass bindings cannot be downloaded, they will error and break master. By switching to the debian based images, we are able to compile in case the downloads are not available.
* \| \| \| \| \| \| \|	Merge branch 'fix-i18n-updated-projects' into 'master'	Clement Ho	2019-07-22	2	-1/+6
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix translation of 'Updated' term in projects list See merge request gitlab-org/gitlab-ce!30958
\| * \| \| \| \| \| \|	Fix translation of 'Updated' term in projects list	Paul Gascou-Vaillancourt	2019-07-22	2	-1/+6
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'docs-dry-the-stage-and=group-labels-list' into 'master'	Mek Stittri	2019-07-22	1	-54/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Dry the list of stage and group labels by linking to them directly See merge request gitlab-org/gitlab-ce!30365
\| * \| \| \| \| \| \| \|	Dry the list of stage and group labels by linking to them directlydocs-dry-the-stage-and=group-labels-list	Rémy Coutable	2019-07-22	1	-54/+5
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch 'remove-duplicate-all-models-entry' into 'master'	Robert Speicher	2019-07-22	1	-1/+0
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove duplicate entry from all_models.yml See merge request gitlab-org/gitlab-ce!31010
\| * \| \| \| \| \| \|	Remove duplicate entry from all_models.ymlremove-duplicate-all-models-entry	Yorick Peterse	2019-07-22	1	-1/+0
\| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This line is already present further down in the YAML file. In EE the line is already removed.
* \| \| \| \| \| \|	Merge branch ↵	Nick Thomas	2019-07-22	4	-1/+115
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'64870-can-t-save-pages-domain-form-with-let-s-encrypt-enabled-if-current-certificate-is-outdated' into 'master' Resolve "Can't save pages domain form with Let's Encrypt enabled if current certificate is outdated" Closes #64870 See merge request gitlab-org/gitlab-ce!30995
\| * \| \| \| \| \|	Validate certificate chain only if it's changed	Vladimir Shushlin	2019-07-22	4	-1/+115
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This validation prevents the domain from being saved from the UI e.g. when user tries to enable Let's Encrypt integration
* \| \| \| \| \|	Merge branch 'maintainers-can-create-subgroup' into 'master'	Sean McGivern	2019-07-22	24	-36/+340
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a group setting to allow Maintainers to create sub-groups See merge request gitlab-org/gitlab-ce!29718
\| * \| \| \| \| \|	Resolve some issues in MR	Fabio Papa	2019-07-19	2	-3/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'maintainers-can-create-subgroup' of ↵	Fabio Papa	2019-07-19	1	-2/+2
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/fapapa/gitlab-ce into maintainers-can-create-subgroup
\| \| * \| \| \| \| \|	Apply suggestion to doc/user/group/subgroups/index.md	Fabio Papa	2019-07-19	1	-4/+9
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Apply suggestion to doc/user/permissions.md	Fabio Papa	2019-07-19	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Add a link from the permissions table to the subgroups/creating a	Fabio Papa	2019-07-12	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	subgroup section