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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into 'docs/hide-gcp-install'docs/hide-gcp-install	Achilleas Pipinellis	2017-05-10	276	-1218/+3853
\|\ \| \| \| \| \| \|	# Conflicts: # doc/install/README.md
\| *	Merge branch 'bvl-security-patches' into 'master'	Robert Speicher	2017-05-10	56	-311/+831
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Security patches -> `master` See merge request !11230
\| \| *	Use new SnippetsFinder signature in APIbvl-security-patches	Bob Van Landuyt	2017-05-10	1	-2/+2
\| \| \|
\| \| *	Use `described_class` in SnippetsFinder-spec	Bob Van Landuyt	2017-05-10	1	-21/+21
\| \| \|
\| \| *	Merge branch 'tc-fix-private-subgroups-shown' into 'security'	Douwe Maan	2017-05-10	8	-19/+105
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use GroupsFinder to find subgroups the user has access to See merge request !2096
\| \| *	Merge branch 'fix-hamlit-xss' into 'security-9-1'	Robert Speicher	2017-05-10	5	-3/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	New Hamlit XSS fix, does not include extraneous changes See merge request !2095
\| \| *	Merge branch 'snippets-finder-visibility' into 'security'	Douwe Maan	2017-05-10	23	-184/+399
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor snippets finder & dont return internal snippets for external users See merge request !2094
\| \| *	Merge branch 'branch-name-escape' into 'security'	Robert Speicher	2017-05-10	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix XSS in branches dropdown See merge request !2093
\| \| *	Merge branch '31157-respect-project-features-in-wiki-search' into 'security'	Douwe Maan	2017-05-10	3	-3/+80
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Respect project features in wiki and blob search See merge request !2089
\| \| *	Merge branch 'snippets_visibility' into 'security'	Sean McGivern	2017-05-10	4	-12/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix snippets visibility for show action - external users can not see internal snippets See merge request !2087
\| \| *	Merge branch 'rs-sanitize-submodule-urls' into 'security'	Douwe Maan	2017-05-10	3	-16/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sanitize submodule URLs before linking to them in the file tree view See merge request !2084
\| \| *	Merge branch 'bvl-security-9-1-validate-urls-in-markdown-using-uri'	Robert Speicher	2017-05-10	4	-56/+86
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(security-9-1) Add correct `rel` attributes to external links when rendering markdown See merge request !2097
\| \| *	Merge branch 'bvl-security-9-1-markup-pipeline'	Robert Speicher	2017-05-10	7	-17/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(security-9-1) Render asciidoc & other markup using banzai in a pipeline See merge request !2098
\| * \|	Merge branch ↵	Phil Hughes	2017-05-10	7	-13/+97
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'31474-issue-boards-sidebar-milestone-dropdown-should-not-be-multi-select' into 'master' Resolve "Issue boards sidebar milestone dropdown should not be multi select" Closes #31474 See merge request !11084
\| \| * \|	Disallow multiselect for Milestone dropdown	Sam Rose	2017-05-10	7	-13/+97
\| \| \| \|
\| * \| \|	Merge branch 'tc-clean-pending-delete-projects' into 'master'	Douwe Maan	2017-05-10	6	-0/+206
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Post-deploy to clean `pending_delete` projects Closes #20984 See merge request !11044
\| \| * \| \|	No user needed to cleanup namespaceless pending delete projects	Toon Claes	2017-05-10	4	-21/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since this is a cleanup, ran by a post-deploy, there is no need to lookup the admin to run the cleanup.
\| \| * \| \|	Use worker to destroy namespaceless projects in post-deploy	Toon Claes	2017-05-10	7	-116/+202
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Destroying projects can be very time consuming. So instead of destroying them in the post-deploy, just schedule them and make Sidekiq do the hard work. They are scheduled in batches of 5000 records. This way the number of database requests is limited while also the amount data read to memory is limited.
\| \| * \| \|	No user is needed to delete a project	Toon Claes	2017-05-10	1	-4/+1
\| \| \| \| \|
\| \| * \| \|	Add post-deploy migrate to cleanup projects in pending delete state	Toon Claes	2017-05-10	3	-0/+123
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There are many projects in `pending_delete` state, this post-deploy migration cleans them up. The script is based on https://gitlab.com/gitlab-org/gitlab-ce/snippets/1648654 and https://gitlab.com/gitlab-org/gitlab-ce/snippets/1611429. The use of these scripts were described in https://gitlab.com/gitlab-com/infrastructure/issues/888.
\| * \| \| \|	Merge branch 'cycle-analytics-stage-title-translation-fix' into 'master'	Filipa Lacerda	2017-05-10	1	-1/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed the stage title translation in cycle analytics See merge request !11252
\| \| * \| \| \|	Fixed the stage title translation in cycle analytics	Phil Hughes	2017-05-10	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch '30949-empty-states' into 'master'	Phil Hughes	2017-05-10	6	-28/+13
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Center all empty states Closes #30949 See merge request !11249
\| \| * \| \| \| \|	Center all empty states	Annabel Dunstone Gray	2017-05-10	6	-28/+13
\| \|/ / / / /
\| * \| \| \| \|	Merge branch 'center-related-merge-request-items-horizontally' into 'master'	Filipa Lacerda	2017-05-10	1	-1/+9
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Center related merge request items horizontally See merge request !11163
\| \| * \| \| \| \|	Added @annabeldunstone vertical-align fixcenter-related-merge-request-items-horizontally	Luke "Jared" Bennett	2017-05-10	1	-0/+8
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Remove related issue ci icon top margin	Luke "Jared" Bennett	2017-05-09	1	-1/+0
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Center related merge request items horizontally	Luke "Jared" Bennett	2017-05-08	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'dm-discussion-diff-header-toggle' into 'master'	Douwe Maan	2017-05-10	2	-2/+6
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused toggle from diff discussion diff headers See merge request !11192
\| \| * \| \| \| \| \|	Remove unused toggle from diff discussion diff headersdm-discussion-diff-header-toggle	Douwe Maan	2017-05-09	2	-2/+6
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'dm-async-tree-readme' into 'master'	Douwe Maan	2017-05-10	15	-16/+42
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Load tree readme asynchronously See merge request !11191
\| \| * \| \| \| \| \| \|	Load tree readme asynchronouslydm-async-tree-readme	Douwe Maan	2017-05-10	15	-16/+42
\| \| \|/ / / / / /
\| * \| \| \| \| \| \|	Merge branch 'remove-old-isobject' into 'master'	Phil Hughes	2017-05-10	11	-47/+18
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace old isObject for underscore methods Closes #30317 See merge request !11124
\| \| * \| \| \| \| \| \|	Replace old isObject for underscore methods	Filipa Lacerda	2017-05-10	11	-47/+18
\| \|/ / / / / / /
\| * \| \| \| \| \| \|	Merge branch '30286-vue-loadin-icon' into 'master'	Phil Hughes	2017-05-10	20	-105/+187
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tech debt: Creates vue component for loading icon Closes #31328 See merge request !11167
\| \| * \| \| \| \| \| \|	Tech debt: Creates vue component for loading icon	Filipa Lacerda	2017-05-10	20	-105/+187
\| \|/ / / / / / /
\| * \| \| \| \| \| \|	Merge branch '31554-update-rufus-scheduler-and-sidekiq' into 'master'	Rémy Coutable	2017-05-10	5	-9/+34
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Update gem sidekiq-cron from 0.4.4 to 0.6.0 and rufus-scheduler from 3.1.10 to 3.4.0" Closes #31554 See merge request !10976
\| \| * \| \| \| \| \| \|	Resolve "Update gem sidekiq-cron from 0.4.4 to 0.6.0 and rufus-scheduler ↵	Dosuken shinya	2017-05-10	5	-9/+34
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	from 3.1.10 to 3.4.0"
\| * \| \| \| \| \| \|	Merge branch '32077-pipeline-graph-margins' into 'master'	Phil Hughes	2017-05-10	1	-5/+5
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken margin in pipeline graph Closes #32077 See merge request !11239
\| \| * \| \| \| \| \| \|	Fix broken margin in pipeline graph	Filipa Lacerda	2017-05-10	1	-5/+5
\| \|/ / / / / / /
\| * \| \| \| \| \| \|	Merge branch 'fix-reassigned-mr-email' into 'master'	Douwe Maan	2017-05-10	2	-19/+10
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix reassigned MR HTML email See merge request !11238
\| \| * \| \| \| \| \| \|	Fix reassigned MR emailfix-reassigned-mr-email	Sean McGivern	2017-05-10	2	-19/+10
\| \| \| \|_\|_\|/ / / \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'feature/print-go-version-in-env-info' into 'master'	Sean McGivern	2017-05-10	2	-0/+7
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Print Go version in rake gitlab:env:info See merge request !11241
\| \| * \| \| \| \| \| \|	Print Go version in rake gitlab:env:infofeature/print-go-version-in-env-info	Ahmad Sherif	2017-05-10	2	-0/+7
\| \| \|/ / / / / /
\| * \| \| \| \| \| \|	Merge branch 'fix-sidebar_spec-assignee-edit-transient-failure' into 'master'	Sean McGivern	2017-05-10	1	-2/+2
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Find dropdown-menu before asserting active item in sidebar_spec.rb See merge request !11246
\| \| * \| \| \| \| \|	Find dropdown-menu before asserting active item in sidebar_spec.rbfix-sidebar_spec-assignee-edit-transient-failure	Luke "Jared" Bennett	2017-05-10	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'search-restrict-projects-to-group' into 'master'	Filipa Lacerda	2017-05-10	4	-9/+50
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Filter projects by group on search page Closes #29489 See merge request !11169
\| \| * \| \| \| \| \| \|	Filter projects by group on search pagesearch-restrict-projects-to-group	Phil Hughes	2017-05-08	4	-9/+50
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	After selecting a group, the projects dropdown will now filter by group projects instead Closes #29489
\| * \| \| \| \| \| \| \|	Merge branch 'fix-search-not-highlighting' into 'master'	Filipa Lacerda	2017-05-10	3	-10/+47
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed search terms not highlight Closes #31997 See merge request !11198
\| \| * \| \| \| \| \| \| \|	Fixed search terms not highlight	Phil Hughes	2017-05-10	3	-10/+47
\| \| \| \|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #31997