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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Updated pipelines charts to use dynamic webpack bundlepipeline-chart-bundle	Phil Hughes	2018-02-15	6	-39/+57
\| \| \| \|	#41341
*	Merge branch ↵	Rémy Coutable	2018-02-15	2	-3/+7
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'40623-fix-404-when-listing-archived-projects-in-a-group-where-all-projects-have-been-archived' into 'master' Resolve "404 when listing archived projects in a group where all projects have been archived" Closes #40623 See merge request gitlab-org/gitlab-ce!17077
\| *	Add changelog entry	Ashley Dumaine	2018-02-15	1	-0/+4
\| \| \| \| \| \| \| \|	Signed-off-by: Ashley Dumaine <adumaine@datto.com>
\| *	Change group_children_path to filter_groups_path like for the sort order filter	Ashley Dumaine	2018-02-15	1	-3/+3
\| \| \| \| \| \| \| \|	Signed-off-by: Ashley Dumaine <adumaine@datto.com>
* \|	Merge branch 'qa_issue_177' into 'master'	Grzegorz Bizon	2018-02-15	1	-0/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	QA - Wait for create merge request button to appear Closes gitlab-qa#177 See merge request gitlab-org/gitlab-ce!17115
\| * \|	Wait for create merge request button to appearqa_issue_177	Felipe Artur	2018-02-14	1	-0/+4
\| \| \|
* \| \|	Merge branch 'change/strip-whitespace-from-username-input#42637' into 'master'	Rémy Coutable	2018-02-15	3	-1/+14
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Trim whitespace from input in the username/email form field Closes #42637 See merge request gitlab-org/gitlab-ce!17020
\| * \| \|	Strip whitespace from username/login value for user lookup	Peter Lauck	2018-02-13	3	-1/+14
\| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As per the discussion with @psimyn, this change does not affect the frontend, so user input will not be validated on the signin screen. Instead, the value sent to the backend has leading and trailing whitespace stripped before looking up the user with find_by. Closes #42637
* \| \|	Merge branch '43231-document-the-instance-level-auto-devops-domain-option' ↵	Achilleas Pipinellis	2018-02-15	1	-1/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Document the instance level Auto DevOps domain option" Closes #43231 See merge request gitlab-org/gitlab-ce!17132
\| * \| \|	Add instance-wide domain info43231-document-the-instance-level-auto-devops-domain-option	Matija Čupić	2018-02-14	1	-1/+3
\| \| \| \|
* \| \| \|	Merge branch 'pipeline-schedule-webpack' into 'master'	Filipa Lacerda	2018-02-15	16	-19/+21
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Converted pipeline_schedules bundles into automatic webpack entries See merge request gitlab-org/gitlab-ce!17143
\| * \| \| \|	Converted pipeline_schedules bundles into automatic webpack entriespipeline-schedule-webpack	Phil Hughes	2018-02-15	16	-19/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	#41341
* \| \| \| \|	Merge branch '31049-pages-domains-should-be-added-to-publicsuffix-org-docs' ↵	Grzegorz Bizon	2018-02-15	1	-0/+15
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "HackerOne reported issue: Cookie bomb vulnerability in Pages" Closes #31049 See merge request gitlab-org/gitlab-ce!17123
\| * \| \| \| \|	Document publicsuffix.org and GitLab Pages	Nick Thomas	2018-02-15	1	-0/+15
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'patch-29' into 'master'	Sean McGivern	2018-02-15	1	-1/+13
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added PlantUML server using docker See merge request gitlab-org/gitlab-ce!16880
\| * \| \| \| \| \|	Added PlantUML server using docker	morph027	2018-02-02	1	-1/+13
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'docs-edits' into 'master'	Sean McGivern	2018-02-15	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update index.md with minor grammatical edit See merge request gitlab-org/gitlab-ce!16919
\| * \| \| \| \| \| \|	Update index.md with minor grammatical edit	Ann Lette	2018-02-04	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'patch-19' into 'master'	Sean McGivern	2018-02-15	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove double negative See merge request gitlab-org/gitlab-ce!17049
\| * \| \| \| \| \| \| \|	Remove double negative	Ben Bodenmiller	2018-02-11	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-error-500-licensee' into 'master'	Douwe Maan	2018-02-15	2	-1/+21
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Error 500s loading repositories with inconsistent HEAD Closes #43268 See merge request gitlab-org/gitlab-ce!17128
\| * \| \| \| \| \| \| \| \|	Remove head_commit callsh-fix-error-500-licensee	Stan Hu	2018-02-14	1	-1/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Simplify license generator error handling	Stan Hu	2018-02-14	2	-4/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Remove use of catching Rugged exceptions	Stan Hu	2018-02-14	1	-1/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix Error 500s loading repositories with no master branch	Stan Hu	2018-02-14	2	-1/+20
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We removed the exception handling for Rugged errors in !16770, which revealed that the licensee gem attempts to retrieve a license file via Rugged in `refs/heads/master` by default. If that branch did not exist, a Rugged::ReferenceError would be thrown. There were two issues: 1. Not every project uses `master` as the default branch. This change uses the head commit to identify the license. 2. Removing the exception handling caused repositories to fail loading. We can safely catch and ignore any Rugged error because this means we weren't able to load a license file. Closes #43268
* \| \| \| \| \| \| \| \|	Merge branch 'move-profile-to-rspec' into 'master'	Rémy Coutable	2018-02-15	7	-330/+231
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move spinach profile tests to RSpec See merge request gitlab-org/gitlab-ce!17068
\| * \| \| \| \| \| \| \| \|	Move spinach profile tests to RSpec	Semyon Pupkov	2018-02-15	7	-330/+231
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* \| \| \| \| \| \| \| \| \|	Merge branch '39607-fix-avatar--vertical-align' into 'master'	Tim Zallmann	2018-02-15	2	-2/+5
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "CI status icon and avatar are not vertically aligned in MR list" Closes #39607 See merge request gitlab-org/gitlab-ce!17072
\| * \| \| \| \| \| \| \| \| \|	changelog added	Laszlo Karpati	2018-02-13	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	fix author_link's vertical align	Laszlo Karpati	2018-02-13	1	-2/+0
\| \| \|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'ce-rc/move-more-ee-only-spec-files' into 'master'	Sean McGivern	2018-02-15	3	-7/+8
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Port some changes from gitlab-ee!4532 back to CE See merge request gitlab-org/gitlab-ce!17120
\| * \| \| \| \| \| \| \| \| \|	Port some changes from gitlab-ee!4532 back to CEce-rc/move-more-ee-only-spec-files	Rémy Coutable	2018-02-14	3	-7/+8
\| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \|	Merge branch 'fj-37528-error-after-disabling-ldap' into 'master'	Douwe Maan	2018-02-15	7	-2/+68
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed user synced attributes metadata after removing current provider Closes #37528 See merge request gitlab-org/gitlab-ce!17054
\| * \| \| \| \| \| \| \| \| \|	Fixed user synced attributes metadata after removing current provider	Francisco Javier López	2018-02-15	7	-2/+68
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'jej/fix-slow-lfs-object-check' into 'master'	Douwe Maan	2018-02-15	5	-9/+33
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only check LFS integrity for first branch in push Closes #41141 See merge request gitlab-org/gitlab-ce!17098
\| * \| \| \| \| \| \| \| \|	Only check LFS integrity for first branch in pushjej/fix-slow-lfs-object-check	James Edwards-Jones	2018-02-15	5	-9/+33
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'group-milestones-rspec' into 'master'	Rémy Coutable	2018-02-15	3	-220/+114
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move spinach group milestones test to RSpec See merge request gitlab-org/gitlab-ce!17051
\| * \| \| \| \| \| \| \| \| \|	Move spinach group milestones test to RSpec	Semyon Pupkov	2018-02-15	3	-220/+114
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'group-search-members-rspec' into 'master'	Rémy Coutable	2018-02-15	3	-27/+29
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move feature group members search test to RSpec See merge request gitlab-org/gitlab-ce!17050
\| * \| \| \| \| \| \| \| \| \|	Move feature group members search test to RSpec	Semyon Pupkov	2018-02-15	3	-27/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* \| \| \| \| \| \| \| \| \| \|	Merge branch '35530-teleporting-emoji-fix' into 'master'	Fatih Acet	2018-02-15	3	-4/+18
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix teleporting emoji (MR description instead of comment) Closes #35530 See merge request gitlab-org/gitlab-ce!17100
\| * \| \| \| \| \| \| \| \| \| \|	Add changelog entry	Jared Deckard	2018-02-13	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Don't reset the awards block when the emoji search is clicked	Jared Deckard	2018-02-07	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	The emoji menu should not close when the search box is clicked	Jared Deckard	2018-02-07	1	-1/+12
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '34130-null-pipes' into 'master'	Fatih Acet	2018-02-15	3	-0/+15
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Merge request says "Could not connect to the CI server", no CI or integration is configured" See merge request gitlab-org/gitlab-ce!17053
\| * \| \| \| \| \| \| \| \| \| \| \|	Prevent MR Widget error when no CI configured34130-null-pipes	Simon Knox	2018-02-12	3	-0/+15
\| \| \|_\|_\|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'sh-add-env-variables-for-ldap-qa' into 'master'	Grzegorz Bizon	2018-02-15	3	-2/+18
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add LDAP_USERNAME and LDAP_PASSWORD user environment variables for QA See merge request gitlab-org/gitlab-ce!17141
\| * \| \| \| \| \| \| \| \| \| \|	Add LDAP_USERNAME and LDAP_PASSWORD user environment variables for QAsh-add-env-variables-for-ldap-qa	Stan Hu	2018-02-14	3	-2/+18
\| \| \|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'patch-28' into 'master'	Stan Hu (Admin)	2018-02-15	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add the missing "Security Products" Team label and sort them alphabetically See merge request gitlab-org/gitlab-ce!16961
\| * \| \| \| \| \| \| \| \| \|	Add the missing "Security Products" Team label and sort them alphabetically	Olivier Gonzalez	2018-02-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|