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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'ide-open-all-mr-files' into 'master'	Filipa Lacerda	2018-11-20	2	-3/+7
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Open first 10 merge request files in IDE Closes #51635 See merge request gitlab-org/gitlab-ce!23234
\| *	Added a test for open merge request files	Phil Hughes	2018-11-20	1	-1/+1
\| \|
\| *	Open first 10 merge request files in IDE	Phil Hughes	2018-11-20	2	-2/+6
\| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51635
* \|	Merge branch '49565-ssh-push-mirroring' into 'master'	Robert Speicher	2018-11-20	20	-33/+590
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	SSH public-key authentication for push mirroring Closes #49565 See merge request gitlab-org/gitlab-ce!22982
\| * \|	SSH public-key authentication for push mirroring	Nick Thomas	2018-11-19	20	-33/+590
\| \| \|
* \| \|	Merge branch 'gt-externalize-app-views-projects-diffs' into 'master'	Phil Hughes	2018-11-20	14	-22/+20
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Externalize strings from `/app/views/projects/diffs` See merge request gitlab-org/gitlab-ce!23230
\| * \| \|	Externalize strings from `/app/views/projects/diffs`	George Tsiolis	2018-11-20	14	-22/+20
\| \| \| \|
* \| \| \|	Merge branch 'project_identicon_fix' into 'master'	Kushal Pandya	2018-11-20	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a project icon in home panel view, #51157. Closes #51157 See merge request gitlab-org/gitlab-ce!23166
\| * \| \| \|	Fix a project icon in home panel view, #51157.	Harry Kiselev	2018-11-17	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'gt-change-breadcrumb-title-for-contribution-charts' into 'master'	Kushal Pandya	2018-11-20	2	-3/+2
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change breadcrumb title for contribution charts Closes #44567 See merge request gitlab-org/gitlab-ce!23071
\| * \| \| \|	Change breadcrumb title for contribution charts	George Tsiolis	2018-11-14	2	-3/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch 'image-diff-size-fix' into 'master'	Filipa Lacerda	2018-11-20	4	-35/+12
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed the dimensions of image diffs Closes #54236 See merge request gitlab-org/gitlab-ce!23195
\| * \| \| \| \|	Fixed the dimensions of image diffs	Phil Hughes	2018-11-20	4	-35/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54236
* \| \| \| \| \|	Merge branch '40085-add-a-create_merge_request-quick-action' into 'master'	Douwe Maan	2018-11-20	4	-3/+40
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Add a `/create_merge_request` quick action" Closes #40085 See merge request gitlab-org/gitlab-ce!22485
\| * \| \| \| \| \|	Creates /create_merge_request quickaction40085-add-a-create_merge_request-quick-action	Jacopo	2018-11-14	4	-3/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	With this quick action the user can create a new MR starting from the current issue using as `source_branch` the given `branch name` and as `target_branch` the project default branch. If the `branch name` is omitted a name is automatically created starting from the issue title.
* \| \| \| \| \| \|	Merge branch '3062-improve-project-cache' into 'master'	Douwe Maan	2018-11-20	1	-2/+10
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change project cache key to depend on ID instead of full path Closes #42191 See merge request gitlab-org/gitlab-ce!23135
\| * \| \| \| \| \| \|	Add `wiki` extra namespace when repository is_wiki: true3062-improve-project-cache	Gabriel Mazetto	2018-11-16	1	-2/+10
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'gt-externalize-app-views-projects-environments' into 'master'	Kushal Pandya	2018-11-20	10	-34/+31
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Externalize strings from `/app/views/projects/environments` See merge request gitlab-org/gitlab-ce!23210
\| * \| \| \| \| \| \| \|	Externalize strings from `/app/views/projects/environments`	George Tsiolis	2018-11-19	10	-34/+31
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'gt-externalize-app-views-u2f' into 'master'	Kushal Pandya	2018-11-20	2	-16/+16
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Externalize strings from `/app/views/u2f` See merge request gitlab-org/gitlab-ce!23201
\| * \| \| \| \| \| \|	Externalize strings from `/app/views/u2f`	George Tsiolis	2018-11-20	2	-16/+16
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Steve Azzopardi	2018-11-20	1	-4/+11
\|\ \ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'security-2717-xss-username-autocomplete' into 'master'	Steve Azzopardi	2018-11-20	1	-4/+11
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[master] Escape user fullname while rendering autocomplete template to prevent XSS See merge request gitlab/gitlabhq!2605
\| \| * \| \| \| \| \| \|	Fix user name autocomplete XSS when name contains HTML	Kushal Pandya	2018-11-12	1	-4/+11
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '53290-incorrect-project-list-order-select-default-label' into ↵	Grzegorz Bizon	2018-11-20	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Incorrect project list order select default label" Closes #53290 See merge request gitlab-org/gitlab-ce!23058
\| * \| \| \| \| \| \| \| \|	Fix default sorting for subgroups and projects list53290-incorrect-project-list-order-select-default-label	Jacopo	2018-11-14	1	-1/+1
\| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Resolve "Further UI improvements to Profile "Overview" tab"	Martin Wortschack	2018-11-20	4	-84/+77
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Refine cursor positioning in Markdown Editor for wrap tags.	Johann Hubert Sonntagbauer	2018-11-20	1	-8/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'remove-unused-partial' into 'master'	Sean McGivern	2018-11-20	1	-5/+0
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused partial See merge request gitlab-org/gitlab-ce!23180
\| * \| \| \| \| \| \| \| \|	Remove unused partial	Heinrich Lee Yu	2018-11-19	1	-5/+0
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'rails5-active-record-class-value' into 'master'	Stan Hu	2018-11-19	5	-8/+8
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails5 deprecation: Passing a class as a value in an Active Record query is deprecated See merge request gitlab-org/gitlab-ce!23164
\| * \| \| \| \| \| \| \| \| \|	Rails5: Passing a class as a value in an Active Record query is deprecated	Jasper Maes	2018-11-17	5	-8/+8
\| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'gt-fix-typo-in-notebook-props' into 'master'	Fatih Acet	2018-11-19	3	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in js (props, specs) See merge request gitlab-org/gitlab-ce!23103
\| * \| \| \| \| \| \| \| \|	Fix typos in comments for js	George Tsiolis	2018-11-15	3	-3/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix typo in notebook props	George Tsiolis	2018-11-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '54046-fix-by-any-email-for-private-commit-emails' into 'master'	Douwe Maan	2018-11-19	2	-34/+40
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Match users better by their private commit email Closes #54046 See merge request gitlab-org/gitlab-ce!23080
\| * \| \| \| \| \| \| \| \| \|	Match users better by their private commit email	Nick Thomas	2018-11-19	2	-34/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Private commit emails were introduced in !22560, but some parts of GitLab were not updated to take account of them. This commit adds support in places that were missed.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'if-ee-726-smartcard_auth-ce_port' into 'master'	Douwe Maan	2018-11-19	4	-6/+28
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport of ee/8120: Smartcard authentication See merge request gitlab-org/gitlab-ce!23012
\| * \| \| \| \| \| \| \| \| \| \|	Backport of ee/8120: Smartcard authenticationif-ee-726-smartcard_auth-ce_port	Imre Farkas	2018-11-18	4	-6/+28
\| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'improve-variables-support' into 'master'	Sean McGivern	2018-11-19	3	-28/+35
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve variables support See merge request gitlab-org/gitlab-ce!23077
\| * \| \| \| \| \| \| \| \| \|	Improve variables supportimprove-variables-support	Kamil Trzciński	2018-11-19	3	-28/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This ensures that variables accept only string, alongside also improves kubernetes_namespace, improving validation and default value being set.
* \| \| \| \| \| \| \| \| \| \|	Add support for surfacing a link to the branch or tag name in push message…	Tony Castrogiovanni	2018-11-19	1	-28/+19
\| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'refactor-member-add-user-for-ee' into 'master'	Robert Speicher	2018-11-19	1	-5/+19
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor Member#add_user for GitLab EE See merge request gitlab-org/gitlab-ce!23119
\| * \| \| \| \| \| \| \| \|	Refactor Member#add_user for GitLab EErefactor-member-add-user-for-ee	Yorick Peterse	2018-11-15	1	-5/+19
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GitLab EE extends Member#add_user by adding some LDAP specific flags. Prior to these changes, the only way this could be done was by modifying Member#add_user in place. This could lead to merge conflicts whenever a developer wants to change this method. To resolve this issue, the logic that EE extends has been moved into a separate method with the appropriate arguments. This allows EE to extend the logic by prepending the method using an EE specific module.
* \| \| \| \| \| \| \| \|	Merge branch ↵46166-add-constraints-that-prevent-ci_builds-from-being-associated-with-null-pipeline-project	Sean McGivern	2018-11-19	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'54093-the-default_value_for-gem-doesn-t-handle-actioncontroller-parameters-correctly' into 'master' Replace the `default_value_for` gem with the `gitlab-default_value_with` gem which handles `ActionController::Parameters` correctly Closes #54093 See merge request gitlab-org/gitlab-ce!23114
\| * \| \| \| \| \| \| \| \|	Use gitlab-default_value_with Rails 5	Rémy Coutable	2018-11-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This forks live at https://github.com/gitlabhq/default_value_for/tree/69-fix-action_controller-parameters-handling and fixes an issue where default_value_for wouldn't handle `ActionController::Parameters` correctly with Rails 5. This fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/54093. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \|	Merge branch '52385-search-bar-for-dashboard-list' into 'master'	Sean McGivern	2018-11-19	16	-117/+72
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Search filter bar for issues dashboard list" Closes #53584, #52430, and #52385 See merge request gitlab-org/gitlab-ce!22641
\| * \| \| \| \| \| \| \| \| \|	Refactor whitelisting of filter params	Heinrich Lee Yu	2018-11-15	5	-55/+27
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Added wip param in filter path options	Heinrich Lee Yu	2018-11-13	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add helper tests	Heinrich Lee Yu	2018-11-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|