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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add instance-wide domain info43231-document-the-instance-level-auto-devops-domain-option	Matija Čupić	2018-02-14	1	-1/+3
\|
*	Merge branch 'fl-mr-widget-4' into 'master'	Tim Zallmann	2018-02-14	7	-60/+86
\|\ \| \| \| \| \| \| \| \|	Moves mr widget components into vue files See merge request gitlab-org/gitlab-ce!17110
\| *	Moves mr widget components into vue filesfl-mr-widget-4	Filipa Lacerda	2018-02-13	7	-60/+86
\| \| \| \| \| \| \| \| \| \|	Adds i18n Improves test cases
* \|	Merge branch 'update-namespaces-api-docs' into 'master'	Achilleas Pipinellis	2018-02-14	1	-5/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Make parent_id field integer/null value instead of string See merge request gitlab-org/gitlab-ce!17085
\| * \|	Make parent_id field integer/null value instead of stringupdate-namespaces-api-docs	Tomasz Maczukin	2018-02-13	1	-5/+5
\| \| \|
* \| \|	Merge branch 'qa/rs-suppress-git-output' into 'master'	Rémy Coutable	2018-02-14	2	-3/+17
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Suppress git output when running QA as a non-default user Closes gitlab-qa#157 See merge request gitlab-org/gitlab-ce!17006
\| * \| \|	Suppress git output when running QA as a non-default user	Robert Speicher	2018-02-14	1	-2/+12
\| \| \| \|
\| * \| \|	Add Runtime::User.default_name	Robert Speicher	2018-02-14	1	-1/+5
\|/ / /
* \| \|	Merge branch '41722-track-gcp-billing-enabled-project-changes' into 'master'	Kamil Trzciński	2018-02-14	4	-23/+109
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Track GCP Billing enabled project changes" Closes #41722 See merge request gitlab-org/gitlab-ce!16962
\| * \| \|	Count all billing_state transitions with labels41722-track-gcp-billing-enabled-project-changes	Matija Čupić	2018-02-12	2	-19/+16
\| \| \| \|
\| * \| \|	Fix GCP cluster feature spec	Matija Čupić	2018-02-12	1	-2/+2
\| \| \| \|
\| * \| \|	Log billing state changes in CheckGcpProjectBillingWorker	Matija Čupić	2018-02-12	1	-0/+13
\| \| \| \|
\| * \| \|	Refactor CheckGcpProjectBillingWorker	Matija Čupić	2018-02-12	3	-41/+34
\| \| \| \|
\| * \| \|	Use Prometheus counter instead of redis	Matija Čupić	2018-02-12	2	-14/+9
\| \| \| \|
\| * \| \|	Add missing newline in CheckGcpProjectBillingWorker spec	Matija Čupić	2018-02-12	1	-0/+1
\| \| \| \|
\| * \| \|	Add specs for billing_enabled change counter	Matija Čupić	2018-02-12	1	-0/+66
\| \| \| \|
\| * \| \|	Implement billing_enabled change counter	Matija Čupić	2018-02-12	1	-0/+21
\| \| \| \|
* \| \| \|	Merge branch ↵	Kamil Trzciński	2018-02-14	3	-2/+16
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'39885-ensure-users-cannot-create-environments-with-leading-slashes' into 'master' Resolve "Environment with starting slash in name causes error" Closes #39885 See merge request gitlab-org/gitlab-ce!17071
\| * \| \| \|	Update issue-39885.yml	Kamil Trzciński	2018-02-14	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Ensure users can't create environments with leading or trailing slashes ↵39885-ensure-users-cannot-create-environments-with-leading-slashes	Dylan Griffith	2018-02-13	3	-2/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(Fixes #39885)
* \| \| \| \|	Merge branch ↵	Rémy Coutable	2018-02-14	3	-120/+58
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'43240-external-tracker-issues-don-t-have-the-correct-closing-text-appended-to-mrs' into 'master' Resolve "External tracker issues don't have the correct closing text appended to MRs" Closes #1 et #43240 See merge request gitlab-org/gitlab-ce!17109
\| * \| \| \| \|	Fix closing issues text added to MRs for external issue trackers	Sean McGivern	2018-02-14	3	-120/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Before, this would: 1. Not use the correct reference for non-JIRA external trackers. 2. Append 'Closes ' if an external tracker was enabled, but no issue matched the branch name.
* \| \| \| \| \|	Merge branch 'process-update' into 'master'	Marin Jankovski	2018-02-14	1	-5/+8
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Process document with changes to the exception request process. See merge request gitlab-org/gitlab-ce!17118
\| * \| \| \| \| \|	Update Process document with changes to the exception request process.	Marin Jankovski	2018-02-14	1	-5/+8
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'feature-flags-for-user-apps' into 'master'	Achilleas Pipinellis	2018-02-14	1	-1/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	clarify what kind of feature flags we support See merge request gitlab-org/gitlab-ce!17113
\| * \| \| \| \| \| \|	clarify what kind of feature flags we support	Job van der Voort	2018-02-14	1	-1/+6
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'ce-port-ee-f531c07299' into 'master'	Sean McGivern	2018-02-14	1	-8/+7
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a too strict array-matching expectation See merge request gitlab-org/gitlab-ce!17093
\| * \| \| \| \| \| \| \|	Fix a too strict array-matching expectation	Rémy Coutable	2018-02-14	1	-8/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \|	Merge branch 'jramsay-i18n-proofreader-process-docs' into 'master'	Douwe Maan	2018-02-14	2	-31/+54
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add clearer proofreader process to docs See merge request gitlab-org/gitlab-ce!17103
\| * \| \| \| \| \| \| \|	Fix punctuation and address feedbackjramsay-i18n-proofreader-process-docs	James Ramsay	2018-02-13	2	-6/+8
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add clearer proofreader process to docs	James Ramsay	2018-02-13	2	-27/+48
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'mk-fix-pg-undefined-table-ci-errors' into 'master'	Rémy Coutable	2018-02-14	6	-32/+15
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Build Is Red: Admin > Users > Impersonation Tokens token creation allows creation of a token" Closes gitlab-ee#4914 See merge request gitlab-org/gitlab-ce!17102
\| * \| \| \| \| \| \| \| \|	Avoid dropping tables in test	Michael Kozono	2018-02-14	6	-32/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	And use :migration tag to use deletion strategy, and to avoid caching tables, and to lock into a particular schema. Attempting to fix intermittent spec errors `PG::UndefinedTable: ERROR: relation "public.untracked_files_for_uploads" does not exist`.
* \| \| \| \| \| \| \| \| \|	Merge branch '42800-change-usage-of-avatar_icon' into 'master'	Yorick Peterse	2018-02-14	35	-59/+127
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change all occurrences of ApplicationHelper#avatar_icon to use a User object where possible Closes #42800 See merge request gitlab-org/gitlab-ce!16976
\| * \| \| \| \| \| \| \| \| \|	Extract repeated logic into #avatar_icon_for.42800-change-usage-of-avatar_icon	Andreas Brandl	2018-02-13	4	-16/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This essentially allows to pass both user and email, so that we can either prefer the user to retrieve the avatar or (if user is not present) fall back to the email lookup.
\| * \| \| \| \| \| \| \| \| \|	Add changelog.	Andreas Brandl	2018-02-13	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #42800.
\| * \| \| \| \| \| \| \| \| \|	Always eagerly load a note's author.	Andreas Brandl	2018-02-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Always eagerly load an issue's author.	Andreas Brandl	2018-02-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rather radical but avoids n+1 queries in the rather common case we want to include information about the author.
\| * \| \| \| \| \| \| \| \| \|	Extract method to improve readability.	Andreas Brandl	2018-02-13	1	-7/+11
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Remove generic #avatar_icon helper.	Andreas Brandl	2018-02-13	2	-36/+0
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Explicit use of avatar_icon_* calls depending on situation.	Andreas Brandl	2018-02-13	4	-13/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We want to drop the generic #avatar_icon helper that supports both an email and a user object being passed in. Instead, we want to explicitly use the #avatar_icon_for_user and #avatar_icon_for_email helpers depending on what we have at hand. This allows us to avoid unnecessary database queries (e.g. call User.find_by_any_email if we already have the user). In situations like here, this makes it less convenient to use.
\| * \| \| \| \| \| \| \| \| \|	Use avatar_icon_for_email for commits.	Andreas Brandl	2018-02-13	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We need to keep the email lookup as we want to fall back to displaying the gravatar result for a given email if the user does not exist.
\| * \| \| \| \| \| \| \| \| \|	Retrieve project creator's avatar by creator, not creator#email.	Andreas Brandl	2018-02-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Retrieve namespace owner's avatar by owner, not owner#email.	Andreas Brandl	2018-02-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Retrieve issue author's avatar by user, not user#email.	Andreas Brandl	2018-02-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Use more specific #avatar_icon_for_email.	Andreas Brandl	2018-02-13	3	-3/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Use more specific #avatar_icon_for_user.	Andreas Brandl	2018-02-13	21	-23/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Whenever we already deal with a User object, let's use the more specific method avatar_icon_for_user.
\| * \| \| \| \| \| \| \| \| \|	Refactor and split ApplicationHelper#avatar_icon.	Andreas Brandl	2018-02-13	2	-7/+65
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When we don't use the original `ApplicationHelper#avatar_icon` anymore, we can just remove it (and its specs). Closes #42800.
* \| \| \| \| \| \| \| \| \| \|	Merge branch '38135-remove-ignore-column-from-events' into 'master'	Yorick Peterse	2018-02-14	1	-4/+0
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove ignore_column :data from Event Closes #38135 See merge request gitlab-org/gitlab-ce!17094
\| * \| \| \| \| \| \| \| \| \| \|	Remove ignore_column from Events#data.38135-remove-ignore-column-from-events	Andreas Brandl	2018-02-13	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #38135.