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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'remove-unnecessary-validate-project' into 'master'	Kamil Trzciński	2018-02-20	2	-3/+3
\|\ \| \| \| \| \| \| \| \|	Remove unecessary validate: true from belongs_to :project See merge request gitlab-org/gitlab-ce!17166
\| *	Remove unecessary validate: true from belongs_to :projectremove-unnecessary-validate-project	Dylan Griffith	2018-02-20	2	-3/+3
\| \| \| \| \| \| \| \|	This does not seem to serve any clear purpose and causes other issues (see https://gitlab.com/gitlab-org/gitlab-ce/issues/43196#note_59275652)
* \|	Merge branch '32564-fix-double-system-closing-notes' into 'master'	Sean McGivern	2018-02-19	1	-4/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Double closing system notes when closing issue with Merge Request" Closes #32546 and #32564 See merge request gitlab-org/gitlab-ce!17035
\| * \|	stop ProcessCommitWorker from processing MR merge commit	Micaël Bergeron	2018-02-16	1	-4/+4
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	When a merge request is merged, it creates a commit with the description of the MR, which may contain references and issue closing references. As this will be handled in the PostMergeService anyways, let's ignore merge commit generated from a MR.
* \|	Merge branch 'sh-guard-read-only-user-updates' into 'master'	Nick Thomas	2018-02-19	1	-0/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't attempt to update user tracked fields if database is in read-only Closes gitlab-ee#4972 See merge request gitlab-org/gitlab-ce!17200
\| * \|	Don't attempt to update user tracked fields if database is in read-onlysh-guard-read-only-user-updates	Stan Hu	2018-02-17	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	With Geo, attempting to view an endpoint with a user could result in an Error 500 since Devise attempts to update the last sign-in IP and other details. Closes gitlab-org/gitlab-ee#4972
* \| \|	Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' ↵	Douwe Maan	2018-02-19	1	-4/+3
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Sanitize extra blank spaces used when uploading a SSH key Closes #40552 See merge request gitlab-org/gitlab-ce!17138
\| * \|	Revert "Merge branch ↵	Rubén Dávila	2018-02-15	1	-4/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'rd-43185-revert-sanitize-extra-blank-spaces-used-when-uploading-a-ssh-key' into 'master'" This reverts commit e607fd796657afd214b8f25201919d3e33b3f35f.
* \| \|	Merge branch 'revert-215dff76' into 'master'	Ian Baum	2018-02-17	1	-33/+4
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'expired-ci-artifacts' into 'master'" See merge request gitlab-org/gitlab-ce!17193
\| * \| \|	Revert "Merge branch 'expired-ci-artifacts' into 'master'"	Stan Hu	2018-02-16	1	-33/+4
\| \| \|/ \| \|/\| \| \| \|	This reverts merge request !16578
* \| \|	Don't cache a nil repository root ref to prevent caching issuesdm-dont-cache-nil-root-ref	Douwe Maan	2018-02-16	1	-6/+2
\|/ /
* \|	Merge branch 'change/strip-whitespace-from-username-input#42637' into 'master'	Rémy Coutable	2018-02-15	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Trim whitespace from input in the username/email form field Closes #42637 See merge request gitlab-org/gitlab-ce!17020
\| * \|	Strip whitespace from username/login value for user lookup	Peter Lauck	2018-02-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As per the discussion with @psimyn, this change does not affect the frontend, so user input will not be validated on the signin screen. Instead, the value sent to the backend has leading and trailing whitespace stripped before looking up the user with find_by. Closes #42637
* \| \|	Merge branch 'sh-fix-error-500-licensee' into 'master'	Douwe Maan	2018-02-15	1	-1/+9
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Error 500s loading repositories with inconsistent HEAD Closes #43268 See merge request gitlab-org/gitlab-ce!17128
\| * \| \|	Remove head_commit callsh-fix-error-500-licensee	Stan Hu	2018-02-14	1	-1/+0
\| \| \| \|
\| * \| \|	Simplify license generator error handling	Stan Hu	2018-02-14	1	-1/+1
\| \| \| \|
\| * \| \|	Remove use of catching Rugged exceptions	Stan Hu	2018-02-14	1	-1/+4
\| \| \| \|
\| * \| \|	Fix Error 500s loading repositories with no master branch	Stan Hu	2018-02-14	1	-1/+7
\| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We removed the exception handling for Rugged errors in !16770, which revealed that the licensee gem attempts to retrieve a license file via Rugged in `refs/heads/master` by default. If that branch did not exist, a Rugged::ReferenceError would be thrown. There were two issues: 1. Not every project uses `master` as the default branch. This change uses the head commit to identify the license. 2. Removing the exception handling caused repositories to fail loading. We can safely catch and ignore any Rugged error because this means we weren't able to load a license file. Closes #43268
* \| \|	Fixed user synced attributes metadata after removing current provider	Francisco Javier López	2018-02-15	1	-0/+9
\| \| \|
* \| \|	Merge branch 'mc/fix/project-variables-scope' into 'master'	Kamil Trzciński	2018-02-14	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Project variables validate without any scopes disregarding environment_scope" Closes #43191 See merge request gitlab-org/gitlab-ce!17086
\| * \|	Validate project variables by scope	Matija Čupić	2018-02-13	1	-1/+1
\| \|/
* \|	Merge branch ↵	Rémy Coutable	2018-02-14	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 '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.
* \| \| \|	Merge branch 'expired-ci-artifacts' into 'master'	Grzegorz Bizon	2018-02-14	1	-4/+33
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change SQL for expired artifacts to use new ci_job_artifacts.expire_at See merge request gitlab-org/gitlab-ce!16578
\| * \| \| \|	revert to earlier coding using a hard coded UNION ALL instead of ↵expired-ci-artifacts	Greg Stark	2018-02-09	1	-6/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Gitlab::SQL::Union
\| * \| \| \|	add rubocop whitelist	Greg Stark	2018-02-09	1	-3/+3
\| \| \| \| \|
\| * \| \| \|	Revert to old code style where branches of the union do not have extra where ↵	Greg Stark	2018-02-09	1	-18/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	clauses on them
\| * \| \| \|	WIP experiment	Greg Stark	2018-02-09	1	-3/+9
\| \| \| \| \|
\| * \| \| \|	Add indexes and change SQL for expired artifacts to deal with artifacts ↵	Greg Stark	2018-02-08	1	-4/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \| \| \| \|	Resolve "Remove notification settings for groups and projects you were ↵	🙈 jacopo beschi 🙉	2018-02-14	1	-1/+1
\| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \|	previously a member of"
* \| \| \|	Merge branch '42934-search-api-fix' into 'master'	Sean McGivern	2018-02-14	1	-0/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+4
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch '37050-ext-issue-tracker' into 'master'	Sean McGivern	2018-02-14	1	-0/+2
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display a link to external issue tracker when enabled Closes #37050 See merge request gitlab-org/gitlab-ce!17030
\| * \| \|	Display a link to external issue tracker when enabled	Jarka Kadlecová	2018-02-14	1	-0/+2
\| \| \| \|
* \| \| \|	Remove allow_n_plus_1 block from Network::Graphfix/remove-allow-n-plus-1-from-network-graph	Ahmad Sherif	2018-02-13	1	-5/+2
\| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \|	Closes #37436 Closes gitaly#998
* \| \|	Revert "Merge branch ↵rd-43185-revert-sanitize-extra-blank-spaces-used-when-uploading-a-ssh-key	Rubén Dávila	2018-02-12	1	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' into 'master'" This reverts commit a58f8c32c62bcf5824d1fe1d0de53e9bda974d65, reversing changes made to cd5d75c362cdf06efb8174eddfbd0f4b65687dec.
* \| \|	Merge branch 'mc/bug/38984-wildcard-protected-tags' into 'security-10-4'	Kamil Trzciński	2018-02-09	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \|	Fix using wildcards in protected tags to expose protected variables
* \| \|	Merge branch ↵	Douwe Maan	2018-02-09	1	-0/+21
\|/ / \| \| \| \| \| \| \| \| \| \|	'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 'feature/oidc-groups-claim' into 'master'	Douwe Maan	2018-02-08	1	-1/+6
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add groups to OpenID Connect claims See merge request gitlab-org/gitlab-ce!16929
\| * \|	Add groups to OpenID Connect claims	Hassan Zamani	2018-02-08	1	-1/+6
\| \| \|
* \| \|	Memoize MergeRequest#rebase_in_progress? to prevent N+1 queries in Gitalysh-fix-rebase-in-progress-nplus-one	Stan Hu	2018-02-08	1	-3/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MergeRequest#rebase_in_progress? and MergeRequest#rebase_path were called twice each time per request. This memoization helps reduce the overall number of queries. See https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/51616319 as a failing job. Closes gitlab-org/gitlab-ee#4857
* \| \|	Merge branch '40994-expose-features-as-ci-cd-variable' into 'master'	Kamil Trzciński	2018-02-08	2	-0/+5
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Expose GitLab license/plan as a CI/CD variable" Closes #40994 See merge request gitlab-org/gitlab-ce!16936
\| * \|	Expose GITLAB_FEATURES as CI/CD variable (fixes #40994)40994-expose-features-as-ci-cd-variable	Dylan Griffith	2018-02-07	2	-0/+5
\| \| \|
* \| \|	Merge branch 'pawel/connect_to_prometheus_through_proxy-30480' into 'master'	Robert Speicher	2018-02-07	3	-6/+104
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Deploy prometheus through kubernetes and autoconnect to cluster Closes #30480 and #28916 See merge request gitlab-org/gitlab-ce!16182
\| * \| \|	Fix order of checks in editable? method.	Pawel Chojnacki	2018-02-07	1	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	+ address small nitpicks
\| * \| \|	Make prometheus service querying approach much nicer wrt to arity and ↵	Pawel Chojnacki	2018-02-07	1	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	default function params
\| * \| \|	Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480	Mike Greiling	2018-02-06	30	-198/+272
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (242 commits) Validate user namespace before saving so that errors persist on model Reset Project's column information in spec/lib/gitlab/background_migration/populate_merge_request_metrics_with_events_data_spec.rb Explicitly set cwd in Sidekiq memory killer instead of depending on getcwd Downgrade google-protobuf Close low level rugged repository in project cache worker File upload UI obeys LFS filters Resolve "Add a link to documentation on how to get external ip in the Kubernetes cluster details page" Upgrade GitLab Workhorse to v3.6.0 Add sorting options for /users API (admin only) improvements from feedback [ci-skip] add changelog remove file after `Upload#destroy` Fix a hardcoded pipeline ID in a spinach step Override group sidebar links Replace "cluster" with "Kubernetes cluster" Reorder async/sync tasks in BuildFinishedWorker to read traces efficiently Fix tests for Drop filename enforcement Revert using expand_fixture_path in factory Revert "Add FixtureHelpers for FactoryGirl" Refactor :trace to :trace_live in spec ...
\| * \| \| \|	use find_or_initialize to fetch prometheus_service instance	Pawel Chojnacki	2018-02-06	1	-1/+1
\| \| \| \| \|