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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Support uploads for newly created personal snippets12910-snippets-description	Jarka Kadlecova	2017-06-07	15	-36/+164
\|
*	Support descriptions for snippets	Jarka Kadlecova	2017-05-31	34	-37/+459
\|
*	Merge branch '30410-revert-9347-and-10079' into 'master'	Douwe Maan	2017-05-30	13	-63/+26
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Allow to disable username on checkout url" Closes #30410 and #30174 See merge request !11792
\| *	Add changelog30410-revert-9347-and-10079	Rémy Coutable	2017-05-30	1	-0/+5
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| *	Don't allow to pass a user to ProjectWiki#http_url_to_repo	Rémy Coutable	2017-05-30	5	-33/+9
\| \| \| \| \| \| \| \| \| \| \| \|	This partially reverts be25bbc4d2c7e3d5cf3da6f51cb7f7355295ef52. Signed-off-by: Rémy Coutable <remy@rymai.me>
\| *	Revert "Merge branch '1937-https-clone-url-username' into 'master' "	Rémy Coutable	2017-05-30	7	-30/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit c425f366bfa84efab92b5d5e1d0721f16a2890bc, reversing changes made to 82f6c0f5ac4ed29390ed90592d2c431f3494d93f. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch '30502-fix-bottom-padding-job-page' into 'master'	Annabel Dunstone Gray	2017-05-30	1	-0/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove extra bottom padding on Job log page Closes #30502 See merge request !11791
\| * \|	Fix bottom padding for build page30502-fix-bottom-padding-job-page	kushalpandya	2017-05-30	1	-0/+4
\| \| \|
* \| \|	Merge branch 'gitaly-opt-out' into 'master'	Rémy Coutable	2017-05-30	8	-20/+295
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable Gitaly by default in GitLab 9.3 Closes gitaly#242 See merge request !11796
\| * \| \|	Enable Gitaly by default in GitLab 9.3	Jacob Vosmaer	2017-05-30	8	-20/+295
\| \| \| \|
* \| \| \|	Merge branch 'bvl-fix-encoding-errors-when-validating-paths' into 'master'	Douwe Maan	2017-05-30	3	-1/+28
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid crash when trying to parse string with invalid UTF-8 sequence See merge request !11770
\| * \| \| \|	Avoid crash when trying to parse string with invalid UTF-8 sequence	Bob Van Landuyt	2017-05-30	3	-1/+28
\|/ / / /
* \| \| \|	Merge branch '25373-jira-links' into 'master'	Rémy Coutable	2017-05-30	5	-10/+61
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don’t create comment on JIRA if link already exists Closes #25373 See merge request !11485
\| * \| \| \|	Don’t create comment on JIRA if link already exists	Jarka Kadlecova	2017-05-30	5	-10/+61
\| \|/ / /
* \| \| \|	Merge branch 'back-port-locked-milestones-to-ce' into 'master'	Phil Hughes	2017-05-30	10	-41/+88
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`canEdit` changes for conditional remove button on filtered search -- EE backport Closes gitlab-ee#2433 See merge request !11696
\| * \| \| \|	Backport canEdit changes for conditional remove buttonback-port-locked-milestones-to-ce	Eric Eastwood	2017-05-26	10	-41/+88
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport Fix locked milestone in boards being remove-able. See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1963 Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/2433 Conflicts: app/assets/javascripts/boards/boards_bundle.js app/assets/javascripts/boards/filtered_search_boards.js app/assets/javascripts/filtered_search/filtered_search_manager.js spec/features/boards/boards_spec.rb
* \| \| \| \|	Merge branch 'Disable-sub_group_issuables_spec-for-mysql' into 'master'	Rémy Coutable	2017-05-30	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable sub_group_issuables_spec.rb for mysql Closes #33057 See merge request !11795
\| * \| \| \| \|	Disable sub_group_issuables_spec.rb for mysql	Luke "Jared" Bennett	2017-05-30	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fix/gb/improve-active-record-test-extensions' into 'master'	Rémy Coutable	2017-05-30	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make `ActiveRecord::Migrator` idempotent again in test environment Closes #33030 See merge request !11762
\| * \| \| \| \| \|	Make `ActiveRecord::Migrator` idempotent again in test envfix/gb/improve-active-record-test-extensions	Grzegorz Bizon	2017-05-29	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'winh-merge-request-tree-symbols' into 'master'	Annabel Dunstone Gray	2017-05-30	1	-6/+2
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix alignment of tree symbols in merge requests Closes #29590 See merge request !11761
\| * \| \| \| \| \|	Fix alignment of tree symbols in merge requestswinh-merge-request-tree-symbols	winh	2017-05-29	1	-6/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch ↵	Douwe Maan	2017-05-30	11	-50/+99
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'19107-404-when-creating-new-milestone-or-issue-for-project-that-has-issues-disabled' into 'master' 'New issue'/'New merge request' dropdowns should show only projects with issues/merge requests feature enabled Closes #19107 See merge request !11754
\| * \| \| \| \| \| \|	'New issue'/'New merge request' dropdowns should show only projects with ↵19107-404-when-creating-new-milestone-or-issue-for-project-that-has-issues-disabled	blackst0ne	2017-05-30	11	-50/+99
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	issues/merge requests feature enabled
* \| \| \| \| \| \| \|	Merge branch ↵	Douwe Maan	2017-05-30	2	-1/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'33048-markdown-rendering-of-md-files-has-ceased-to-display-latex-equations' into 'master' Fix math rendering on blob pages Closes #33048 See merge request !11793
\| * \| \| \| \| \| \| \|	Fix math rendering on blob pages	Sean McGivern	2017-05-30	2	-1/+5
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`renderGFM` adds the correct syntax highlighting class and triggers KaTeX if required.
* \| \| \| \| \| \| \|	Merge branch ↵	Grzegorz Bizon	2017-05-30	3	-3/+32
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'33032-invalid-you-directly-addressed-yourself-todo-when-using-unsubscribe' into 'master' Resolve "Invalid 'You directly addressed yourself' TODO when using `/unsubscribe`" Closes #33032 See merge request !11788
\| * \| \| \| \| \| \|	Fix /unsubscribe slash command creating extra todos33032-invalid-you-directly-addressed-yourself-todo-when-using-unsubscribe	Sean McGivern	2017-05-30	3	-3/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The /unsubscribe slash command means that we check if the current user is subscribed to the issuable without having an explicit subscription. That means that we use the UserParser to find references to them in the notes. The UserParser (and all parsers inheriting from BaseParser) use RequestStore to cache ActiveRecord objects, so that we don't need to load the User object each time, if we're parsing references a bunch of times in the same request. However, it was always returning _all_ of the previously cached items, not just the ones matching the IDs passed. This would mean that we did two runs through with UserParser if you were mentioned in a comment, and then mentioned someone else in your comment while using /unsubscribe: 1. Because /unsubscribe was used, we see if you were mentioned in any comments. 2. Because you mentioned someone, we find them - but we would also get back your user, even if you didn't mention yourself. This would have the effect of creating a mention or directly addressed todo for yourself incorrectly. The fix is simple: only return values from the cache matching the IDs passed.
* \| \| \| \| \| \| \|	Merge branch '32653-fix-gemfile-lock' into 'master'	Grzegorz Bizon	2017-05-30	1	-4/+3
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix omniauth-google-oauth2 dependencies in Gemfile.lock Closes #32653 See merge request !11787
\| * \| \| \| \| \| \|	Fix omniauth-google-oauth2 dependencies in Gemfile.lock32653-fix-gemfile-lock	Rémy Coutable	2017-05-30	1	-4/+3
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch 'node-sudo-bash' into 'master'	Rémy Coutable	2017-05-30	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use 'sudo bash' when adding nodesource repository See merge request !10527
\| * \| \| \| \| \| \|	Use 'sudo bash' when adding nodesource repository	Jacob Vosmaer	2017-05-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In accordance with https://github.com/nodesource/distributions#debinstall
* \| \| \| \| \| \| \|	Merge branch ↵	Fatih Acet	2017-05-30	8	-43/+100
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'32916-browser-notifications-for-pipeline-running-in-a-mr-is-gone' into 'master' Resolve "Browser notifications for pipeline running in a MR is gone" Closes #32916 See merge request !11734
\| * \| \| \| \| \| \| \|	Add rubocop:disable to gon_helper.rb32916-browser-notifications-for-pipeline-running-in-a-mr-is-gone	Luke "Jared" Bennett	2017-05-26	1	-0/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Added specs for handleNotifications in mr_widget_options_spec.js	Luke "Jared" Bennett	2017-05-26	4	-4/+47
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Move gon ref to the index to avoid depending on gon in any mr widget objects	Luke "Jared" Bennett	2017-05-26	2	-1/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Restore notifications to MR widget	Luke "Jared" Bennett	2017-05-26	6	-43/+53
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'issue_32225_2' into 'master'	Kamil Trzciński	2017-05-30	5	-7/+76
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set head pipeline when creating merge requests See merge request !11669
\| * \| \| \| \| \| \| \|	Set head pipeline when creating merge requestsissue_32225_2	Felipe Artur	2017-05-29	5	-13/+61
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Sanity check pipeline sha before saving merge request head pipeline	Felipe Artur	2017-05-23	3	-3/+24
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '30117-update-looks-job-log' into 'master'	Phil Hughes	2017-05-30	10	-483/+480
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update looks job log Closes #30117 See merge request !11663
\| * \| \| \| \| \| \| \| \|	Update looks job log	Filipa Lacerda	2017-05-30	10	-483/+480
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch '31349-pipeline-url-techdeb' into 'master'	Phil Hughes	2017-05-30	4	-58/+67
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use vue file for pipelines tables components See merge request !11760
\| * \| \| \| \| \| \| \| \|	Use vue file for pipelines tables components31349-pipeline-url-techdeb	Filipa Lacerda	2017-05-29	4	-58/+67
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'fix-authorized-members-destroy' into 'master'	Rémy Coutable	2017-05-30	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix spec for Members::AuthorizedDestroyService See merge request !11778
\| * \| \| \| \| \| \| \| \|	Fix spec for Members::AuthorizedDestroyServicefix-authorized-members-destroy	Yorick Peterse	2017-05-30	1	-1/+1
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This spec was still assuming that creating a project would not result in the owner having access to the project.
* \| \| \| \| \| \| \| \|	Merge branch '2472-assignee-dropdown-does-not-display-selected-assignee-ce' ↵	Phil Hughes	2017-05-30	7	-7/+123
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Assignee dropdown does not display selected assignee Closes #2472 See merge request !11744
\| * \| \| \| \| \| \| \| \|	Fix rubocop2472-assignee-dropdown-does-not-display-selected-assignee-ce	Clement Ho	2017-05-26	1	-3/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Backport MR from EE	Clement Ho	2017-05-26	9	-8/+140
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '31849-pipeline-show-view-realtime' into 'master'	Phil Hughes	2017-05-30	10	-106/+144
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Creates a mediator for pipeline details vue in order to mount several vue apps with the same data Closes #31849 See merge request !11732