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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Change references from ApplicationSetting to ::ApplicationSetting to make ↵sh-current-settings-autoload-fix	Stan Hu	2017-06-20	1	-5/+5
\| \| \| \| \| \|	autoload happier Closes #34047
*	Merge branch '33868-fix-mr-changes-diff-note-up-arrow-editing' into 'master'34013-names-with-spaces-break-issue-filter-bar	Jacob Schatz	2017-06-20	3	-33/+78
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix pressing up-arrow on a MR "Changes" diff discussion edits your last note Closes #33868 See merge request !12297
\| *	Fix MR "Changes" diff note up arrow to edit last note33868-fix-mr-changes-diff-note-up-arrow-editing	Eric Eastwood	2017-06-20	3	-33/+78
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33868 While in a MR "Changes" tab looking at some diff note discussions. Clicking reply and pressing the up-arrow should edit your last comment in that discussion. I suspect this regressed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11173/diffs#f4bb984ec495c5cb58516785c62978f5209c39b4_179_178 where we changed the selector
* \|	Merge branch '30213-project-transfer-move-rollback' into 'master'	Douwe Maan	2017-06-20	3	-40/+139
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rollback project folder move after error in Projects::TransferService Closes #30213 See merge request !11877
\| * \|	Rollback project folder move after error in Projects::TransferService30213-project-transfer-move-rollback	James Edwards-Jones	2017-06-20	3	-40/+139
\| \| \|
* \| \|	Merge branch '33344-add-rails-i18n' into 'master'	Douwe Maan	2017-06-20	2	-0/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add rails-i18n for some common translations Closes #33344 See merge request !12094
\| * \| \|	Add rails-i18n for some common translations33344-add-rails-i18n	Lin Jen-Shin	2017-06-20	2	-0/+5
\| \| \| \|
* \| \| \|	Merge branch 'delete-fix-missing-function-changelog' into 'master'	Stan Hu	2017-06-20	1	-4/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Deleted "fix-missing-function-dropzone-input.yml" from the changelog See merge request !12316
\| * \| \| \|	Deleted "fix-missing-function-dropzone-input.yml" from the changelog	Jose Ivan Vargas	2017-06-20	1	-4/+0
\| \| \| \| \|
* \| \| \| \|	Merge branch 'bugfix/html-email-brackets' into 'master'	Douwe Maan	2017-06-20	4	-0/+41
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	unwrap links without an href Closes #27645 See merge request !9045
\| * \| \| \| \|	add a changelog for the email parsing bugbugfix/html-email-brackets	http://jneen.net/	2017-06-19	1	-0/+4
\| \| \| \| \| \|
\| * \| \| \| \|	unwrap all links with no href	http://jneen.net/	2017-06-19	1	-0/+7
\| \| \| \| \| \|
\| * \| \| \| \|	add a spec for no-href link parsing	http://jneen.net/	2017-06-19	2	-0/+30
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '28517-discover-by-userid' into 'master'	Douwe Maan	2017-06-20	1	-3/+8
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow discover by userid - issue 28517 Closes #28517 See merge request !12314
\| * \| \| \| \|	Allow discover by userid - issue 28517	Matt Walsh	2017-06-20	1	-3/+8
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fix-email-avatars' into 'master'	Douwe Maan	2017-06-20	4	-39/+68
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix avatar images in pipeline emails Closes gitlab-ee#2696 See merge request !12310
\| * \| \| \| \| \|	Fix avatar images in pipeline emailsfix-email-avatars	Sean McGivern	2017-06-20	4	-39/+68
\| \|/ / / / /
* \| \| \| \| \|	Merge branch '33922-add-ruby-metrics-documentation' into 'master'	Achilleas Pipinellis	2017-06-20	3	-2/+57
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation for GitLab ruby monitoring See merge request !12295
\| * \| \| \| \| \|	Add Prometheus metrics documentation33922-add-ruby-metrics-documentation	Joshua Lambert	2017-06-19	3	-2/+57
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'hide-edit-comment-and-report-as-abuse-conditionally' into 'master'	Douwe Maan	2017-06-20	4	-31/+67
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only show 'Edit comment'/'Report as abuse' when user has perms/isnt current_user See merge request !12096
\| * \| \| \| \| \|	Remove PersonalSnippet case for reportable_note specshide-edit-comment-and-report-as-abuse-conditionally	Luke "Jared" Bennett	2017-06-20	2	-40/+8
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fixed reportable_note_shared_example for the reportable_note/snippets_spec	Luke "Jared" Bennett	2017-06-16	2	-15/+37
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Pass more_actions_dropdown vie spec locals to render call instead of ↵	Luke "Jared" Bennett	2017-06-16	1	-44/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	stubbing them
\| * \| \| \| \| \|	Add view spec for more_actions_dropdown render branches	Luke "Jared" Bennett	2017-06-16	2	-18/+87
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	[ci skip] Correct rendering more actions dropdown when there are no actions ↵	Luke "Jared" Bennett	2017-06-16	1	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and correct the more actions dropdown divider conditional
\| * \| \| \| \| \|	Correct 'report as abuse' nesting in _more_actions_dropdown.html.haml	Luke "Jared" Bennett	2017-06-16	1	-4/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update _more_actions_dropdown.html.haml to only show 'Edit comment' when ↵	Luke "Jared" Bennett	2017-06-16	1	-5/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	user is allowed to edit the note and only show 'Report as abuse' when the note doesn't belong to current_user
* \| \| \| \| \| \|	Merge branch 'fix-i18n-helpers' into 'master'	Douwe Maan	2017-06-20	6	-8/+26
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix some incorrect usage of translation helpers See merge request !12274
\| * \| \| \| \| \| \|	Fix some incorrect usage of translation helpersfix-i18n-helpers	Ruben Davila	2017-06-19	6	-8/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: app/views/projects/pipeline_schedules/_form.html.haml
* \| \| \| \| \| \| \|	Merge branch 'refactor-projects-finder-init-collection' into 'master'	Rémy Coutable	2017-06-20	10	-59/+234
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor ProjectsFinder#init_collection and GroupProjectsFinder#init_collection Closes #33632 See merge request !12135
\| * \| \| \| \| \| \| \|	Refactor GroupProjectsFinder#init_collection	Yorick Peterse	2017-06-19	5	-38/+106
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This optimises how GroupProjectsFinder builds it collection, producing simpler and faster queries in the process. It also cleans up the code a bit to make it easier to understand.
\| * \| \| \| \| \| \| \|	Refactor Project.with_feature_available_for_user	Yorick Peterse	2017-06-16	3	-7/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This method used to use a UNION, which would lead to it performing the same query twice; producing less than ideal performance. Further, in certain cases ActiveRecord could get confused and mess up the variable bindings, though it's not clear how/why exactly this happens. Fortunately we can work around all of this by building some of the WHERE conditions manually, allowing us to use a simple OR statement to get all the data we want without any of the above problems.
\| * \| \| \| \| \| \| \|	Refactor ProjectsFinder#init_collection	Yorick Peterse	2017-06-16	4	-31/+107
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This changes ProjectsFinder#init_collection so it no longer relies on a UNION. For example, to get starred projects of a user we used to run: SELECT projects.* FROM projects WHERE projects.pending_delete = 'f' AND ( projects.id IN ( SELECT projects.id FROM projects INNER JOIN users_star_projects ON users_star_projects.project_id = projects.id INNER JOIN project_authorizations ON projects.id = project_authorizations.project_id WHERE projects.pending_delete = 'f' AND project_authorizations.user_id = 1 AND users_star_projects.user_id = 1 UNION SELECT projects.id FROM projects INNER JOIN users_star_projects ON users_star_projects.project_id = projects.id WHERE projects.visibility_level IN (20, 10) AND users_star_projects.user_id = 1 ) ) ORDER BY projects.id DESC; With these changes the above query is turned into the following instead: SELECT projects.* FROM projects INNER JOIN users_star_projects ON users_star_projects.project_id = projects.id WHERE projects.pending_delete = 'f' AND ( EXISTS ( SELECT 1 FROM project_authorizations WHERE project_authorizations.user_id = 1 AND (project_id = projects.id) ) OR projects.visibility_level IN (20,10) ) AND users_star_projects.user_id = 1 ORDER BY projects.id DESC; This query in turn produces a better execution plan and takes less time, though the difference is only a few milliseconds (this however depends on the amount of data involved and additional conditions that may be added).
* \| \| \| \| \| \| \| \|	Merge branch 'docs/subgroups-mysql' into 'master'	Marcia Ramos	2017-06-20	3	-58/+53
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mention limitations of MySQL in docs See merge request !12272
\| * \| \| \| \| \| \| \| \|	Add link to issue for MySQL/subgroups drop support	Achilleas Pipinellis	2017-06-20	2	-2/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Mention limitations of MySQL in docs	Achilleas Pipinellis	2017-06-19	3	-58/+50
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'remove-changelog' into 'master'	Clement Ho	2017-06-20	1	-4/+0
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove changelog entry See merge request !12309
\| * \| \| \| \| \| \| \| \|	Remove changelog entry	Annabel Dunstone Gray	2017-06-20	1	-4/+0
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch ↵	Annabel Dunstone Gray	2017-06-20	3	-4/+2
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'33363-user-customize-callout-has-no-top-margin-on-projects-page' into 'master' Resolve "User customize callout has no top-margin on projects page" Closes #33592 and #33363 See merge request !12090
\| * \| \| \| \| \| \| \| \| \|	Resolve "User customize callout has no top-margin on projects page"	Luke "Jared" Bennett	2017-06-20	3	-4/+2
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'search-clear-button-center' into 'master'	Annabel Dunstone Gray	2017-06-20	1	-3/+0
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed filtered search clear button being off-center Closes #33912 See merge request !12304
\| * \| \| \| \| \| \| \| \| \|	Fixed filtered search clear button being off-centersearch-clear-button-center	Phil Hughes	2017-06-20	1	-3/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #33912
* \| \| \| \| \| \| \| \| \| \|	Merge branch '31349-async-buttons' into 'master'	Phil Hughes	2017-06-20	16	-443/+271
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Uniformize code between both pipelines tables Closes #31349, #33754, and #31181 See merge request !12232
\| * \| \| \| \| \| \| \| \| \| \|	Uniformize code between both pipelines tables	Filipa Lacerda	2017-06-20	16	-443/+271
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch '33260-allow-admins-to-list-admins' into 'master'	Rémy Coutable	2017-06-20	6	-4/+53
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Re-instate is_admin flag in users API is current user is an admin Closes #33260 See merge request !12211
\| * \| \| \| \| \| \| \| \| \| \|	Re-instate is_admin flag in users API is current user is an admin	Mike Ricketts	2017-06-20	6	-4/+53
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	kushalpandya	2017-06-20	1	-0/+9
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| / / / \| \|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '33840-revert-sticky-confidential-header' into 'master'confidential-issues-revert	Clement Ho	2017-06-20	4	-37/+43
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert sticky confidential header Closes #33840 See merge request !12307
\| * \| \| \| \| \| \| \| \| \|	Revert sticky confidential header	Annabel Dunstone Gray	2017-06-20	4	-37/+43
\| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'confidential-issues-redesign-docs' into 'master'"	Victor Wu	2017-06-20	2	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !12195