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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Enable frozen string for lib/gitlab/*.rb	gfyoung	2018-10-22	151	-22/+327
\|
*	Merge branch '51366-custom-repos-trait-docs' into 'master'	Rémy Coutable	2018-10-22	1	-0/+31
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Document the :repository and :custom_repo traits Closes #51366 See merge request gitlab-org/gitlab-ce!22480
\| *	Document the :repository and :custom_repo traits	Nick Thomas	2018-10-19	1	-0/+31
\| \|
* \|	Merge branch '52978-update-git-repos-for-dev' into 'master'	Rémy Coutable	2018-10-22	1	-5/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update the moved Git repos for developers Closes #52978 See merge request gitlab-org/gitlab-ce!22510
\| * \|	Update the moved Git repos for developers	Takuya Noguchi	2018-10-22	1	-5/+5
\|/ / \| \| \| \| \| \|	Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* \|	Merge branch 'docs/mr-template-moving-tiers' into 'master'	Marcia Ramos	2018-10-21	1	-0/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add "Moving tiers" item to docs MR template See merge request gitlab-org/gitlab-ce!22486
\| * \|	Add "Moving tiers" item to docs MR template	Achilleas Pipinellis	2018-10-19	1	-0/+1
\| \| \|
* \| \|	Merge branch 'patch-32' into 'master'	Stan Hu	2018-10-21	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix a typo in repositories.md (contend -> content) See merge request gitlab-org/gitlab-ce!22508
\| * \| \|	fix a typo in repositories.md (contend -> content)	Maurits	2018-10-21	1	-1/+1
\|/ / /
* \| \|	Merge branch ↵	Douwe Maan	2018-10-19	4	-42/+45
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'52772-assign-me-quick-action-doesn-t-work-if-there-is-extra-white-space' into 'master' Resolve "/assign me quick action doesn't work if there is extra white space" Closes #52772 See merge request gitlab-org/gitlab-ce!22402
\| * \| \|	Resolve "/assign me quick action doesn't work if there is extra white space"	Cindy Pallares 🦉	2018-10-19	4	-42/+45
\|/ / /
* \| \|	Merge branch 'ce-5987-group-file-templates' into 'master'	Robert Speicher	2018-10-19	11	-18/+44
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE backport of changes to suppport group file templates See merge request gitlab-org/gitlab-ce!22310
\| * \| \|	Backport CE to changes to support group-level file templates	Nick Thomas	2018-10-19	6	-7/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When the feature is available, this setting allows admins to choose a project as a source of custom file templates. This is in addition to any instance-wide templates, whether custom or vendored into the GitLab codebase.
\| * \| \|	Stop using ivars in BlobHelper template methods	Nick Thomas	2018-10-19	4	-11/+11
\| \| \| \|
\| * \| \|	Harden a spec	Nick Thomas	2018-10-19	1	-0/+3
\| \| \|/ \| \|/\|
* \| \|	Merge branch '42396-pristine-test-environments-docs' into 'master'	Robert Speicher	2018-10-19	1	-0/+124
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document how GitLab keeps its tests pristine Closes #42396 See merge request gitlab-org/gitlab-ce!22481
\| * \| \|	Document how GitLab keeps its tests pristine	Nick Thomas	2018-10-19	1	-0/+124
\| \|/ /
* \| \|	Merge branch 'allow-to-configure-cache-path' into 'master'	Clement Ho	2018-10-19	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow to configure cache path for webpack See merge request gitlab-org/gitlab-ce!22497
\| * \| \|	Allow to configure cache path for webpack	Kamil Trzciński	2018-10-19	1	-1/+1
\|/ / /
* \| \|	Merge branch 'rename-scheduled-label-badges' into 'master'	Kamil Trzciński	2018-10-19	14	-25/+30
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename "scheduled" label/badge of delayed jobs to "delayed" Closes #52130 See merge request gitlab-org/gitlab-ce!22245
\| * \| \|	Rename "scheduled" label/badge of delayed jobs to "delayed"	Shinya Maeda	2018-10-19	14	-25/+30
\|/ / /
* \| \|	Merge branch '51955-change-single-item-breadcrumbs-to-page-titles' into 'master'	Annabel Dunstone Gray	2018-10-19	18	-26/+93
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Change single-item breadcrumbs to page titles" Closes #51955 See merge request gitlab-org/gitlab-ce!22155
\| * \| \|	Change single-item breadcrumbs to page titles	Dmitriy Zaporozhets	2018-10-19	18	-26/+93
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Merge branch 'jivl-fix-bar-char-transient-spec-failure' into 'master'	Filipa Lacerda	2018-10-19	2	-6/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix transient failure from the bar_chart.vue component Closes gitlab-ee#8062 See merge request gitlab-org/gitlab-ce!22495
\| * \| \| \|	Fix transient failure from the bar_chart.vue component	Jose Vargas	2018-10-19	2	-6/+5
\| \| \| \| \|
* \| \| \| \|	Merge branch 'gt-remove-empty-spec-describe-blocks' into 'master'	Clement Ho	2018-10-19	4	-14/+5
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove empty spec describe blocks Closes #52842 See merge request gitlab-org/gitlab-ce!22451
\| * \| \| \|	Remove empty spec describe blocks	George Tsiolis	2018-10-18	4	-14/+5
\| \| \| \| \|
* \| \| \| \|	Merge branch 'update-runner-chart-to-0-1-34' into 'master'	Kamil Trzciński	2018-10-19	3	-4/+9
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update used version of Runner Helm Chart to 0.1.34 Closes gitlab-runner#3642 See merge request gitlab-org/gitlab-ce!22274
\| * \| \| \|	Update used version of Runner Helm Chart to 0.1.34	Tomasz Maczukin	2018-10-19	3	-4/+9
\|/ / / /
* \| \| \|	Update VERSION to 11.5.0-prev11.5.0.pre	GitLab Release Tools Bot	2018-10-19	1	-1/+1
\| \| \| \|
* \| \| \|	Update CHANGELOG.md for 11.4.0	GitLab Release Tools Bot	2018-10-19	200	-1007/+225
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \|	Merge branch 'ccr/43034_issues_controller_100_queries' into 'master'	Douglas Barbosa Alexandre	2018-10-19	7	-46/+141
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add preload for routes and namespaces for issues controller. Closes #43034 See merge request gitlab-org/gitlab-ce!21651
\| * \| \| \|	Add preload in issues controller	Chantal Rollison	2018-10-18	7	-46/+141
\| \| \| \| \|
* \| \| \| \|	Merge branch ↵	Annabel Dunstone Gray	2018-10-19	4	-9/+20
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'52299-follow-up-from-resolve-add-status-message-from-within-user-menu' into 'master' Adjust size and alignment of emojis of user status in user menu Closes #52299 See merge request gitlab-org/gitlab-ce!22194
\| * \| \| \| \|	Adjust size and alignment of emojis of user status in user menu	Dennis Tang	2018-10-19	4	-9/+20
\|/ / / / /
* \| \| \| \|	Merge branch 'add-gl-link-to-markdown-header' into 'master'	Annabel Dunstone Gray	2018-10-19	13	-38/+56
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change markdown header tab anchor links to buttons See merge request gitlab-org/gitlab-ce!21988
\| * \| \| \| \|	Change markdown header tab anchor links to buttons	George Tsiolis	2018-10-19	13	-38/+56
\|/ / / / /
* \| \| \| \|	Merge branch 'revert-62d8b906' into 'master'	Phil Hughes	2018-10-19	1	-145/+145
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'winh-prettier-job-app' into 'master'" See merge request gitlab-org/gitlab-ce!22489
\| * \| \| \| \|	Revert "Merge branch 'winh-prettier-job-app' into 'master'"	Filipa Lacerda	2018-10-19	1	-145/+145
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !22463
* \| \| \| \| \|	Merge branch 'mr-file-tree-inline-fluid-width-fix' into 'master'	Filipa Lacerda	2018-10-19	3	-1/+14
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed merge request fill tree not respecting fluid width Closes #52916 See merge request gitlab-org/gitlab-ce!22487
\| * \| \| \| \| \|	Fixed merge request fill tree not respecting fluid width	Phil Hughes	2018-10-19	3	-1/+14
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes a bug where the merge request fill tree would not respect the users fluid width preference. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52916
* \| \| \| \| \|	Merge branch 'bvl-remove-forked-project-link' into 'master'	Sean McGivern	2018-10-19	34	-251/+217
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove ForkedProjectLink model Closes #38883 See merge request gitlab-org/gitlab-ce!22226
\| * \| \| \| \| \|	Remove the `ForkedProjectLink` model	Bob Van Landuyt	2018-10-19	34	-251/+217
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This removes the `ForkedProjectLink` model that has been replaced by the `ForkNetworkMember` and `ForkNetwork` combination. All existing relations have been adjusted to use these new models. The `forked_project_link` table has been dropped. The "Forks" count on the admin dashboard has been updated to count all `ForkNetworkMember` rows and deduct the number of `ForkNetwork` rows. This is because now the "root-project" of a fork network also has a `ForkNetworkMember` row. This count could become inaccurate when the root of a fork network is deleted.
* \| \| \| \| \| \|	Merge branch 'doc-edit-config-file-path-kaniko' into 'master'	Achilleas Pipinellis	2018-10-19	1	-3/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Change path where to create the config.json file when using kaniko See merge request gitlab-org/gitlab-ce!22075
\| * \| \| \| \| \| \|	Change path where to create the config.json file	Valerio Baldisserotto	2018-10-03	1	-3/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch ↵	Achilleas Pipinellis	2018-10-19	1	-2/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'docs/52918-shared-runners-still-showing-in-list-projects-runner-when-shared-runners-disabled-for-project' into 'master' Fix documentation for list runners Closes #52918 See merge request gitlab-org/gitlab-ce!22490
\| * \| \| \| \| \| \| \|	Fix documentation for list runners	Steve Azzopardi	2018-10-19	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We are specifying that we will only return the shared runners on two condition; 1 if project has any available 2 if shared runners are enabled. 2 is not correct. In the admin UI, when the user press "disable shared runners" we still show the runners to show what kind of runners are available when the user enables them. We want the API to mimic this behavior from the UI. closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52918
* \| \| \| \| \| \| \| \|	Merge branch 'fix-bamboo-results' into 'master'	Grzegorz Bizon	2018-10-19	3	-5/+16
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correctly process Bamboo API results Closes #51950 See merge request gitlab-org/gitlab-ce!21970
\| * \| \| \| \| \| \| \| \|	Correctly process Bamboo API results	Alex Lossent	2018-10-19	3	-5/+16
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bamboo API returns an array of results as per https://docs.atlassian.com/atlassian-bamboo/REST/6.2.5/#d2e786
* \| \| \| \| \| \| \| \|	Merge branch 'docs/highlight-mentions' into 'master'	Marcia Ramos	2018-10-19	1	-3/+6
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document highlighted mentions See merge request gitlab-org/gitlab-ce!22488