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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix specdm-escape-commit-message	Douwe Maan	2018-02-15	1	-1/+1
\|
*	Escape HTML entities in commit messages	Douwe Maan	2018-02-15	2	-7/+6
\|
*	Fixed user synced attributes metadata after removing current provider	Francisco Javier López	2018-02-15	3	-0/+45
\|
*	Merge branch 'jej/fix-slow-lfs-object-check' into 'master'	Douwe Maan	2018-02-15	1	-2/+17
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-2/+17
\| \|
* \|	Move spinach group milestones test to RSpec	Semyon Pupkov	2018-02-15	1	-37/+114
\| \|
* \|	Merge branch 'group-search-members-rspec' into 'master'	Rémy Coutable	2018-02-15	1	-0/+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	1	-0/+29
\| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* \| \|	Merge branch '35530-teleporting-emoji-fix' into 'master'	Fatih Acet	2018-02-15	1	-1/+12
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix teleporting emoji (MR description instead of comment) Closes #35530 See merge request gitlab-org/gitlab-ce!17100
\| * \| \|	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	1	-0/+9
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+9
\| \| \| \|
* \| \| \|	Merge branch 'mc/fix/project-variables-scope' into 'master'	Kamil Trzciński	2018-02-14	3	-2/+70
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Project variables validate without any scopes disregarding environment_scope" Closes #43191 See merge request gitlab-org/gitlab-ce!17086
\| * \| \| \|	Improve validation message and add changelogmc/fix/project-variables-scope	Kamil Trzciński	2018-02-14	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Add more information in variable_duplicates validator error message	Matija Čupić	2018-02-13	2	-3/+3
\| \| \| \| \|
\| * \| \| \|	Add specs for VariableDuplicates validator	Matija Čupić	2018-02-13	1	-0/+67
\| \| \| \| \|
\| * \| \| \|	Extend variable JSON Schema with optional environment_scope	Matija Čupić	2018-02-13	1	-1/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fl-mr-widget-4' into 'master'	Tim Zallmann	2018-02-14	2	-21/+35
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-21/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds i18n Improves test cases
* \| \| \| \| \|	Merge branch '41722-track-gcp-billing-enabled-project-changes' into 'master'	Kamil Trzciński	2018-02-14	2	-7/+62
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-4/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix GCP cluster feature spec	Matija Čupić	2018-02-12	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Refactor CheckGcpProjectBillingWorker	Matija Čupić	2018-02-12	1	-12/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Use Prometheus counter instead of redis	Matija Čupić	2018-02-12	1	-9/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	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
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch ↵	Kamil Trzciński	2018-02-14	1	-0/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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
\| * \| \| \| \| \| \|	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	1	-0/+5
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(Fixes #39885)
* \| \| \| \| \| \|	Merge branch ↵	Rémy Coutable	2018-02-14	1	-117/+55
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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	1	-117/+55
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 '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 'mk-fix-pg-undefined-table-ci-errors' into 'master'	Rémy Coutable	2018-02-14	4	-29/+10
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-29/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-14/+50
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
\| * \| \| \| \| \| \| \| \| \|	Remove generic #avatar_icon helper.	Andreas Brandl	2018-02-13	1	-28/+0
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Explicit use of avatar_icon_* calls depending on situation.	Andreas Brandl	2018-02-13	1	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 more specific #avatar_icon_for_user.	Andreas Brandl	2018-02-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When we don't use the original `ApplicationHelper#avatar_icon` anymore, we can just remove it (and its specs). Closes #42800.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'expired-ci-artifacts' into 'master'	Grzegorz Bizon	2018-02-14	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change SQL for expired artifacts to use new ci_job_artifacts.expire_at See merge request gitlab-org/gitlab-ce!16578
\| * \| \| \| \| \| \| \| \| \| \|	Add indexes and change SQL for expired artifacts to deal with artifacts ↵	Greg Stark	2018-02-08	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	migration efficiently Artifacts are in the middle of being migrated from ci_builds to ci_job_artifacts. The expiration date is currently visible in both of these tables and the test for whether an expired artifact is present for a job is complex as it requires checking both the of the tables. Add two new indexes, one on ci_builds.artifacts_expire_at and one on ci_job_artifacts.expire_at to enable finding expired artifacts efficiently. And until the migration is finished, replace the SQL for finding expired and non-expired artifacts with a hand-crafted UNION ALL based query instead of using OR. This overcomes a database optimizer limitation that prevents it from using these indexes. When the migration is finished the next version should remove this query and replace it with a much simpler query on just ci_job_artifacts. See https://gitlab.com/gitlab-org/gitlab-ce/issues/42561 for followup.
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix/template-project-visibility' into 'master'	Douwe Maan	2018-02-14	1	-2/+6
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Respect description and visibility when creating project from template Closes #42601 See merge request gitlab-org/gitlab-ce!16820
\| * \| \| \| \| \| \| \| \| \| \| \|	Add description, visibility to CreateFromTemplateService spec	George Tsiolis	2018-02-14	1	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Remove notification settings for groups and projects you were ↵	🙈 jacopo beschi 🙉	2018-02-14	1	-6/+50
\| \|_\|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	previously a member of"
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'feature/include-custom-attributes-in-api' into 'master'	Douwe Maan	2018-02-14	1	-37/+121
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow including custom attributes in API responses See merge request gitlab-org/gitlab-ce!16526
\| * \| \| \| \| \| \| \| \| \| \|	Allow including custom attributes in API responses	Markus Koller	2018-02-08	1	-37/+121
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '42934-search-api-fix' into 'master'	Sean McGivern	2018-02-14	4	-6/+12
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add information about projects when searching in wiki_blobs, blobs, commits scopes Closes #42934 See merge request gitlab-org/gitlab-ce!17095
\| * \| \| \| \| \| \| \| \| \| \|	API - Include project in commits&blobs search results	Jarka Kadlecová	2018-02-14	4	-6/+12
\| \| \|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch '37050-ext-issue-tracker' into 'master'	Sean McGivern	2018-02-14	2	-9/+114
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display a link to external issue tracker when enabled Closes #37050 See merge request gitlab-org/gitlab-ce!17030