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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '39549-label-list-page-redesign-with-draggable-labels' into ↵	Tim Zallmann	2018-06-07	3	-17/+17
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Label list page redesign with draggable labels" Closes #39549 See merge request gitlab-org/gitlab-ce!18466
\| *	Merge branch 'master' into ↵	Luke Bennett	2018-06-07	63	-75/+2257
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'39549-label-list-page-redesign-with-draggable-labels' # Conflicts: # app/views/projects/labels/index.html.haml
\| * \	Merge remote-tracking branch 'origin/master' into ↵	Luke Bennett	2018-06-06	68	-311/+1135
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	39549-label-list-page-redesign-with-draggable-labels
\| * \ \	Merge remote-tracking branch 'origin/master' into ↵	Luke Bennett	2018-06-05	13	-132/+455
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	39549-label-list-page-redesign-with-draggable-labels
\| * \ \ \	Merge remote-tracking branch 'origin/master' into ↵	Luke Bennett	2018-06-05	286	-12864/+6902
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	39549-label-list-page-redesign-with-draggable-labels
\| * \| \| \| \|	fix lint	Luke Bennett	2018-05-29	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fix user_removes_labels_spec	Luke Bennett	2018-05-29	1	-11/+10
\| \| \| \| \| \|
\| * \| \| \| \|	Fix update_prioritization_spec	Luke Bennett	2018-05-29	1	-4/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Further fixes for project subscription_spec	Luke Bennett	2018-05-29	1	-3/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fix project subscription_spec	Luke Bennett	2018-05-29	1	-2/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Remove screenshots	Luke Bennett	2018-05-29	1	-2/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Merge remote-tracking branch 'origin/master' into ↵	Luke Bennett	2018-05-28	703	-6144/+20439
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	39549-label-list-page-redesign-with-draggable-labels
\| * \| \| \| \| \|	BE review	Luke Bennett	2018-05-25	1	-0/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '45505-lograge_formatter_encoding' into 'master'	Kamil Trzciński	2018-06-07	1	-0/+22
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enforce UTF-8 encoding on user input in LogrageWithTimestamp formatter Closes #45505 See merge request gitlab-org/gitlab-ce!19244
\| * \| \| \| \| \| \|	Enforce UTF-8 encoding on user input in LogrageWithTimestamp formatter and ↵	Imre Farkas	2018-06-06	1	-0/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	filter out file content from logs
* \| \| \| \| \| \| \|	Merge branch '47208-human-import-status-name-not-working' into 'master'	Douwe Maan	2018-06-07	1	-0/+25
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "ActionView::Template::Error: undefined method `human_import_status_name" Closes #47208 See merge request gitlab-org/gitlab-ce!19470
\| * \| \| \| \| \| \| \|	Adds #human_import_status_name to make it comply with ↵47208-human-import-status-name-not-working	Tiago Botelho	2018-06-06	1	-0/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ProjectImportState#human_status_name
* \| \| \| \| \| \| \| \|	Merge branch 'fj-move-rev-list-option' into 'master'	Douwe Maan	2018-06-07	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moving rev-list lfs options to LfsChanges See merge request gitlab-org/gitlab-ce!19497
\| * \| \| \| \| \| \| \| \|	Moving rev-list lfs options to Lfschanges	Francisco Javier López	2018-06-06	1	-1/+1
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'sh-log-422-responses' into 'master'2018-06-07-RC-cut	Sean McGivern	2018-06-07	1	-0/+58
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Log response body to production_json.log when a controller responds with a 422 status See merge request gitlab-org/gitlab-ce!19473
\| * \| \| \| \| \| \| \| \|	Log response body to production_json.log when a controller responds with a ↵	Stan Hu	2018-06-06	1	-0/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	422 status We have a number of import errors occurring with 422 errors, and it's hard to determine why they are happening. This change will surface the errors in the log lines. Relates to #47365
* \| \| \| \| \| \| \| \| \|	Resolve "Introduce new navigation themes in GitLab 11.0"	Annabel Gray	2018-06-07	2	-7/+7
\| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Support LFS objects when creating a project by import	Francisco Javier López	2018-06-06	12	-4/+589
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'ide-merge-requests-components' into 'master'	Filipa Lacerda	2018-06-06	5	-26/+311
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show merge requests in IDE Closes #45184 See merge request gitlab-org/gitlab-ce!19318
\| * \| \| \| \| \| \| \| \|	component specs	Phil Hughes	2018-06-06	3	-0/+234
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	fixed mutations spec	Phil Hughes	2018-06-06	1	-8/+11
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	fixed karma	Phil Hughes	2018-06-06	1	-18/+66
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '42751-rename-master-to-maintainer' into 'master'	Sean McGivern	2018-06-06	8	-18/+18
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Rename the `Master` role to `Maintainer`" Closes #42751 See merge request gitlab-org/gitlab-ce!19080
\| * \| \| \| \| \| \| \| \|	fix lock spec	Mark Chao	2018-06-06	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	group runners	Mark Chao	2018-06-06	1	-6/+6
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	change wording	Mark Chao	2018-06-06	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix spec	Mark Chao	2018-06-06	4	-6/+6
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Rename “Developers + Masters”	Mark Chao	2018-06-06	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Move GC/Repack to OptOut	Kim Carlbäcker	2018-06-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Add a custom storage config instead of overwriting	Bob Van Landuyt	2018-06-06	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Otherwise the ApplicationSetting that is currently stored would be invalid as it specifies a storage that is not configured
* \| \| \| \| \| \| \| \| \|	Merge branch 'live-trace-v2-persist-data' into 'master'	Kamil Trzciński	2018-06-06	5	-2/+119
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Live trace: Rescue stale live trace See merge request gitlab-org/gitlab-ce!18680
\| * \| \| \| \| \| \| \| \|	Rename worker to ArchiveTracesCronWorker	Shinya Maeda	2018-06-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix typos and add a small spec	Shinya Maeda	2018-06-06	2	-3/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix specs for exclusive lease	Shinya Maeda	2018-06-06	1	-10/+19
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix the query to select stale live traces	Shinya Maeda	2018-06-06	4	-78/+33
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Move find_builds_from_stale_live_traces method to Ci::Build	Shinya Maeda	2018-06-06	2	-14/+15
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Rename find_stale_in_batches to find_builds_from_stale_live_trace. Fix comments	Shinya Maeda	2018-06-06	1	-6/+6
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix ambiguous stuck ci job worker's spec. Rename lease key of archive	Shinya Maeda	2018-06-06	2	-2/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add tests for each new code	Shinya Maeda	2018-06-06	4	-12/+89
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix spec fiel location	Shinya Maeda	2018-06-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add tests	Shinya Maeda	2018-06-06	1	-0/+71
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'sh-improve-import-status-error' into 'master'	Fatih Acet	2018-06-06	2	-2/+25
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show a more helpful error for import status Closes #47365 See merge request gitlab-org/gitlab-ce!19467
\| * \| \| \| \| \| \| \| \| \|	Simplify error message handling in Projects::CreateService	Stan Hu	2018-06-06	1	-15/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There's no need to add a redundant message to the errors if the model is invalid. This cleans up the message as well for the importer.
\| * \| \| \| \| \| \| \| \| \|	Show a more helpful error for import status	Stan Hu	2018-06-06	2	-2/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Importing a project from GitHub for a project namespace that already exists would show an unhelpful error, "An error occurred while importing project." We now add the base message from Projects::CreateService when this fails. Closes #47365
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'rails5-fix-47376' into 'master'	Yorick Peterse	2018-06-06	1	-1/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails 5 fix glob spec Closes #47376 See merge request gitlab-org/gitlab-ce!19469