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

	Commit message (Collapse)	Author	Age	Files	Lines
*	ignore lockfile added by npm5, using yarn lockfilenpm5-gitignore	Simon Knox	2017-08-07	1	-0/+1
\|
*	Merge branch 'ci-lint-fix' into 'master'	Tim Zallmann	2017-08-06	2	-1/+4
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix order of CI lint ace editor loading Closes #35985 See merge request !13316
\| *	Fix order of CI lint ace editor loadingci-lint-fix	Phil Hughes	2017-08-04	2	-1/+4
\| \| \| \| \| \| \| \|	Closes #35985
* \|	Merge branch '27616-fix-contributions-graph-utc-offset-mysql' into 'master'	Tim Zallmann	2017-08-06	8	-15/+70
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Timezone Inconsistencies in User Contribution Calendar Closes #27616 and #1943 See merge request !13208
\| * \|	add CHANGELOG.md for !1320827616-fix-contributions-graph-utc-offset-mysql	Mike Greiling	2017-07-31	1	-0/+4
\| \| \|
\| * \|	adjust user contribution calendar time formatting	Mike Greiling	2017-07-31	1	-3/+3
\| \| \|
\| * \|	fix rubocop violations 👮	Mike Greiling	2017-07-31	1	-4/+4
\| \| \|
\| * \|	fix mysql syntax for date INTERVAL arithmatic	Mike Greiling	2017-07-31	1	-3/+7
\| \| \|
\| * \|	add tests for proper timezone date grouping within ContributionsCalendar	Mike Greiling	2017-07-31	1	-4/+34
\| \| \|
\| * \|	adjust timezone for date grouping in contributions calendar	Mike Greiling	2017-07-29	1	-2/+4
\| \| \|
\| * \|	use timezone-aware Date.current instead of Date.today in ↵	Mike Greiling	2017-07-29	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	ContributionsCalendar class
\| * \|	display system timezone underneath activity calendar	Mike Greiling	2017-07-28	2	-0/+6
\| \| \|
\| * \|	ensure user profile calendar is generated based on server timezone, not ↵	Mike Greiling	2017-07-28	3	-4/+13
\| \| \| \| \| \| \| \| \| \| \| \|	local timezone
* \| \|	Merge branch 'docs-fix-missing-changelog-entries' into 'master'	Mike Greiling	2017-08-04	1	-2/+24
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing CHANGELOG.md entries for security release on 2017-01-23 See merge request !13327
\| * \| \|	fix missing changelog entries for security release on 2017-01-23	Mike Greiling	2017-08-04	1	-2/+24
\| \| \| \|
* \| \| \|	Merge branch 'fix/sm/34547-cannot-connect-to-ci-server-error-messages' into ↵	Sean McGivern	2017-08-04	3	-28/+81
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Fix "Cannot connect to CI server error messages" Closes #34547 See merge request !13252
\| * \| \| \|	Fix specfix/sm/34547-cannot-connect-to-ci-server-error-messages	Shinya Maeda	2017-08-04	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Fix spec	Shinya Maeda	2017-08-04	1	-1/+3
\| \| \| \| \|
\| * \| \| \|	Add a spec for concurrent process	Shinya Maeda	2017-08-04	1	-27/+68
\| \| \| \| \|
\| * \| \| \|	Add changelog	Shinya Maeda	2017-08-04	1	-0/+5
\| \| \| \| \|
\| * \| \| \|	essential	Shinya Maeda	2017-08-04	1	-1/+6
\| \| \| \| \|
* \| \| \| \|	Merge branch ↵	Sean McGivern	2017-08-04	3	-1/+24
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'fix/sm/35931-active-ci-pipelineschedule-have-nullified-next_run_at' into 'master' Fix "pipeline_schedules pages throwing error 500" when "Active Ci::PipelineSchedule have a nullified `next_run_at`" Closes #32790 See merge request !13286
\| * \| \| \| \|	Fix specfix/sm/35931-active-ci-pipelineschedule-have-nullified-next_run_at	Shinya Maeda	2017-08-04	1	-7/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Add changelog	Shinya Maeda	2017-08-04	1	-0/+4
\| \| \| \| \| \|
\| * \| \| \| \|	fix	Shinya Maeda	2017-08-04	2	-1/+24
\| \|/ / / /
* \| \| \| \|	Merge branch '35275-change-issue-icon' into 'master'feature/migrate-last-commit-for-path-to-gitaly	Phil Hughes	2017-08-04	5	-5/+13
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update top bar issues icon Closes #35275 See merge request !13263
\| * \| \| \| \|	Update top bar issues icon	Annabel Dunstone Gray	2017-08-04	5	-5/+13
\|/ / / / /
* \| \| \| \|	Merge branch 'fix-pipeline-icon-contextual-nav' into 'master'	Annabel Dunstone Gray	2017-08-04	1	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix pipeline icon in contextual nav for projects See merge request !13324
\| * \| \| \| \|	Fix pipeline icon in contextual nav for projects	tauriedavis	2017-08-04	1	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '34060-simplified-general-project-settings' into 'master'	Mike Greiling	2017-08-04	10	-239/+293
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	34060 Simply general project settings to use expanded panels Closes #34060 See merge request !12620
\| * \| \| \| \|	fixed up specs	Phil Hughes	2017-07-28	4	-55/+71
\| \| \| \| \| \|
\| * \| \| \| \|	trying to fix tests	tauriedavis	2017-07-28	2	-3/+14
\| \| \| \| \| \|
\| * \| \| \| \|	fix merge conflicts	tauriedavis	2017-07-28	1	-215/+215
\| \| \| \| \| \|
\| * \| \| \| \|	css fixes	tauriedavis	2017-07-28	2	-58/+63
\| \| \| \| \| \|
\| * \| \| \| \|	try and fix some tests	tauriedavis	2017-07-28	3	-6/+16
\| \| \| \| \| \|
\| * \| \| \| \|	34060 Simply general project settings to use expanded panels	tauriedavis	2017-07-28	5	-190/+202
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'do-not-test-mysql-in-ee-non-master-or-stable' into 'master'	Rémy Coutable	2017-08-04	1	-5/+7
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since mysql is not a priority anymore, test it less See merge request !13320
\| * \| \| \| \| \|	Since mysql is not a priority anymore, test it lessdo-not-test-mysql-in-ee-non-master-or-stable	Lin Jen-Shin	2017-08-04	1	-5/+7
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'source-install-yarn-2' into 'master'	Mike Greiling	2017-08-04	6	-7/+24
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Install 'yarn' globally to avoid PATH issues See merge request !13273
\| * \| \| \| \| \| \|	Install yarn via apt in update guides	Jacob Vosmaer	2017-08-04	5	-5/+20
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Use long curl options	Jacob Vosmaer	2017-08-04	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Install 'yarn' globally to avoid PATH issues	Jacob Vosmaer	2017-08-03	1	-2/+4
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'winh-new-dropdown-dividers' into 'master'	Annabel Dunstone Gray	2017-08-04	2	-0/+8
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make dividers of new dropdown style full width Closes #35784 See merge request !13276
\| * \| \| \| \| \| \| \|	Make new dropdown dividers full widthwinh-new-dropdown-dividers	winh	2017-08-04	2	-0/+8
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '35944-missing-sidebar-icons' into 'master'	Phil Hughes	2017-08-04	4	-2/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add container registry and spam logs icons Closes #35944 See merge request !13317
\| * \| \| \| \| \| \| \| \|	Add container registry and spam logs icons	Annabel Dunstone Gray	2017-08-04	4	-2/+4
\| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'tc-fix-mr-query-params' into 'master'	Rémy Coutable	2017-08-04	1	-0/+20
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add spec to test combining API merge_requests query parameters See merge request !11172
\| * \| \| \| \| \| \| \| \|	Add spec to test combining API merge_requests query parameters	Toon Claes	2017-08-03	1	-0/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To investigate gitlab-org/gitlab-ce#31599
* \| \| \| \| \| \| \| \| \|	Merge branch '2902-standalone-ee-dir-ce' into 'master'	Rémy Coutable	2017-08-04	6	-33/+53
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE: Move EE-specific files to a standalone directory Closes gitlab-ee#3097 See merge request !13311
\| * \| \| \| \| \| \| \| \| \|	Backport to CE for:2902-standalone-ee-dir-ce	Lin Jen-Shin	2017-08-04	6	-33/+53
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2483