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

	Commit message (Collapse)	Author	Age	Files	Lines
*	rubocop fix: don't use single line blocksbugfix/ruby2.4-compat	http://jneen.net/	2017-06-26	1	-2/+6
\|
*	rm use of deprecated webmock api in teamcity_service_spec	http://jneen.net/	2017-06-26	1	-2/+4
\|
*	rm use of deprecated webmock api in campfire_service_spec	http://jneen.net/	2017-06-26	1	-5/+6
\|
*	rm use of deprecated webmock api in jira model spec	http://jneen.net/	2017-06-26	1	-11/+11
\|
*	rm use of deprecated webmock api in bamboo_service_spec	http://jneen.net/	2017-06-26	1	-2/+2
\|
*	remove use of deprecated webmock feature in jira specs	http://jneen.net/	2017-06-26	1	-7/+7
\|
*	ruby 2.4 compat: update to webmock 2.3.2	http://jneen.net/	2017-06-26	2	-4/+4
\|
*	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
* \| \| \| \| \| \| \| \|	Merge branch '33846-no-runner-for-admin' into 'master'	Rémy Coutable	2017-06-26	3	-35/+65
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add explicit message when no runners on admin Closes #33846 See merge request !12266
\| * \| \| \| \| \| \| \| \|	Add explicit message when no runners on admin	Takuya Noguchi	2017-06-26	3	-35/+65
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch '34320-environment-detail-job' into 'master'	Filipa Lacerda	2017-06-26	2	-6/+9
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Truncate long job names in environment view; wrap author to next line Closes #34320 See merge request !12455
\| * \| \| \| \| \| \| \| \|	Truncate long job names in environment view; wrap author to next line	Annabel Dunstone Gray	2017-06-26	2	-6/+9
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '23036-replace-dashboard-mr-spinach' into 'master'	Rémy Coutable	2017-06-26	6	-170/+114
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace 'dashboard/merge_requests' spinach with rspec See merge request !12440
\| * \| \| \| \| \| \| \| \| \|	Replaces 'dashboard/merge_requests' spinach with rspec	Alexander Randa	2017-06-26	6	-170/+114
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch '33546-mini-pipeline' into 'master'	Phil Hughes	2017-06-26	2	-2/+44
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix endpoint not being update correctly Closes #33546 See merge request !12449
\| * \| \| \| \| \| \| \| \| \|	Fix endpoint not being update correctly	Filipa Lacerda	2017-06-26	2	-2/+44
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch '33933-fix-deployment-indicator-date' into 'master'	Robert Speicher	2017-06-26	2	-3/+6
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug where Service `created_at` time was used instead of deployment time. Closes #33933 See merge request !12395
\| * \| \| \| \| \| \| \| \| \|	Fix bug where Service `created_at` time was used instead of deployment time.33933-fix-deployment-indicator-date	Pawel Chojnacki	2017-06-22	2	-3/+6
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'patch-24' into 'master'	Sean McGivern	2017-06-26	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update GITLAB_SHELL_VERSION to 5.0.6 See merge request !12450