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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Better indent the SQLadd-ci_variables-environment_scope-mysql	Lin Jen-Shin	2017-06-27	1	-7/+10
\|
*	Rename the migration test to match the migration path	Lin Jen-Shin	2017-06-27	1	-0/+0
\|
*	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2017-06-27	552	-3882/+8360
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add-ci_variables-environment_scope * upstream/master: (226 commits) Polish sidebar toggle Add changelog entry Fix optional args for POST :id/variables Update CHANGELOG.md for 9.3.1 Bump bootsnap to 1.1.1 Add explicit message when no runners on admin Fix endpoint not being update correctly Remove unused Gitlab::Git::Commit#to_diff argument Drop GFM support for the title of Milestone/MergeRequest in template Handle Promise rejections in mr_widget_pipeline_spec.js Handle missing pipeline in merge request widget Store merge request ref_fetched status in the database Tag a spec as :nested_groups since it fails on MySQL Bump premailer-rails gem to 1.9.7 and its dependencies to prevent network retrieval of assets Truncate long job names in environment view; wrap author to next line Replaces 'dashboard/merge_requests' spinach with rspec Update GITLAB_SHELL_VERSION to 5.0.6 Fix click not being able to find the current element to use trigger('click') instead make accepting mrs more prominent Remove last references to job for pipeline charts ...
\| *	Merge branch '34052-store-mr-ref-fetched-in-database' into 'master'	Sean McGivern	2017-06-27	7	-3/+63
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Store merge request ref_fetched status in the database Closes #34052 See merge request !12424
\| \| *	Store merge request ref_fetched status in the database34052-store-mr-ref-fetched-in-database	Adam Niedzielski	2017-06-26	7	-3/+63
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #34052
\| * \|	Merge branch '34282-fix-api-using-include_missing-false' into 'master'	Grzegorz Bizon	2017-06-27	3	-1/+16
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix optional arugments for POST :id/variables Closes #34282 See merge request !12474
\| \| * \|	Add changelog entry	Lin Jen-Shin	2017-06-27	1	-0/+4
\| \| \| \|
\| \| * \|	Fix optional args for POST :id/variables	Lin Jen-Shin	2017-06-27	2	-1/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Always use declared_params(include_missing: false) so that we don't give nils for optional arguments
\| * \| \|	Merge branch 'winh-mr-widget-no-pipeline' into 'master'	Phil Hughes	2017-06-27	2	-19/+56
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle missing pipeline in merge request widget Closes #32987 See merge request !12127
\| \| * \| \|	Handle Promise rejections in mr_widget_pipeline_spec.js	winh	2017-06-26	1	-24/+35
\| \| \| \| \|
\| \| * \| \|	Handle missing pipeline in merge request widget	winh	2017-06-26	1	-1/+8
\| \| \| \| \|
\| \| * \| \|	Add failing test for #32987	winh	2017-06-22	1	-0/+19
\| \| \| \| \|
\| * \| \| \|	Merge branch 'polish-sidebar-toggle' into 'master'	Phil Hughes	2017-06-27	7	-3/+65
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Polish sidebar toggle Closes #28046 See merge request !12242
\| \| * \| \|	Polish sidebar toggle	Clement Ho	2017-06-27	7	-3/+65
\| \|/ / /
\| * \| \|	Merge branch '34309-drop-gfm-mr-ms' into 'master'	Sean McGivern	2017-06-27	3	-2/+6
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Drop GFM support for the title of Milestone/MergeReuqest in template Closes #34309 See merge request !12451
\| \| * \| \|	Drop GFM support for the title of Milestone/MergeRequest in template	Takuya Noguchi	2017-06-27	3	-2/+6
\| \| \| \| \|
\| * \| \| \|	Merge branch 'update_bootsnap_1.1.1' into 'master'	Robert Speicher	2017-06-27	4	-0/+15
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump bootsnap to 1.1.1 Closes #34084 See merge request !12425
\| \| * \| \| \|	Bump bootsnap to 1.1.1	blackst0ne	2017-06-27	4	-0/+15
\| \| \| \| \| \|
\| * \| \| \| \|	Update CHANGELOG.md for 9.3.1	Clement Ho	2017-06-26	7	-25/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \|	Merge branch '33600-fix-uncaught-throw-in-ee_compat_check' into 'master'	Robert Speicher	2017-06-26	1	-4/+17
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix an uncaught throw in the ee_compat_check job Closes #33600 See merge request !12123
\| \| * \| \| \| \|	Fix an uncaught throw in the ee_compat_check job	Rémy Coutable	2017-06-21	1	-4/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \|	Merge branch 'remove-unused-argument' into 'master'	Sean McGivern	2017-06-26	1	-2/+2
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused Gitlab::Git::Commit#to_diff argument See merge request !12466
\| \| * \| \| \| \| \|	Remove unused Gitlab::Git::Commit#to_diff argument	Jacob Vosmaer	2017-06-26	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'fix-nested-group-spec-on-mysql' into 'master'	Robert Speicher	2017-06-26	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tag a spec as :nested_groups since it fails on MySQL See merge request !12459
\| \| * \| \| \| \| \| \|	Tag a spec as :nested_groups since it fails on MySQLfix-nested-group-spec-on-mysql	Rémy Coutable	2017-06-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was broken by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12322. Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	Merge branch 'accepting-mrs-more-prominent' into 'master'	Sid Sijbrandij	2017-06-26	1	-0/+2
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	make accepting mrs more prominent See merge request !12446
\| \| * \| \| \| \| \| \| \|	make accepting mrs more prominentaccepting-mrs-more-prominent	Job van der Voort	2017-06-26	1	-0/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch ↵	Douwe Maan	2017-06-26	5	-1/+1150
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'34286_add_esperanto_translations_for_cycle_analytics_and_project_and_repository_pages' into 'master' Add Esperanto translations for Cycle Analytics, Project, and Repository pages Closes #34286 See merge request !12442
\| \| * \| \| \| \| \| \| \| \|	Add Esperanto translations for Cycle Analytics, Project, and Repository pages	黄涛	2017-06-26	5	-1/+1150
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix #34286
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'experimental-top-nav' into 'master'	Annabel Dunstone Gray	2017-06-26	18	-8/+490
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Top navigation redesign Closes #34022, #34035, #34037, #34038, and #34021 See merge request !12214
\| \| * \| \| \| \| \| \| \| \| \|	mobile spacing improvementsexperimental-top-nav	Phil Hughes	2017-06-23	2	-21/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	removed random colors left over from the original nav
\| \| * \| \| \| \| \| \| \| \| \|	fixed `This project` badge background & text color	Phil Hughes	2017-06-23	1	-2/+10
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	updates to spacing & alignment	Phil Hughes	2017-06-23	4	-18/+85
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	combine logo & wordmark mobile improvements
\| \| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' into experimental-top-nav	Phil Hughes	2017-06-23	541	-5779/+9148
\| \| \|\ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \|	mobile improvements	Phil Hughes	2017-06-22	2	-16/+13
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	fixed scss-lint	Phil Hughes	2017-06-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	fixed some design issues	Phil Hughes	2017-06-22	2	-14/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	updated some spacing & colors
\| \| * \| \| \| \| \| \| \| \| \| \|	padding updates	Phil Hughes	2017-06-21	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed mobile nav colors
\| \| * \| \| \| \| \| \| \| \| \| \|	fixed scss-lint job	Phil Hughes	2017-06-21	5	-26/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	only display the toggle setting in development env for now
\| \| * \| \| \| \| \| \| \| \| \| \|	color changes to navigation	Phil Hughes	2017-06-21	1	-19/+38
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	fixed typo in selector :see_no_evil:	Phil Hughes	2017-06-21	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	fixed scss-lint job	Phil Hughes	2017-06-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	added section to profile/preferences	Phil Hughes	2017-06-21	7	-0/+37
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	fixed dashboard projects nav item being active	Phil Hughes	2017-06-21	2	-3/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	it is now only shown as active when on the dashbord/projects controller [ci skip]
\| \| * \| \| \| \| \| \| \| \| \| \|	added signed out subnav	Phil Hughes	2017-06-21	3	-0/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	also added the help link back into the nav bar
\| \| * \| \| \| \| \| \| \| \| \| \|	spacing fixes	Phil Hughes	2017-06-21	3	-4/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	made the title a link back to the dashboard [ci skip]
\| \| * \| \| \| \| \| \| \| \| \| \|	fix scss-lint job	Phil Hughes	2017-06-21	1	-11/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| \| * \| \| \| \| \| \| \| \| \| \|	Top navigation redesign	Phil Hughes	2017-06-21	9	-5/+266
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Start of the new navigation by redesigning just the top navigation menu. This is only shown when a cookie is set. Part of #32794
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-premailer-gem-for-filesystem' into 'master'	Robert Speicher	2017-06-26	3	-6/+12
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump premailer-rails gem to 1.9.7 and its dependencies to prevent network retrieval of assets Closes #34231 See merge request !12456
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Bump premailer-rails gem to 1.9.7 and its dependencies to prevent network ↵	Stan Hu	2017-06-26	3	-6/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	retrieval of assets Since asset compilation was disabled in GitLab 9.3, the premailer-rails gem would fall back to fetching assets via HTTP(s) since the Sidekiq working directory was not the Rails root. In some instances, SSL verification would fail, preventing e-mails from being sent. premailer-rails 1.9.7 has a fix (https://github.com/fphilipe/premailer-rails/pull/195) that uses an absolute directory to load assets from the filesystem so that the assets can be fetched locally instead of over the network. Closes #34231