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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add note about MR Pipeline Runner versiondocs/merge-request-pipelines	Steve Azzopardi	2019-04-17	1	-1/+7
\|
*	Merge branch ↵	Fatih Acet	2019-04-12	2	-1/+15
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'60369-border-radius-still-showing-up-after-improve-diff-nav-header-was-finished' into 'master' Breakpoints.isDesktop should not always return false Closes #60369 See merge request gitlab-org/gitlab-ce!27240
\| *	Fix isDesktop function to return proper value	Sam Bigelow	2019-04-12	2	-1/+15
\| \|
* \|	Merge branch '11124-update-deployment-service-fails-if-project-is-nil' into ↵	Stan Hu	2019-04-12	3	-11/+33
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Always return the deployment in the UpdateDeploymentService#execute method Closes gitlab-ee#11124 See merge request gitlab-org/gitlab-ce!27322
\| * \|	Add CHANGELOG entry	Douglas Barbosa Alexandre	2019-04-12	1	-0/+5
\| \| \|
\| * \|	Always return the deployment in the execute method	Douglas Barbosa Alexandre	2019-04-12	2	-11/+28
\| \| \|
* \| \|	Merge branch 'add-to-docs-info-about-moving-migrations' into 'master'	Marcia Ramos	2019-04-12	1	-0/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add information about moving migrations See merge request gitlab-org/gitlab-ce!27159
\| * \| \|	Add information about moving migrations	Gosia Ksionek	2019-04-12	1	-0/+6
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Add to docs paragraph about a way of moving EE migrations to CE if needed
* \| \|	Merge branch 'frozen_string_literal_spec_services' into 'master'	Michael Kozono	2019-04-12	233	-0/+466
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add frozen_string_literal to spec/services See merge request gitlab-org/gitlab-ce!27267
\| * \| \|	Add frozen_string_literal to spec/servicesfrozen_string_literal_spec_services	Thong Kuah	2019-04-12	233	-0/+466
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Probably useful as we often move these files to "new" files.
* \| \| \|	Merge branch 'gt-fix-styling-for-framework-notes' into 'master'	Phil Hughes	2019-04-12	10	-21/+21
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix styling for `app/assets/stylesheets/framework/notes.scss` Closes #59868 See merge request gitlab-org/gitlab-ce!26877
\| * \| \| \|	Rename selector for framework notes	George Tsiolis	2019-04-12	10	-21/+21
\| \| \| \| \|
* \| \| \| \|	Merge branch ↵	Clement Ho	2019-04-12	5	-0/+27
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'57318-track-discussion-thread-usage-on-gitlab-com-with-snowplow' into 'master' CE backport of Added Snowplow tracking to notes Closes #57318 See merge request gitlab-org/gitlab-ce!25899
\| * \| \| \| \|	CE backport of Add Snowplow tracking to notes	Constance Okoghenun	2019-04-12	5	-0/+27
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bacport of Snowplow tracking for - Reply comment button - Start discussion and Comment buttons
* \| \| \| \|	Merge branch 'docs-for-pages-inplace-chroot-limitation' into 'master'	Marcia Ramos	2019-04-12	1	-0/+4
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs for pages inplace chroot limitation See merge request gitlab-org/gitlab-ce!27250
\| * \| \| \|	Docs for pages inplace chroot limitationdocs-for-pages-inplace-chroot-limitation	Shinya Maeda	2019-04-11	1	-0/+4
\| \| \| \| \|
* \| \| \| \|	Merge branch '60241-merge-request-popover-doesn-t-go-away-on-mouse-leave' ↵	Phil Hughes	2019-04-12	3	-1/+40
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Merge Request popover doesn't go away on mouse leave" Closes #60241 See merge request gitlab-org/gitlab-ce!27143
\| * \| \| \| \|	Fix bug where MR Popover wont go away60241-merge-request-popover-doesn-t-go-away-on-mouse-leave	Sam Bigelow	2019-04-12	3	-1/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a check to make sure eventListener is not added twice
* \| \| \| \| \|	Merge branch 'fe-remove-slugify' into 'master'	Filipa Lacerda	2019-04-12	2	-13/+0
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove slugify text utility See merge request gitlab-org/gitlab-ce!27290
\| * \| \| \| \|	Remove slugify text utilityfe-remove-slugify	Paul Slaughter	2019-04-12	2	-13/+0
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Why? This function was not being used and it's documentation was out of date.
* \| \| \| \|	Merge branch '59841-show-commits' into 'master'	Phil Hughes	2019-04-12	2	-6/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replaces CSS with utility class See merge request gitlab-org/gitlab-ce!27311
\| * \| \| \| \|	Replaces CSS with utility class59841-show-commits	Filipa Lacerda	2019-04-12	2	-6/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'update-capybara' into 'master'	Stan Hu	2019-04-12	7	-42/+25
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update capybara and selenium-webdriver See merge request gitlab-org/gitlab-ce!27201
\| * \| \| \| \| \|	Also update nokogiri for QA	Lin Jen-Shin	2019-04-12	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix a few specs after updating capybara and selenium-webdriver	Rémy Coutable	2019-04-12	4	-27/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \|	Update capybara and selenium-webdriver	Rémy Coutable	2019-04-12	2	-14/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch 'fix-typo-activity-lease' into 'master'	Stan Hu	2019-04-12	2	-2/+2
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in activity lease See merge request gitlab-org/gitlab-ce!27288
\| * \| \| \| \| \|	Fix typo in activity leasefix-typo-activity-lease	Cindy Pallares	2019-04-11	2	-2/+2
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'id-undefined-pages-for-wiki-page' into 'master'	Douwe Maan	2019-04-12	2	-4/+8
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix grouping wiki pages by directory See merge request gitlab-org/gitlab-ce!27294
\| * \| \| \| \| \|	Fix grouping wiki pages by directory	Igor	2019-04-12	2	-4/+8
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If a page has the same name as a directory the WikiPage#group_by_directory method can have a wrong behaviour This commit fixes it
* \| \| \| \| \|	Merge branch 'refactor_cluster_application_services' into 'master'	Kamil Trzciński	2019-04-12	6	-31/+42
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor cluster application services See merge request gitlab-org/gitlab-ce!27191
\| * \| \| \| \| \|	Do not rescue errors from state transitions	Thong Kuah	2019-04-12	6	-31/+42
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As this are un-expected errors which we should hear about from Sentry. Still rescue StandardError when operating a Helm action as we can get non Kubeclient errors such as SSL certificate or network errors
* \| \| \| \| \|	Merge branch '59925-reports' into 'master'	Phil Hughes	2019-04-12	1	-5/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes unused CSS in reports Closes #59925 See merge request gitlab-org/gitlab-ce!27310
\| * \| \| \| \| \|	Removes unused CSS	Filipa Lacerda	2019-04-12	1	-5/+0
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch '59921-pipeline-schedule' into 'master'	Phil Hughes	2019-04-12	3	-9/+9
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replaces CSS with BS4 utility class Closes #59921 See merge request gitlab-org/gitlab-ce!27309
\| * \| \| \| \| \|	Replaces CSS with BS4 utility class	Filipa Lacerda	2019-04-12	3	-9/+9
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'mw-i18n-app-models' into 'master'	Nick Thomas	2019-04-12	21	-95/+377
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Externalize strings in app/models See merge request gitlab-org/gitlab-ce!27207
\| * \| \| \| \| \|	Externalize strings in app/models	Martin Wortschack	2019-04-12	21	-95/+377
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Update PO file
* \| \| \| \| \|	Merge branch 'pl-user-bot_type-ce' into 'master'	Sean McGivern	2019-04-12	1	-7/+3
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE Backport: Refactor Service Desk's bot user See merge request gitlab-org/gitlab-ce!26671
\| * \| \| \| \|	Remove User#internal_attributes method	Peter Leitzen	2019-04-12	1	-7/+3
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It's not needed anymore as we've replaced boolean `support_bot` with enum `bot_type`.
* \| \| \| \|	Merge branch 'enable_example_wording_cop' into 'master'	James Lopez	2019-04-12	4	-7/+9
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable RSpec/ExampleWording cop See merge request gitlab-org/gitlab-ce!27187
\| * \| \| \| \|	Enable RSpec/ExampleWording cop	Thong Kuah	2019-04-12	4	-7/+9
\|/ / / / /
* \| \| \| \|	Merge branch 'diff-fluid-layout-fix' into 'master'	Kushal Pandya	2019-04-12	4	-2/+18
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed fluid layout preference not being respected in diffs Closes #52916 See merge request gitlab-org/gitlab-ce!27302
\| * \| \| \| \|	Fixed fluid layout preference not being respected in diffs	Phil Hughes	2019-04-12	4	-2/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52916
* \| \| \| \| \|	Merge branch '60261-save-btn-env' into 'master'	Kushal Pandya	2019-04-12	2	-1/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes white background in the save button for environments Closes #60261 See merge request gitlab-org/gitlab-ce!27161
\| * \| \| \| \| \|	Updates Save button to have a green bg60261-save-btn-env	Filipa Lacerda	2019-04-09	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The Save button in the environments create/edit form was white, it should be green.
* \| \| \| \| \| \|	Merge branch '60224-btn-env' into 'master'	Kushal Pandya	2019-04-12	2	-1/+6
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes extra btn class from dropdown Closes #60224 See merge request gitlab-org/gitlab-ce!27160
\| * \| \| \| \| \|	Removes extra btn class from dropdown60224-btn-env	Filipa Lacerda	2019-04-09	2	-1/+6
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In the deployments page, the links inside a dropdown had an extra btn class
* \| \| \| \| \|	Merge branch 'sh-allow-unauth-chrome' into 'master'	Grzegorz Bizon	2019-04-12	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow unauthenticated downloads of Chrome Closes #60441 See merge request gitlab-org/gitlab-ce!27297
\| * \| \| \| \| \|	Allow unauthenticated downloads of Chrome	Stan Hu	2019-04-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The Google GPG key used to sign the apt repository expired today, so all installs will fail unless `--allow-unauthenticated` is used. We should revert this once the repository has been updated with the more recent key. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60441