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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fixed missing js selector for the realtime pipelines commit compjivl-fix-missing-js-selector-realtime-pipeline	Jose Ivan Vargas	2018-02-12	1	-1/+1
\|
*	Merge branch 'group-label-page-breadcrumb' into 'master'	Phil Hughes	2018-02-12	1	-1/+0
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	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	-1/+0
\| \|
\| *	Fix breadcrumb on labels page for groups	Onuwa Nnachi Isaac	2018-02-09	1	-1/+1
\| \|
* \|	Merge branch '42928-default-protected-variables-to-off' into 'master'	Filipa Lacerda	2018-02-12	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Default CI variables to unprotected Closes #42928 See merge request gitlab-org/gitlab-ce!17039
\| * \|	Default CI variables to unprotected42928-default-protected-variables-to-off	Eric Eastwood	2018-02-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ce/issues/42928
* \| \|	Replace $.post in importer status with axios	Clement Ho	2018-02-09	2	-27/+0
\| \| \|
* \| \|	Added 'clear' button to ci lint editor	Lin Jen-Shin	2018-02-08	1	-0/+2
\| \| \|
* \| \|	Annotate charts page for internationalization	Shah El-Rahman	2018-02-08	1	-13/+18
\| \|/ \|/\|
* \|	Resolve "New design for user deletion confirmation in admin area"	Shah El-Rahman	2018-02-08	3	-12/+36
\| \|
* \|	Annotate graph page for internationalization	Shah El-Rahman	2018-02-08	2	-3/+3
\| \|
* \|	Resolve "New design for project deletion confirmation"	Shah El-Rahman	2018-02-08	1	-1/+8
\|/
*	Merge branch 'pawel/connect_to_prometheus_through_proxy-30480' into 'master'	Robert Speicher	2018-02-07	4	-2/+37
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Deploy prometheus through kubernetes and autoconnect to cluster Closes #30480 and #28916 See merge request gitlab-org/gitlab-ce!16182
\| *	Avoid unless/else	Pawel Chojnacki	2018-02-07	1	-4/+4
\| \|
\| *	add i8n to the Prometheus integration settings page	Mike Greiling	2018-02-06	1	-8/+8
\| \|
\| *	Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480	Mike Greiling	2018-02-06	66	-177/+291
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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 ...
\| * \|	style the prometheus integration service page according to design	Mike Greiling	2018-01-31	2	-10/+22
\| \| \|
\| * \|	hide prometheus manual integration form when auto config is active	Mike Greiling	2018-01-31	1	-8/+19
\| \| \|
\| * \|	add link to cluster configuration from prometheus "getting started" state	Mike Greiling	2018-01-31	1	-0/+1
\| \| \|
\| * \|	Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480	Mike Greiling	2018-01-31	4	-10/+35
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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 ...
\| * \| \|	add button to configure prometheus integration from cluster page	Mike Greiling	2018-01-30	1	-1/+2
\| \| \| \|
\| * \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Pawel Chojnacki	2018-01-29	68	-186/+201
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	pawel/connect_to_prometheus_through_proxy-30480
\| * \ \ \	Merge remote-tracking branch 'upstream/master' into ↵	Pawel Chojnacki	2018-01-17	70	-248/+335
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	pawel/connect_to_prometheus_through_proxy-30480
\| * \| \| \| \|	Add test checking if prometheus integration is enabled after prometheus is ↵	Pawel Chojnacki	2018-01-04	1	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	installed
* \| \| \| \| \|	Merge branch '3559-ce-port-group-roadmap' into 'master'	Filipa Lacerda	2018-02-07	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE Port for Group Roadmap changes See merge request gitlab-org/gitlab-ce!16908
\| * \| \| \| \| \|	Add support for adding custom class on content wrapper element	Kushal Pandya	2018-02-07	1	-1/+1
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'zj-refs-hash' into 'master'	Sean McGivern	2018-02-07	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't use rugged in Repository#refs_hash Closes gitaly#880 See merge request gitlab-org/gitlab-ce!16827
\| * \| \| \| \| \|	Don't use rugged in Repository#refs_hash	Zeger-Jan van de Weg	2018-02-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The refs hash is used to determine what branches and tags have a commit as head in the network graph. The previous implementation depended on Rugged#references. The problem with this implementation was that it depended on rugged, but also that it iterated over all references and thus loading more data than needed if for example the project uses CI/CD environments, Pipelines, or Merge Requests. Given only refs are checked the network cares about the GraphHelper#refs method has no need to reject those, simplifying the method. Closes gitlab-org/gitaly#880
* \| \| \| \| \| \|	Merge branch '34416-issue-i18n' into 'master'	Sean McGivern	2018-02-07	5	-42/+46
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Translate issuable sidebar Closes #34416 See merge request gitlab-org/gitlab-ce!16663
\| * \| \| \| \| \| \|	Translate issuable sidebar34416-issue-i18n	Jarka Kadlecová	2018-02-07	5	-42/+46
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '38175-add-domain-field-to-auto-devops-application-setting' ↵	Kamil Trzciński	2018-02-07	1	-1/+6
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-22/+60
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	38175-add-domain-field-to-auto-devops-application-setting
\| * \ \ \ \ \ \ \	Merge branch 'master' into ↵	Matija Čupić	2018-02-02	19	-28/+30
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	38175-add-domain-field-to-auto-devops-application-setting
\| * \ \ \ \ \ \ \ \	Merge branch 'master' into ↵	Matija Čupić	2018-02-02	24	-40/+71
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	38175-add-domain-field-to-auto-devops-application-setting
\| * \| \| \| \| \| \| \| \| \|	Update auto_devops_domain help block with i18n	Matija Čupić	2018-01-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' into ↵	Matija Čupić	2018-01-28	41	-98/+120
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	38175-add-domain-field-to-auto-devops-application-setting
\| * \| \| \| \| \| \| \| \| \| \|	Expose auto_devops_domain in admin settings view	Matija Čupić	2018-01-22	1	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'ce-39118-dynamic-pipeline-variables-fe' into 'master'	Kamil Trzciński	2018-02-07	9	-85/+32
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Dynamic CI secret variables -- CE backport See merge request gitlab-org/gitlab-ce!16842
\| * \| \| \| \| \| \| \| \| \| \| \|	Use dynamic variable list in scheduled pipelines and group/project CI secret ↵	Eric Eastwood	2018-02-05	9	-85/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	variables See https://gitlab.com/gitlab-org/gitlab-ce/issues/39118 Conflicts: app/views/ci/variables/_form.html.haml app/views/ci/variables/_table.html.haml ee/app/views/ci/variables/_environment_scope.html.haml spec/javascripts/ci_variable_list/ci_variable_list_ee_spec.js spec/javascripts/fixtures/projects.rb
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '40755-snippets-author-n+1' into 'master'	Yorick Peterse	2018-02-07	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #40755.
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'winh-kubernetes-clusters' into 'master'	Phil Hughes	2018-02-06	20	-69/+67
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace "cluster" with "Kubernetes cluster" Closes #41963 See merge request gitlab-org/gitlab-ce!16778
\| * \| \| \| \| \| \| \| \| \| \| \|	Replace "cluster" with "Kubernetes cluster"winh-kubernetes-clusters	Winnie Hellmann	2018-02-06	20	-69/+67
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Add a link to documentation on how to get external ip in the ↵	Fabio Busatto	2018-02-06	1	-1/+2
\| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Kubernetes cluster details page"
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix/show-sidebar-sub-level-items-for-billing' into 'master'	Sean McGivern	2018-02-06	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Override group sidebar links See merge request gitlab-org/gitlab-ce!16942
\| * \| \| \| \| \| \| \| \| \| \| \|	Override group sidebar links	George Tsiolis	2018-02-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '39550-group-labels-redesign' into 'master'	Tim Zallmann	2018-02-06	3	-24/+51
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Group label list page redesign" Closes #39550 See merge request gitlab-org/gitlab-ce!16592
\| * \| \| \| \| \| \| \| \| \| \| \|	Use sprite_icon and variables39550-group-labels-redesign	Annabel Dunstone Gray	2018-02-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix labels specs	Annabel Dunstone Gray	2018-01-30	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Add modal for label deletion	Annabel Dunstone Gray	2018-01-29	2	-3/+26
\| \| \| \| \| \| \| \| \| \| \| \| \|