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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove allow_n_plus_1 block from DeleteMergedBranchesServicefix/remove-allow-n-plus-1-from-delete-merged-branches-service	Ahmad Sherif	2018-02-12	1	-11/+7
\| \| \| \| \|	Fixes #37438 Fixes gitaly#999
*	Merge branch '40994-fix-ee-ce-compatible-test' into 'master'	Kamil Trzciński	2018-02-12	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Make GITLAB_FEATURES in build_spec compatible with EE Closes #40994 See merge request gitlab-org/gitlab-ce!17023
\| *	Make GITLAB_FEATURES in build_spec compatible with EE40994-fix-ee-ce-compatible-test	Dylan Griffith	2018-02-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	Right now this fails in EE since the EE codebase defaults to having a starter license which means there are features in this value. This seems to be incompatible with the statement that tests should behave the same in CE as EE but I think that since there is a before on all EE specs creating a starter license it unfortunately does not behave that way. This is needed for #40994 and fixes the failing specs in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4393
* \|	Merge branch '4826-geo-wikisyncservice-attempts-to-sync-projects' into 'master'	Nick Thomas	2018-02-12	4	-2/+76
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Create an empty wiki when there is no wiki in the gitlab export bundle See merge request gitlab-org/gitlab-ce!17010
\| * \|	Create an empty wiki when there is no wiki in the gitlab export bundle	Valery Sizov	2018-02-12	4	-2/+76
\|/ /
* \|	Merge branch 'group-label-page-breadcrumb' into 'master'	Phil Hughes	2018-02-12	2	-1/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix breadcrumb on labels page for groups Closes #42909 See merge request gitlab-org/gitlab-ce!17045
\| * \|	Revert and remove header_title line from labels issue	Onuwa Nnachi Isaac	2018-02-12	3	-2/+6
\| \| \|
\| * \|	Fix breadcrumb on labels page for groups	Onuwa Nnachi Isaac	2018-02-09	2	-2/+2
\| \| \|
* \| \|	Merge branch 'diff-and-gpg-badges-ajax-refactor' into 'master'	Phil Hughes	2018-02-12	3	-28/+46
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replaced use of $.get with axios.get and updated tests See merge request gitlab-org/gitlab-ce!16989
\| * \| \|	Fixed bug with param configdiff-and-gpg-badges-ajax-refactor	Constance Okoghenun	2018-02-12	1	-1/+1
\| \| \| \|
\| * \| \|	changed params passed to from a string to an object	Constance Okoghenun	2018-02-12	1	-2/+3
\| \| \| \|
\| * \| \|	Fixed typo, updated test, and removed commented code	Constance Okoghenun	2018-02-08	3	-4/+3
\| \| \| \|
\| * \| \|	Replaced use of $.get with axios.get and updated tests	Constance Okoghenun	2018-02-08	3	-28/+46
\| \| \| \|
* \| \| \|	Merge branch 'bw-fix-autoload-issue' into 'master'	Rémy Coutable	2018-02-12	1	-0/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix issue with Gitlab::CurrentSettings and autoload/spring system Closes gitlab-ee#4842 See merge request gitlab-org/gitlab-ce!17037
\| * \| \| \|	make sure there is a dependency on Gitlab::CurrentSettings isbw-fix-autoload-issue	Brett Walker	2018-02-09	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes an issue where the Rails autoload system would throw various `Unable to autoload constant` errors (such as `Unable to autoload constant EE::ProjectsHelper`) when using the autoload system (such with `spring` or `reload!` in the rails console. This error was specifically ocurring in the EE code, however, it's seems reasonable to place the fix in CE as a general innoculation.
* \| \| \| \|	Merge branch 'refactor/move-issuable-time-tracker-vue-component' into 'master'	Filipa Lacerda	2018-02-12	4	-75/+85
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move IssuableTimeTracker vue component See merge request gitlab-org/gitlab-ce!16948
\| * \| \| \| \|	Move IssuableTimeTracker vue component	George Tsiolis	2018-02-12	4	-75/+85
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '42928-default-protected-variables-to-off' into 'master'	Filipa Lacerda	2018-02-12	4	-7/+7
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Default CI variables to unprotected Closes #42928 See merge request gitlab-org/gitlab-ce!17039
\| * \| \| \| \| \|	Default CI variables to unprotected42928-default-protected-variables-to-off	Eric Eastwood	2018-02-09	4	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ce/issues/42928
* \| \| \| \| \| \|	Merge branch 'npm-waitforimages' into 'master'	Tim Zallmann	2018-02-12	7	-149/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update jquery.waitforimages & use npm version See merge request gitlab-org/gitlab-ce!17004
\| * \| \| \| \| \| \|	Update jquery.waitforimages & use npm versionnpm-waitforimages	Phil Hughes	2018-02-08	7	-149/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	#39072
* \| \| \| \| \| \| \|	Merge branch 'sh-add-login-types-qa' into 'master'	Grzegorz Bizon	2018-02-12	5	-1/+50
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GitLab QA: Add GITLAB_USER_TYPE to support different login types (e.g. standard, LDAP) See merge request gitlab-org/gitlab-ce!17048
\| * \| \| \| \| \| \| \|	GitLab QA: Add GITLAB_USER_TYPE to support different login types (e.g. ↵sh-add-login-types-qa	Stan Hu	2018-02-11	5	-1/+50
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	standard, LDAP) GITLAB_USERNAME and GITLAB_PASSWORD may be specified for an LDAP login, but QA scenarios may need to know which type it is in order to log in successfully.
* \| \| \| \| \| \| \| \|	Merge branch '42922-environment-name' into 'master'	Phil Hughes	2018-02-12	3	-11/+29
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Add tooltip in enviroments names" Closes #42922 See merge request gitlab-org/gitlab-ce!17029
\| * \| \| \| \| \| \| \| \|	Adds tooltip for environment name42922-environment-name	Filipa Lacerda	2018-02-09	3	-11/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds CSS for child envrionments
* \| \| \| \| \| \| \| \| \|	Merge branch '42908-rename-scss-files-to-use-snake-case' into 'master'	Filipa Lacerda	2018-02-12	9	-8/+8
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename .scss files to use snake_case Closes #42908 See merge request gitlab-org/gitlab-ce!17022
\| * \| \| \| \| \| \| \| \| \|	Rename .scss files to use snake_case42908-rename-scss-files-to-use-snake-case	Eric Eastwood	2018-02-08	9	-8/+8
\| \| \|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ce/issues/42908
* \| \| \| \| \| \| \| \| \|	Merge branch '42937-search-api-fix' into 'master'	Grzegorz Bizon	2018-02-12	2	-4/+24
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API - fix searching in group/project specified by path Closes #42937 See merge request gitlab-org/gitlab-ce!17033
\| * \| \| \| \| \| \| \| \|	API - fix searching in group/project specified by path42937-search-api-fix	Jarka Kadlecová	2018-02-09	2	-4/+24
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix/encoding-to-unsupported-encodings' into 'master'	Robert Speicher	2018-02-09	2	-3/+8
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Return a warning string if we try to encode to unsupported encoding Closes gitlab-development-kit#321 See merge request gitlab-org/gitlab-ce!17038
\| * \| \| \| \| \| \| \| \| \|	Return a warning string if we try to encode to unsupported encoding	Ahmad Sherif	2018-02-09	2	-3/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes gitlab-development-kit#321
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'winh-remove-confirmation_input' into 'master'	Clement Ho	2018-02-09	2	-125/+0
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove confirmation_input component See merge request gitlab-org/gitlab-ce!17046
\| * \| \| \| \| \| \| \| \| \| \|	Remove confirmation_input	Winnie Hellmann	2018-02-09	2	-125/+0
\| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'rs-pick-security' into 'master'	Stan Hu	2018-02-09	30	-130/+651
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pick 10.4.3 fixes into master See merge request gitlab-org/gitlab-ce!17040
\| * \| \| \| \| \| \| \| \| \|	Resolve failures in GitHub-ish import controller specsrs-pick-security	Robert Speicher	2018-02-09	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Remove changelogs for already-released security patches	Robert Speicher	2018-02-09	4	-20/+0
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'mc/bug/38984-wildcard-protected-tags' into 'security-10-4'	Kamil Trzciński	2018-02-09	5	-9/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix using wildcards in protected tags to expose protected variables
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'fix/gh-namespace-issue' into 'security-10-4'	James Lopez	2018-02-09	6	-29/+87
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[10.4] Fix GH namespace security issue
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'security-10-4-todo-api-reveals-sensitive-information' into ↵	Robert Speicher	2018-02-09	5	-2/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'security-10-4' Restrict Todo API mark_as_done endpoint to the user's todos only
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'fix-mermaid-xss' into 'security-10-4'	Douwe Maan	2018-02-09	9	-15/+130
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[10.4] Fix stored XSS in code blocks
\| * \| \| \| \| \| \| \| \| \|	Merge branch ↵	Douwe Maan	2018-02-09	9	-75/+410
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'security-10-4-25223-snippets-finder-doesnt-obey-feature-visibility' into 'security-10-4' [Port for security-10-4]: Makes SnippetFinder ensure feature visibility
* \| \| \| \| \| \| \| \| \|	Merge branch 'doc-improve-side-effects-block' into 'master'	Phil Hughes	2018-02-09	1	-2/+31
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve docs about allowing some side effects on the constructor See merge request gitlab-org/gitlab-ce!17027
\| * \| \| \| \| \| \| \| \| \|	Fix english in style_guide_js.mddoc-improve-side-effects-block	Filipa Lacerda	2018-02-09	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Improve docs about allowing some side effects on the constructor	Filipa Lacerda	2018-02-09	1	-2/+31
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'sh-add-docker-build-qa' into 'master'	Grzegorz Bizon	2018-02-09	1	-0/+10
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation on how to build a QA Docker image See merge request gitlab-org/gitlab-ce!17036
\| * \| \| \| \| \| \| \| \| \|	Add documentation on how to build a QA Docker imagesh-add-docker-build-qa	Stan Hu	2018-02-09	1	-0/+10
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'qa/gb/do-not-require-test-network-in-pipeline-tests' into 'master'	Robert Speicher	2018-02-09	2	-2/+12
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not attach runner to a non-exsiting network in QA Closes gitlab-qa#180 See merge request gitlab-org/gitlab-ce!17028
\| * \| \| \| \| \| \| \| \| \|	Do not attach runner to a non-exsiting network in QAqa/gb/do-not-require-test-network-in-pipeline-tests	Grzegorz Bizon	2018-02-09	2	-2/+12
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'qa-allow-setting-sandbox-group' into 'master'	Grzegorz Bizon	2018-02-09	4	-3/+23
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow using a different sandbox group for QA See merge request gitlab-org/gitlab-ce!17000
\| * \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2018-02-09	107	-559/+2399
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	qa-allow-setting-sandbox-group * upstream/master: (27 commits) Set initial password for instance in LDAP QA test Backport EE changes to some hashed storage documentation to CE Remove allow_n_plus_1 from Git::Repository#branches_filter Bumps Gitlab Shell version to 6.0.3 Make resetting column information overridable in EE Added 'clear' button to ci lint editor Issues and merge requests in subgroups docs Update docs labels CE Refactored merge_requests/show path in dispatcher.js wording don't check against a hardcoded user name 10.5 Update the dependencies license list 10.5 Update the .gitignore, .gitlab-ci.yml, and Dockerfile templates Create update guide for 10.5 Update 10.5 source install guide Add docs for MR link in commit page Add groups to OpenID Connect claims Replaced $.get with axois.get Memoize MergeRequest#rebase_in_progress? to prevent N+1 queries in Gitaly [docs] Info rescheduling background migrations ...