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	7	-22/+44
\|
*	Support descriptions for snippets	Jarka Kadlecova	2017-05-31	14	-13/+105
\|
*	Merge branch '30410-revert-9347-and-10079' into 'master'	Douwe Maan	2017-05-30	4	-11/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Allow to disable username on checkout url" Closes #30410 and #30174 See merge request !11792
\| *	Don't allow to pass a user to ProjectWiki#http_url_to_repo	Rémy Coutable	2017-05-30	1	-5/+2
\| \| \| \| \| \| \| \| \| \| \| \|	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	3	-6/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| \|
* \| \|	Avoid crash when trying to parse string with invalid UTF-8 sequence	Bob Van Landuyt	2017-05-30	1	-0/+5
\| \| \|
* \| \|	Merge branch '25373-jira-links' into 'master'	Rémy Coutable	2017-05-30	1	-3/+12
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-3/+12
\| \| \| \|
* \| \| \|	Merge branch 'back-port-locked-milestones-to-ce' into 'master'	Phil Hughes	2017-05-30	9	-41/+85
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`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	9	-41/+85
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 '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	6	-4/+20
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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	6	-4/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	issues/merge requests feature enabled
* \| \| \| \| \|	Fix math rendering on blob pages	Sean McGivern	2017-05-30	1	-1/+1
\| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`renderGFM` adds the correct syntax highlighting class and triggers KaTeX if required.
* \| \| \| \|	Merge branch ↵	Fatih Acet	2017-05-30	6	-43/+60
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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
\| * \| \| \| \|	Added specs for handleNotifications in mr_widget_options_spec.js	Luke "Jared" Bennett	2017-05-26	3	-4/+10
\| \| \| \| \| \|
\| * \| \| \| \|	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	5	-43/+52
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'issue_32225_2' into 'master'	Kamil Trzciński	2017-05-30	2	-5/+28
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-11/+28
\| \| \| \| \| \|
\| * \| \| \| \|	Sanity check pipeline sha before saving merge request head pipeline	Felipe Artur	2017-05-23	1	-2/+8
\| \| \| \| \| \|
* \| \| \| \| \|	Update looks job log	Filipa Lacerda	2017-05-30	8	-344/+295
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '31349-pipeline-url-techdeb' into 'master'	Phil Hughes	2017-05-30	3	-57/+66
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-57/+66
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch '2472-assignee-dropdown-does-not-display-selected-assignee-ce' ↵	Phil Hughes	2017-05-30	5	-7/+46
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Assignee dropdown does not display selected assignee Closes #2472 See merge request !11744
\| * \| \| \| \| \|	Backport MR from EE	Clement Ho	2017-05-26	6	-8/+47
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '31849-pipeline-show-view-realtime' into 'master'	Phil Hughes	2017-05-30	7	-70/+110
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Creates a mediator for pipeline details vue in order to mount several vue apps with the same data Closes #31849 See merge request !11732
\| * \| \| \| \| \| \|	Use function to define data instead of an object31849-pipeline-show-view-realtime	Filipa Lacerda	2017-05-26	2	-4/+6
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Creates a mediator for pipeline details vue in order to mount several vue ↵	Filipa Lacerda	2017-05-26	7	-70/+108
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	apps with the same data
* \| \| \| \| \| \|	Merge branch '31616-add-uptime-of-gitlab-instance-in-admin-area' into 'master'	Rémy Coutable	2017-05-30	1	-0/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	31616-add-uptime-of-gitlab-instance-in-admin-area Closes #31616 See merge request !11590
\| * \| \| \| \| \| \|	31616-add-uptime-of-gitlab-instance-in-admin-area	jboltz88	2017-05-29	1	-0/+5
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '32954-loading-icon' into 'master'	Phil Hughes	2017-05-30	2	-0/+8
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Displays loading icon in async buttons inline Closes #32954 See merge request !11735
\| * \| \| \| \| \| \|	Displays loading icon in async buttons inline32954-loading-icon	Filipa Lacerda	2017-05-26	2	-0/+8
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '32790-pipeline_schedules-pages-throwing-error-500' into 'master'	Kamil Trzciński	2017-05-29	2	-8/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "pipeline_schedules pages throwing error 500" Closes #32790 See merge request !11706
\| * \| \| \| \| \| \|	Use if pipeline_schedule.ref	Shinya Maeda	2017-05-29	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Use nil? for ref evaluation	Shinya Maeda	2017-05-29	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Validate parameters when active is false	Shinya Maeda	2017-05-29	1	-7/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fixed	Shinya Maeda	2017-05-29	1	-1/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Revert "Reproduced"	Shinya Maeda	2017-05-29	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 3e0d8b4ca7d7bd0f1ce014b6caaff1b1e32b1f8f.
\| * \| \| \| \| \| \|	Reproduced	Shinya Maeda	2017-05-29	1	-1/+2
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '30917-wiki-is-not-searchable-with-guest-permissions' into 'master'	Douwe Maan	2017-05-29	3	-44/+68
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Wiki is not searchable with Guest permissions" Closes #30917 See merge request !11613
\| * \| \| \| \| \| \|	Create a separate helper to check if we show particular tab on a search page30917-wiki-is-not-searchable-with-guest-permissions	Valery Sizov	2017-05-29	3	-21/+32
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Explicitly test that guest is able to search through the wiki	Valery Sizov	2017-05-29	2	-1/+7
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix: Wiki is not searchable with Guest permissions	Valery Sizov	2017-05-22	2	-36/+43
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'sh-fix-submodules-trailing-spaces' into 'master'	Robert Speicher	2017-05-29	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Strip trailing whitespaces in submodule URLs Closes #33018 See merge request !11753
\| * \| \| \| \| \| \| \|	Strip trailing whitespaces in submodule URLssh-fix-submodules-trailing-spaces	Stan Hu	2017-05-29	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Users attempting to access repositories that had `.gitmodules` entries with trailing whitespaces would encounter an Error 500. This was due to a change in bf876ec7 that quietly removed the whitespace stripping. Closes #33018
* \| \| \| \| \| \| \| \|	Merge branch 'rework-authorizations-performance' into 'master'	Douwe Maan	2017-05-29	9	-157/+51
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rework project authorizations and nested groups for better performance See merge request !10885