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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\| \| \| \| \|
\| * \| \| \|	remove unnecessary comment	Pawel Chojnacki	2018-02-06	1	-1/+0
\| \| \| \| \|
\| * \| \| \|	fix rubocop errors and ensure prometheus_installed? doesn't fail in CI tests ↵	Mike Greiling	2018-01-31	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	where project is nil
\| * \| \| \|	hide prometheus manual integration form when auto config is active	Mike Greiling	2018-01-31	1	-10/+8
\| \| \| \| \|
\| * \| \| \|	change prometheus service description text to match design	Mike Greiling	2018-01-31	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480	Mike Greiling	2018-01-31	6	-68/+24
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (119 commits) [ci skip] Fix example commands to refer to the correct versions Use axios instead of jquery ajax for setCiStatusFavicon refactor groups controller to match EE Fix broken test Introduce a new QA::Gitlab::Page::Component::Dropzone class Gitaly Server info for admin panel Add note about being in the `qa` directory for `bin/qa` to work Remove N+1 queries with /projects/:project_id/{access_requests,members} API endpoints Fix not all events being shown in group dashboard Add support for PreReceiveError in UserMergeBranch RPC Migrate Git::Repository#delete_refs to Gitaly Replace $.get in render math with axios Move mr widget related links into a vue file Make those files as close as EE to reduce conflicts Don't assume postgresql in two initializers Move Repository#can_be_merged? to Gitlab::Git::Repository Remove brakeman from .codeclimate.yml since it's now covered by the sast CI job Update Nokogiri to 1.8.2 Ignore conflicts in db/schema.rb in Gitlab::EeCompatCheck Remove Rugged exception in cache rescue ...
\| * \| \| \| \|	Fix rubocop	Pawel Chojnacki	2018-01-30	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	fix service generic tests	Pawel Chojnacki	2018-01-30	1	-4/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Pawel Chojnacki	2018-01-29	22	-142/+194
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	pawel/connect_to_prometheus_through_proxy-30480
\| * \| \| \| \| \|	check if service is template	Pawel Chojnacki	2018-01-17	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Pawel Chojnacki	2018-01-17	32	-172/+349
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	pawel/connect_to_prometheus_through_proxy-30480
\| * \| \| \| \| \| \|	Fix rubocop warnings	Pawel Chojnacki	2018-01-04	1	-3/+6
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Test Prometheus proxy client generation	Pawel Chojnacki	2018-01-04	1	-2/+7
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Cleanup PrometheusService tests	Pawel Chojnacki	2018-01-04	1	-4/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Cleanup implementation and add cluster finding tests	Pawel Chojnacki	2018-01-04	3	-18/+19
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add test checking if prometheus integration is enabled after prometheus is ↵	Pawel Chojnacki	2018-01-04	2	-7/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	installed
\| * \| \| \| \| \| \|	Auto enable prometheus service if Prometheus is Installed	Pawel Chojnacki	2018-01-02	1	-4/+6
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Manual Configuration instead of Activation. Prometheus Service just got a ↵	Pawel Chojnacki	2018-01-02	1	-8/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	bit weirder
\| * \| \| \| \| \| \|	Move client creation to Prometheus Application, manufacture proper rest client	Pawel Chojnacki	2018-01-02	2	-34/+18
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	wip	Pawel Chojnacki	2018-01-02	3	-7/+80
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'rd-35856-backport-lfs-file-locking-api' into 'master'	Sean McGivern	2018-02-07	3	-0/+20
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport LFS File Locking API Closes #35856 See merge request gitlab-org/gitlab-ce!16935
\| * \| \| \| \| \| \| \|	Backport of LFS File Locking APIrd-35856-backport-lfs-file-locking-api	Rubén Dávila	2018-02-07	3	-0/+20
\| \| \| \| \| \| \| \| \|