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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into jivl-update-katex	Jose Ivan Vargas	2018-02-12	40	-0/+198
\|\
\| *	Create an empty wiki when there is no wiki in the gitlab export bundle	Valery Sizov	2018-02-12	1	-0/+5
\| \|
\| *	Merge branch 'group-label-page-breadcrumb' into 'master'	Phil Hughes	2018-02-12	1	-0/+5
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix breadcrumb on labels page for groups Closes #42909 See merge request gitlab-org/gitlab-ce!17045
\| \| *	Revert and remove header_title line from labels issue	Onuwa Nnachi Isaac	2018-02-12	1	-0/+5
\| \| \|
\| * \|	Merge branch 'refactor/move-issuable-time-tracker-vue-component' into 'master'	Filipa Lacerda	2018-02-12	1	-0/+5
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move IssuableTimeTracker vue component See merge request gitlab-org/gitlab-ce!16948
\| \| * \|	Move IssuableTimeTracker vue component	George Tsiolis	2018-02-12	1	-0/+5
\| \| \| \|
\| * \| \|	Adds tooltip for environment name42922-environment-name	Filipa Lacerda	2018-02-09	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds CSS for child envrionments
\| * \| \|	Update vue component naming guidelines	George Tsiolis	2018-02-08	1	-0/+5
\| \|/ /
\| * \|	Added 'clear' button to ci lint editor	Lin Jen-Shin	2018-02-08	1	-0/+4
\| \| \|
\| * \|	Merge branch 'feature/oidc-groups-claim' into 'master'	Douwe Maan	2018-02-08	1	-0/+4
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-0/+4
\| \| \| \|
\| * \| \|	Merge branch 'bvl-fix-concurrent-fork-network-migrations' into 'master'42861-include-external-files-in-gitlab-ci-yml-move-from-eep-to-ce	Yorick Peterse	2018-02-08	1	-0/+5
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix concurrent fork network migrations Closes #41487 See merge request gitlab-org/gitlab-ce!16988
\| \| * \| \|	Early migrations populating fork-networks: no-op	Bob Van Landuyt	2018-02-08	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since populating the fork networks was scheduled multiple times because of bugs that needed to be fixed: - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15595/ Creating fork networks for projects that were missing the root of the fork network. - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15709 The API allowed creating forked_project_links without fork_network_members. Scheduling this migration multiple times would case it to run concurrently. Which in turn would try to insert the same data into `fork_network_members` causing duplicate key errors. This avoids running the migration multiple times.
\| * \| \| \|	Merge branch '40994-expose-features-as-ci-cd-variable' into 'master'	Kamil Trzciński	2018-02-08	1	-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	1	-0/+5
\| \| \| \| \|
\| * \| \| \|	Annotate charts page for internationalization	Shah El-Rahman	2018-02-08	1	-0/+5
\| \| \|_\|/ \| \|/\| \|
\| * \| \|	Annotate graph page for internationalization	Shah El-Rahman	2018-02-08	1	-0/+5
\| \| \| \|
\| * \| \|	Resolve "Cancelling a second comment edit doesn't return its state to before ↵	Simon Knox	2018-02-07	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the edit"
\| * \| \|	Remove duplicate calls of MergeRequest#can_be_reverted?	Oswaldo Ferreira	2018-02-07	1	-0/+5
\| \| \| \|
\| * \| \|	Merge branch 'pawel/connect_to_prometheus_through_proxy-30480' into 'master'	Robert Speicher	2018-02-07	1	-0/+6
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Deploy prometheus through kubernetes and autoconnect to cluster Closes #30480 and #28916 See merge request gitlab-org/gitlab-ce!16182
\| \| * \ \	Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480	Mike Greiling	2018-02-06	44	-0/+220
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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 ...
\| \| * \ \ \	Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480	Mike Greiling	2018-01-31	19	-31/+66
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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 ...
\| \| * \ \ \ \	Merge remote-tracking branch 'upstream/master' into ↵	Pawel Chojnacki	2018-01-29	187	-685/+265
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	pawel/connect_to_prometheus_through_proxy-30480
\| \| * \ \ \ \ \	Merge remote-tracking branch 'upstream/master' into ↵	Pawel Chojnacki	2018-01-17	115	-15/+569
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	pawel/connect_to_prometheus_through_proxy-30480
\| \| * \| \| \| \| \| \|	Add Changelog item	Pawel Chojnacki	2018-01-04	1	-0/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch '34416-issue-i18n' into 'master'	Sean McGivern	2018-02-07	1	-0/+5
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Translate issuable sidebar Closes #34416 See merge request gitlab-org/gitlab-ce!16663
\| \| * \| \| \| \| \| \| \|	Translate issuable sidebar34416-issue-i18n	Jarka Kadlecová	2018-02-07	1	-0/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'rd-35856-backport-lfs-file-locking-api' into 'master'	Sean McGivern	2018-02-07	1	-0/+5
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch '41763-search-api' into 'master'	Sean McGivern	2018-02-07	1	-0/+5
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Search API Closes #41763 See merge request gitlab-org/gitlab-ce!16878
\| \| * \| \| \| \| \| \| \| \|	Support search in API	Jarka Kadlecová	2018-02-06	1	-0/+5
\| \| \| \|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch '41209-ci-linter-fails-on-gitlab-ci-blob-viewer' into 'master'	Kamil Trzciński	2018-02-07	1	-0/+5
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "CI linter fails to work" Closes #41209 See merge request gitlab-org/gitlab-ce!16922
\| \| * \| \| \| \| \| \| \| \|	Handle all YAML parser exceptions in .gitlab-ci.yml (fixes #41209)41209-ci-linter-fails-on-gitlab-ci-blob-viewer	Dylan Griffith	2018-02-07	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Move the exception handling as close to the source as possible to avoid leaking Psych ahstraction - Also remove unnecessary rescue all statement from LintsController. This should not be necessary anymore since any YAML errors should all be caught by the #validation_message method.
\| * \| \| \| \| \| \| \| \| \|	Merge branch ↵	Kamil Trzciński	2018-02-07	1	-0/+5
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'38265-stuckcijobsworker-wrongly-detects-cancels-stuck-builds-when-per-job-timeout-is-more-than-an-hour' into 'master' Resolve "StuckCiJobsWorker wrongly detects, cancels 'stuck' builds when per-job timeout is more than an hour" Closes #38265, #42196, and #42750 See merge request gitlab-org/gitlab-ce!16756
\| \| * \ \ \ \ \ \ \ \ \	Merge branch 'master' into ↵	Matija Čupić	2018-02-04	38	-26/+166
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	38265-stuckcijobsworker-wrongly-detects-cancels-stuck-builds-when-per-job-timeout-is-more-than-an-hour
\| \| * \| \| \| \| \| \| \| \| \|	Add CHANGELOG entry	Matija Čupić	2018-01-29	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch '38175-add-domain-field-to-auto-devops-application-setting' ↵	Kamil Trzciński	2018-02-07	1	-0/+5
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Add domain field to Auto DevOps application setting" Closes #38175 See merge request gitlab-org/gitlab-ce!16604
\| \| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' into ↵	Matija Čupić	2018-02-03	1	-0/+5
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	38175-add-domain-field-to-auto-devops-application-setting
\| \| * \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into ↵	Matija Čupić	2018-02-02	3	-0/+15
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	38175-add-domain-field-to-auto-devops-application-setting
\| \| * \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into ↵	Matija Čupić	2018-02-02	33	-26/+141
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	38175-add-domain-field-to-auto-devops-application-setting
\| \| * \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into ↵	Matija Čupić	2018-01-28	31	-21/+138
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|/ / / / / / / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	38175-add-domain-field-to-auto-devops-application-setting
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Add CHANGELOG entry	Matija Čupić	2018-01-22	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '40755-snippets-author-n+1' into 'master'	Yorick Peterse	2018-02-07	1	-0/+5
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "N+1 database queries on the snippets dashboard" Closes #40755 See merge request gitlab-org/gitlab-ce!16944
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix N+1 query problem for snippets dashboard.40755-snippets-author-n+1	Andreas Brandl	2018-02-07	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #40755.
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'move-board-list-vue-component' into 'master'	Phil Hughes	2018-02-07	1	-0/+5
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move board list vue component See merge request gitlab-org/gitlab-ce!16888
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Move BoardList vue component to vue file	George Tsiolis	2018-02-06	1	-0/+5
\| \| \|/ / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into '26388-push-to-create-a-new-project'	Douwe Maan	2018-02-06	11	-0/+55
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # lib/gitlab/path_regex.rb
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'dm-route-path-validation' into 'master'	Sean McGivern	2018-02-06	1	-0/+5
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Validate user, group and project paths consistently, and only once See merge request gitlab-org/gitlab-ce!16903
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Add changelogdm-route-path-validation	Douwe Maan	2018-02-06	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'dm-user-namespace-route-path-validation' into 'master'	Sean McGivern	2018-02-06	1	-0/+5
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Validate user namespace before saving so that errors persist on model Closes #42140 See merge request gitlab-org/gitlab-ce!16902