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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Revert rename allow collaboration column	Mark Chao	2018-06-08	1	-1/+4
\|
*	Backport of "Add assignee lists to boards"	Mario de la Ossa	2018-06-07	1	-4/+14
\|
*	Merge branch 'issue_44230' into 'master'	Sean McGivern	2018-06-07	2	-2/+47
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Apply notification settings level of groups to all child objects Closes #44230 See merge request gitlab-org/gitlab-ce!19191
\| *	Apply notification settings level of groups to all child objects	Felipe Artur	2018-06-07	2	-2/+47
\| \|
* \|	Merge remote-tracking branch 'origin/master' into ↵	Kamil Trzciński	2018-06-07	8	-5/+45
\|\ \ \| \| \| \| \| \| \| \| \|	38542-application-control-panel-in-settings-page
\| * \|	Resolve "Automatically provide a Deploy Token to projects when Auto DevOps ↵	Mayra Cabrera	2018-06-07	1	-0/+21
\| \| \| \| \| \| \| \| \| \| \| \|	is enabled"
\| * \|	Merge branch 'feature/customizable-favicon' into 'master'	Douwe Maan	2018-06-07	2	-1/+2
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Customizable favicon Closes #15661 See merge request gitlab-org/gitlab-ce!14497
\| \| * \|	use Gitlab::Favicon for jira service	Alexis Reigel	2018-06-05	1	-1/+1
\| \| \| \|
\| \| * \|	remove all .ico favicon variations, use png always	Alexis Reigel	2018-06-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the ci status icons are generated client side, wo we don't need the static files anymore.
\| \| * \|	allow uploading favicon in appearance settings	Alexis Reigel	2018-06-05	1	-0/+1
\| \| \| \|
\| * \| \|	Merge branch 'n-plus-one-notification-recipients' into 'master'	Rémy Coutable	2018-06-07	2	-2/+5
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix some N+1s when calculating notification recipients Closes #45534 See merge request gitlab-org/gitlab-ce!19535
\| \| * \| \|	Fix some N+1s when calculating notification recipients	Sean McGivern	2018-06-07	2	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	First N+1: we may have loaded a user's notification settings already, but not have loaded their sources. Because we're iterating through, we'd potentially load sources that are completely unrelated, just because they belong to this user. Second N+1: we do a separate query for each user who could be subscribed to or unsubcribed from the target. It's actually more efficient in this case to get all subscriptions at once, as we will need to check most of them. We can fix both by the slightly unpleasant means of checking IDs manually, rather than object equality.
\| * \| \| \|	Merge branch ↵	Sean McGivern	2018-06-07	1	-2/+7
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'6216-extract-ee-specific-files-lines-for-app-views-admin-groups' into 'master' [CE] Resolve "Extract EE specific files/lines for app/views/admin/groups" Closes gitlab-ee#6216 See merge request gitlab-org/gitlab-ce!19275
\| \| * \| \| \|	Reduce CE/EE diff in app/views/admin/groups/	Rémy Coutable	2018-06-06	1	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \|	Merge branch '39549-label-list-page-redesign-with-draggable-labels' into ↵	Tim Zallmann	2018-06-07	1	-0/+4
\| \|\ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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	4	-3/+8
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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	15	-28/+159
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	39549-label-list-page-redesign-with-draggable-labels
\| \| * \ \ \ \ \	Merge remote-tracking branch 'origin/master' into ↵	Luke Bennett	2018-06-05	2	-8/+11
\| \| \|\ \ \ \ \ \ \| \| \| \| \|_\|_\|/ / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \|	39549-label-list-page-redesign-with-draggable-labels
\| \| * \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into ↵	Luke Bennett	2018-06-05	54	-167/+335
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	39549-label-list-page-redesign-with-draggable-labels
\| \| * \ \ \ \ \ \	Merge remote-tracking branch 'origin/master' into ↵	Luke Bennett	2018-05-28	83	-407/+1929
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	39549-label-list-page-redesign-with-draggable-labels
\| \| * \| \| \| \| \| \| \|	Add/use Label#priority? and remove weird padding	Luke Bennett	2018-04-19	1	-0/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch '47208-human-import-status-name-not-working' into 'master'	Douwe Maan	2018-06-07	1	-0/+6
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ProjectImportState#human_status_name
* \| \| \| \| \| \| \| \| \|	Use 0 continuous default for deploy strategy	Matija Čupić	2018-06-07	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'master' into 38542-application-control-panel-in-settings-page	Matija Čupić	2018-06-06	27	-55/+209
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \|	Support LFS objects when creating a project by import	Francisco Javier López	2018-06-06	1	-0/+4
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch '42751-rename-master-to-maintainer' into 'master'	Sean McGivern	2018-06-06	2	-3/+3
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Rename the `Master` role to `Maintainer`" Closes #42751 See merge request gitlab-org/gitlab-ce!19080
\| \| * \| \| \| \| \| \| \|	Rename “Developers + Masters”	Mark Chao	2018-06-06	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Rename master to maintainer	Mark Chao	2018-06-06	1	-1/+1
\| \| \| \|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix the query to select stale live traces	Shinya Maeda	2018-06-06	1	-15/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Move find_builds_from_stale_live_traces method to Ci::Build	Shinya Maeda	2018-06-06	2	-15/+15
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Rename find_stale_in_batches to find_builds_from_stale_live_trace. Fix comments	Shinya Maeda	2018-06-06	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add tests for each new code	Shinya Maeda	2018-06-06	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Rename find_stale. Fix worker name in declaration.	Shinya Maeda	2018-06-06	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Clean up worker	Shinya Maeda	2018-06-06	1	-0/+15
\| \|/ / / / / / /
\| * \| \| \| \| \| \|	Fix repository archive generation when hashed storage is enabled	Nick Thomas	2018-06-05	1	-0/+10
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' into ↵	Kamil Trzciński	2018-06-05	9	-17/+79
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'backstage/gb/use-persisted-stages-to-improve-pipelines-table' # Conflicts: # db/schema.rb
\| \| * \ \ \ \ \ \	Merge branch '46585-gdpr-terms-acceptance' into 'master'	Robert Speicher	2018-06-05	2	-0/+8
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Missing Accept button for terms of service" Closes #46585 See merge request gitlab-org/gitlab-ce!19156
\| \| \| * \| \| \| \| \| \|	Messaging on terms page when user already accepted46585-gdpr-terms-acceptance	tauriedavis	2018-06-04	2	-0/+8
\| \| \| \| \|_\|_\|/ / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We show a blue flash banner if the user already accepted, and show a button allowing them to continue to the application.
\| \| * \| \| \| \| \| \|	Merge branch '42751-rename-mr-maintainer-push' into 'master'	Robert Speicher	2018-06-05	2	-13/+13
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rephrase Merge Request Maintainer Edit See merge request gitlab-org/gitlab-ce!19061
\| \| \| * \| \| \| \| \| \|	Rephrase "maintainer" to more precise "members who can merge to the target ↵42751-rename-mr-maintainer-push	Mark Chao	2018-06-01	2	-13/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	branch" "Maintainer" will be freed to be used for #42751
\| \| * \| \| \| \| \| \| \|	Merge branch 'optimise-runner-update-cached-info' into 'master'	Grzegorz Bizon	2018-06-05	1	-4/+2
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Optimise runner update cached info See merge request gitlab-org/gitlab-ce!19187
\| \| \| * \| \| \| \| \| \| \|	Do not validate cached dataoptimise-runner-update-cached-info	Kamil Trzciński	2018-06-05	1	-4/+2
\| \| \| \| \|/ / / / / / \| \| \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch 'fix-avatars-n-plus-one' into 'master'	Robert Speicher	2018-06-05	4	-0/+56
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix an N+1 in avatar URLs Closes #43114 See merge request gitlab-org/gitlab-ce!18488
\| \| \| * \| \| \| \| \| \|	Fix an N+1 in avatar URLs	Sean McGivern	2018-06-05	4	-0/+56
\| \| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is tricky: the query was being run in `ObjectStorage::Extension::RecordsUploads#retrieve_from_store!`, but we can't just add batch loading there, because the `#upload=` method there would use the result immediately, making the batch only have one item. Instead, we can pre-emptively add an item to the batch whenever an avatarable object is initialized, and then reuse that batch item in `#retrieve_from_store!`. However, this also has problems: 1. There is a lot of logic in `Avatarable#retrieve_upload_from_batch`. 2. Some of that logic constructs a 'fake' model for the batch key. This should be fine, because of ActiveRecord's override of `#==`, but it relies on that staying the same.
\| * \| \| \| \| \| \| \|	Merge branch 'master' into ↵	Grzegorz Bizon	2018-06-05	2	-8/+11
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'backstage/gb/use-persisted-stages-to-improve-pipelines-table' # Conflicts: # db/schema.rb
\| \| * \| \| \| \| \| \|	Merge branch 'add-background-migrations-for-not-archived-traces' into 'master'	Kamil Trzciński	2018-06-05	1	-0/+5
\| \| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add background migrations to archive legacy job traces Closes #46642 See merge request gitlab-org/gitlab-ce!19194
\| \| \| * \| \| \| \| \|	Directly refer application code from migration code	Shinya Maeda	2018-06-04	1	-0/+5
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Remove PagesService and instead make it explicit that we call PagesWorkeroptimise-pages-service-calling	Kamil Trzciński	2018-06-05	1	-1/+6
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Remove unused running_or_pending_build_countremove-unused-query-in-hooks	Kamil Trzciński	2018-06-04	2	-7/+0
\| \| \| \|/ / / / / \| \| \|/\| \| \| \| \|