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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Cache document query41120-performance-bar-auto-scroll	Filipa Lacerda	2018-01-02	1	-2/+3
\|
*	Merge branch 'master' into 41120-performance-bar-auto-scroll	Filipa Lacerda	2018-01-02	960	-7707/+9056
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (120 commits) Update CHANGELOG.md for 10.3.3 Fix user membership destroy relation Use heredoc so it's more clear Put all menus under menu module Introduce common project settings and just put Introduce Factory::Resource::DeployKey Introduce expand_deploy_keys Introduce Menu::Side Add documents for GitLab utilities Clears visual token on second backspace Update prometheus gem to version that adds inf+ bucket in accordance with Prometheus docs. Add breadcrumbs to User Settings sub-views Rename asset sync related AWS variables Allow logged in user to change his password Fix 404 error after a user edits an issue description and solves the reCAPTCHA Fix links to old commits in merge requests Typos correction on the advise of @smcgivern Documenting that resolved JIRA tickets are not automatically transitioned Forking a project to a namespace with lower visibility. Keep typographic hierarchy in User Settings ...
\| *	Merge branch 'fix/activity-inline-event-line-height' into 'master'	Annabel Dunstone Gray	2018-01-02	2	-1/+11
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix activity inline event line height on mobile Closes #38778 See merge request gitlab-org/gitlab-ce!16121
\| \| *	Fix activity inline event line height on mobile	George Tsiolis	2017-12-28	2	-1/+11
\| \| \|
\| * \|	Merge branch ↵	Robert Speicher	2018-01-02	1	-1/+3
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'ce-4135-remove-ee-specific-code-from-post-api-v4-projects-id-members' into 'master' Backport part of EE's "Remove EE-specific code from `POST /api/v4/projects/:id/members`" See merge request gitlab-org/gitlab-ce!16051
\| \| * \|	Backport a change made in EEce-4135-remove-ee-specific-code-from-post-api-v4-projects-id-members	Rémy Coutable	2017-12-21	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \|	Merge branch 'rd-fix-reset-password-while-logged-in' into 'master'	Robert Speicher	2018-01-02	2	-0/+21
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow logged in user to change his password Closes gitlab-ee#3482 See merge request gitlab-org/gitlab-ce!16169
\| \| * \| \|	Allow logged in user to change his passwordrd-fix-reset-password-while-logged-in	Rubén Dávila	2017-12-31	2	-0/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Users were unable to change their password through the "Reset password" link that was sent to their email if they were logged in. This is due to a default controller filter from Devise that requires the user to not be logged in in order to use this link.
\| * \| \| \|	Merge branch 'docs-gitlab-utilities' into 'master'	Robert Speicher	2018-01-02	2	-0/+93
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add documents for GitLab utilities See merge request gitlab-org/gitlab-ce!16161
\| \| * \| \| \|	Add documents for GitLab utilitiesdocs-gitlab-utilities	Lin Jen-Shin	2018-01-02	2	-0/+93
\| \| \| \| \| \|
\| * \| \| \| \|	Update CHANGELOG.md for 10.3.3	Tiago Botelho	2018-01-02	4	-15/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \|	Merge branch 'fj-40053-error-500-members-list' into 'master'	Douwe Maan	2018-01-02	9	-4/+164
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix user membership destroy relation Closes #40053 See merge request gitlab-org/gitlab-ce!15970
\| \| * \| \| \| \|	Fix user membership destroy relation	Francisco Javier López	2018-01-02	9	-4/+164
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'qa-add-deploy-key' into 'master'	Grzegorz Bizon	2018-01-02	15	-13/+178
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	QA: Add a scenario for adding a deploy key See merge request gitlab-org/gitlab-ce!16096
\| \| * \| \| \| \| \|	Use heredoc so it's more clear	Lin Jen-Shin	2018-01-02	1	-6/+8
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Put all menus under menu module	Lin Jen-Shin	2018-01-02	7	-12/+12
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Introduce common project settings and just put	Lin Jen-Shin	2018-01-02	4	-16/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	everything in the scenario without a before block.
\| \| * \| \| \| \| \|	Introduce Factory::Resource::DeployKey	Lin Jen-Shin	2018-01-02	3	-16/+35
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Introduce expand_deploy_keys	Lin Jen-Shin	2018-01-02	3	-18/+26
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Introduce Menu::Side	Lin Jen-Shin	2018-01-02	4	-21/+34
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Just add a new class to locate the expand button	Lin Jen-Shin	2017-12-28	2	-6/+2
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Update descriptions and names based on feedback	Lin Jen-Shin	2017-12-28	1	-7/+7
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Rename DeployKey to DeployKeys	Lin Jen-Shin	2017-12-28	3	-4/+4
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	QA: Add a scenario for adding a deploy key	Lin Jen-Shin	2017-12-28	6	-0/+119
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'fix-volume-backup' into 'master'	Douwe Maan	2018-01-02	2	-3/+8
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ignore "lost+found" folder during backup on a volume Closes #22672 and #17574 See merge request gitlab-org/gitlab-ce!16036
\| \| * \| \| \| \| \| \|	Add changelog	julien MILLAU	2017-12-20	1	-0/+5
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Ignore "lost+found" folder during backup on a volume	julien MILLAU	2017-12-20	1	-3/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'pawel/update-prometheus-gem-to-improve-handling-of-inf-bucket' ↵	Douwe Maan	2018-01-02	2	-3/+3
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Update prometheus gem to version that publishes +Inf bucket in accordance with Prometheus docs. See merge request gitlab-org/gitlab-ce!16175
\| \| * \| \| \| \| \| \| \|	Update prometheus gem to version that adds inf+ bucket in accordance with ↵	Pawel Chojnacki	2018-01-02	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prometheus docs.
\| * \| \| \| \| \| \| \| \|	Merge branch 'bvl-fork-public-project-to-private-namespace' into 'master'	Douwe Maan	2018-01-02	5	-12/+63
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Forking a project to a namespace with lower visibility Closes #40022 See merge request gitlab-org/gitlab-ce!16050
\| \| * \| \| \| \| \| \| \|	Forking a project to a namespace with lower visibility.bvl-fork-public-project-to-private-namespace	Bob Van Landuyt	2017-12-29	5	-12/+63
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In this case the project will get the minimum between both visibilities. If that visibility is restricted, then a lower level will be picked.
\| * \| \| \| \| \| \| \| \|	Merge branch '38596-fix-backspace-visual-token-clearing' into 'master'	LUKE BENNETT	2018-01-02	4	-15/+51
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clears visual token on second backspace Closes #38596 See merge request gitlab-org/gitlab-ce!15348
\| \| * \| \| \| \| \| \| \|	Clears visual token on second backspace	Martin Wortschack	2018-01-02	4	-15/+51
\| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	Merge branch ↵	Sean McGivern	2018-01-02	3	-4/+34
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'39289-local-schema-rb-automatically-reverts-datetime-to-datetime_with_timezone-after-migrations' into 'master' Prevent schema.rb reverting from datetime_with_timezone to datetime Closes #39289 See merge request gitlab-org/gitlab-ce!14956
\| \| * \| \| \| \| \| \| \|	Prevent schema.rb reverting from datetime_with_timezone to datetime39289-local-schema-rb-automatically-reverts-datetime-to-datetime_with_timezone-after-migrations	James Edwards-Jones	2017-12-07	3	-4/+34
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch '40780-choose-file' into 'master'	Tim Zallmann	2018-01-02	5	-30/+28
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Rename "Browse file" inputs to "Choose file"" Closes #40780 See merge request gitlab-org/gitlab-ce!16092
\| \| * \| \| \| \| \| \| \|	Uniform style between all upload forms40780-choose-file	Filipa Lacerda	2017-12-22	4	-30/+23
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Update Browse file to Choose file in all occurences	Filipa Lacerda	2017-12-21	3	-2/+7
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch '40274-user-settings-breadcrumbs' into 'master'	Sean McGivern	2018-01-02	5	-0/+18
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix breadcrumbs in User Settings Closes #40274 See merge request gitlab-org/gitlab-ce!16172
\| \| * \| \| \| \| \| \| \| \|	Add breadcrumbs to User Settings sub-views	Rob Watson	2018-01-01	5	-0/+18
\| \| \| \|_\|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #40274
\| * \| \| \| \| \| \| \| \|	Merge branch 'change-asset-sync-env-variables' into 'master'	Marin Jankovski	2018-01-02	1	-2/+2
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename asset sync related AWS variables See merge request gitlab-org/gitlab-ce!16154
\| \| * \| \| \| \| \| \| \| \|	Rename asset sync related AWS variableschange-asset-sync-env-variables	Balasankar "Balu" C	2018-01-01	1	-2/+2
\| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-spam-update-404' into 'master'	Sean McGivern	2018-01-01	2	-1/+7
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix 404 error after a user edits an issue description and solves the reCAPTCHA Closes #41445 See merge request gitlab-org/gitlab-ce!16167
\| \| * \| \| \| \| \| \| \| \|	Fix 404 error after a user edits an issue description and solves the reCAPTCHAsh-fix-spam-update-404	Stan Hu	2017-12-30	2	-1/+7
\| \| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When editing an issue, use the PUT method instead of POST to avoid a 404 after solving the reCAPTCHA. Closes #41445
\| * \| \| \| \| \| \| \| \|	Merge branch 'jira-doc-resolution' into 'master'	Sean McGivern	2018-01-01	1	-0/+5
\| \|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Documenting that resolved JIRA tickets are not automatically transitioned See merge request gitlab-org/gitlab-ce!16162
\| \| * \| \| \| \| \| \| \|	Typos correction on the advise of @smcgivern	Edouard	2017-12-29	1	-4/+4
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Documenting that resolved JIRA tickets are not automatically transitioned	Edouard	2017-12-29	1	-0/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'fix/profile-settings-content-width' into 'master'	Robert Speicher	2017-12-29	2	-0/+6
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adjust content width for User Settings, GPG Keys See merge request gitlab-org/gitlab-ce!16093
\| \| * \| \| \| \| \| \| \| \|	Adjust content width for User Settings, GPG Keys	George Tsiolis	2017-12-28	2	-0/+6
\| \| \| \|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Limit content width for fixed layout
\| * \| \| \| \| \| \| \| \|	Merge branch 'fix/profile-settings-sidebar-heading' into 'master'	Robert Speicher	2017-12-29	3	-4/+9
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Keep typographic hierarchy in User Settings See merge request gitlab-org/gitlab-ce!16090