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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Do not fail if the self monitoring project exists64689-add-instance-administrators-group	rpereira2	2019-08-06	4	-11/+44
\| \| \| \| \| \| \|	- Since we save the project_id in application_settings, we can check if the project exists before trying to create it. - Also add 8 random characters to the end of the group path so that there is no chance that a group with the same path already exists.
*	Create self-monitoring project within a group	rpereira2	2019-08-06	2	-24/+66
\| \| \| \| \| \| \| \| \|	Create a group of all admins and create the Instance Administration (self-monitoring) project in that group. - This allows new admins to simply be added to the group in order to have access to the Instance Administration project. - It will also make it easier for us to find the project later when we're making updates to it.
*	Use ApplicationSetting.current_without_cache method	rpereira2	2019-08-06	2	-2/+4
\| \| \| \| \|	In order to avoid any problems with the cache when updating ApplicationSettings.
*	Use instance var for application_settings	rpereira2	2019-08-06	3	-5/+12
\|
*	Nullify instance_administration_project_id on del	rpereira2	2019-08-06	2	-2/+2
\| \| \| \|	- Otherwise deletion of the project will fail.
*	Save instance administration project id in DB	rpereira2	2019-08-06	5	-12/+68
\| \| \| \| \|	- This will make it easy to identify the project even if admins change the name of the project or move it.
*	Merge branch 'docs-update-addon-minutes' into 'master'	Evan Read	2019-08-06	1	-1/+4
\|\ \| \| \| \| \| \| \| \|	Docs: add addon minute roll over info See merge request gitlab-org/gitlab-ce!31350
\| *	Docs: add addon minute roll over info	Tristan Williams	2019-08-06	1	-1/+4
\|/
*	Merge branch ↵	Evan Read	2019-08-06	2	-0/+346
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'65386-docs-add-elasticsearch-troubleshooting-to-administrator-troubleshooting-section' into 'master' Docs-Add ElasticSearch Troubleshooting Closes #65386 See merge request gitlab-org/gitlab-ce!31343
\| *	Add ElasticSearch troubleshooting	Jason Colyer	2019-08-06	2	-0/+346
\|/ \| \| \| \|	* Added elasticsearch.md * Added reference to guide in Troubleshooting section
*	Merge branch 'sh-use-redis-caching-store' into 'master'	Ash McKenzie	2019-08-06	4	-9/+17
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Use Rails 5.2 Redis caching store Closes #64794 See merge request gitlab-org/gitlab-ce!30966
\| *	Use Rails 5.2 Redis caching storesh-use-redis-caching-store	Stan Hu	2019-08-05	4	-9/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is the first step in providing a fault-tolerant and distributed Redis caching store. We disable compression to avoid introducing a change that could have an adverse effect in production. Note that we won't be able to take advantage of the fault-tolerance and distributed features yet until we solve https://gitlab.com/gitlab-org/gitlab-ce/issues/64829. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64794
* \|	Merge branch 'docs-fix-links-to-low-weight-issues' into 'master'	Ray Paik	2019-08-06	1	-3/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix links to unassigned, low weight issues for first time contributors See merge request gitlab-org/gitlab-ce!31485
\| * \|	Fix links to unassigned, low weight issues for first time contributors	John Hope	2019-08-05	1	-3/+3
\| \| \|
* \| \|	Merge branch 'fix-diverging-counts-ruby2.5' into 'master'	Stan Hu	2019-08-06	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(Really) Fix Ruby 2.5 compatibility for diverging counts of branches Closes #64143 See merge request gitlab-org/gitlab-ce!31491
\| * \| \|	Fix Ruby 2.5 compatibility for diverging counts of branches	Daniel Gerhardt	2019-08-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	!31480 does not fully restore compatibility because another Ruby 2.6 feature besides `Enumerable#filter` was used in commit ca5cd7b7. The use of `Enumerable#to_h`'s block is now replaced by an explicit `Enumerable#map` call. Error message: TypeError (wrong element type Gitlab::Git::Branch at 0 (expected array)): app/controllers/projects/branches_controller.rb:53:in `to_h' See https://bugs.ruby-lang.org/issues/15143. Fixes #64143.
* \| \| \|	Merge branch 'dblessing-fix-admin-user-radio-labels' into 'master'	Clement Ho	2019-08-05	2	-2/+7
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	Fix Admin area user access level radio button labels See merge request gitlab-org/gitlab-ce!31154
\| * \| \|	Fix Admin area user access level radio button labels	Drew Blessing	2019-08-05	2	-2/+7
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In the admin user edit form, access level radio button labels didn't have the correct 'for' value. Clicking on the label did not select the radio button. This makes usability a bit nicer since the click area is increased when the label is clickable.
* \| \|	Merge branch '64831-add-padding-to-merged-by-widget' into 'master'	Clement Ho	2019-08-05	4	-19/+15
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Add padding to "merged by" widget" Closes #64831 See merge request gitlab-org/gitlab-ce!30972
\| * \| \|	Revert "Make status icon in merge widget borderless"	Marcel van Remmerden	2019-08-05	4	-19/+15
\|/ / / \| \| \| \| \| \| \| \| \|	This reverts commit c3751046d217008404a0bd371e59d6ffd6734923.
* \| \|	Merge branch 'renovate/gitlab-ui-5.x' into 'master'	Clement Ho	2019-08-05	2	-5/+5
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \|	Update dependency @gitlab/ui to v5.14.0 See merge request gitlab-org/gitlab-ce!31482
\| * \|	Update dependency @gitlab/ui to v5.14.0	Lukas Eipert	2019-08-05	2	-5/+5
\| \| \|
* \| \|	Merge branch 'rz_extend_plugins' into 'master'	Evan Read	2019-08-05	1	-1/+31
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add example to plugins file See merge request gitlab-org/gitlab-ce!30508
\| * \| \|	Add example to plugins file	Ronald van Zon	2019-08-05	1	-1/+31
\|/ / /
* \| \|	Merge branch 'docs-add-gitlabci-file' into 'master'	Evan Read	2019-08-05	1	-0/+7
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add description how to set custom CI file See merge request gitlab-org/gitlab-ce!31445
\| * \| \|	Add description how to set custom CI file	Alexander Tanayno	2019-08-05	1	-0/+7
\|/ / /
* \| \|	Merge branch 'fix-name-vs-path-problem-for-cycle-analytics' into 'master'	Mayra Cabrera	2019-08-05	13	-31/+43
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix error on project name See merge request gitlab-org/gitlab-ce!31471
\| * \| \|	Fix error on project name	Gosia Ksionek	2019-08-05	13	-31/+43
\|/ / / \| \| \| \| \| \| \| \| \|	Add project path to sql query to build proper path
* \| \|	Update CHANGELOG.md for 12.1.4	GitLab Release Tools Bot	2019-08-05	5	-20/+13
\| \| \| \| \| \| \| \| \|	[ci skip]
* \| \|	Merge branch '26866-api-endpoint-to-list-the-docker-images-tags-of-a-group' ↵	Mayra Cabrera	2019-08-05	16	-65/+371
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "API endpoint to list the Docker images/tags of a group" See merge request gitlab-org/gitlab-ce!30817
\| * \| \|	Add group level container repository endpoints	Steve Abrams	2019-08-05	16	-65/+371
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API endpoints for requesting container repositories and container repositories with their tag information are enabled for users that want to specify the group containing the repository rather than the specific project.
* \| \|	Merge branch 'sh-disable-redis-peek' into 'master'	Douglas Barbosa Alexandre	2019-08-05	2	-0/+10
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only track Redis calls if Peek is enabled See merge request gitlab-org/gitlab-ce!31438
\| * \| \|	Only track Redis calls if Peek is enabledsh-disable-redis-peek	Stan Hu	2019-08-02	2	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In dev environments, Sidekiq was encountering the message: Circular dependency detected while autoloading constant Gitlab::Profiler This saves some overhead during normal usage.
* \| \| \|	Merge branch '64675-Dashboard-URL-legend-border' into 'master'	Clement Ho	2019-08-05	2	-0/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed external dashboard legend border Closes #64675 See merge request gitlab-org/gitlab-ce!31407
\| * \| \| \|	Removed external dashboard legend border	Olena Horal-Koretska	2019-08-05	2	-0/+7
\|/ / / /
* \| \| \|	Merge branch ↵	Clement Ho	2019-08-05	2	-5/+7
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'63474-applying-a-quick-action-does-not-show-the-correct-message' into 'master' Fixed bug from extra parenthesis Closes #63474 See merge request gitlab-org/gitlab-ce!31479
\| * \| \|	Fixed bug from extra parenthesis63474-applying-a-quick-action-does-not-show-the-correct-message	Donald Cook	2019-08-05	2	-5/+7
\| \| \| \|
* \| \| \|	Merge branch 'docs-debug-cody' into 'master'	Evan Read	2019-08-05	2	-0/+29
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bring diagnostics_tools.md from debug project to docs See merge request gitlab-org/gitlab-ce!31399
\| * \| \| \|	Bring diagnostics_tools.md from debug project to docs	Marcel Amirault	2019-08-05	2	-0/+29
\|/ / / /
* \| \| \|	Merge branch 'docs-quick-action-labels' into 'master'	Evan Read	2019-08-05	1	-0/+13
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document when quotes aren't needed for quick actions Closes #63735 See merge request gitlab-org/gitlab-ce!31338
\| * \| \| \|	Document when quotes aren't needed for quick actions	Sean McGivern	2019-08-05	1	-0/+13
\|/ / / /
* \| \| \|	Merge branch 'add-missing-timezone-legacy-artifacts' into 'master'	Stan Hu	2019-08-05	1	-6/+12
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing timezone when copying legacy artifacts (ci_builds) See merge request gitlab-org/gitlab-ce!31447
\| * \| \| \|	Add missing timezone to legacy artifacts (ci_builds)	David H. Wilkins	2019-08-04	1	-6/+12
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- ci_builds.artifacts_expire_at are copied to ci_job_artifacts.expire_at with incorrect timestamps when the database timezone is NOT utc - ci_builds.artifacts_expire_at is `timestamp without time zone` and ci_job_artifacts.expire_at is `timestamp with time zone` on postgresql - Tests fail locally for `rspec ./spec/lib/gitlab/import_export/import_export_spec.rb` without this change
* \| \| \|	Merge branch 'jts/update-security-doc' into 'master'	Robert Speicher	2019-08-05	2	-11/+11
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updates security templates [ci skip] See merge request gitlab-org/gitlab-ce!31431
\| * \| \| \|	Updates security templates	John Skarbek	2019-08-05	2	-11/+11
\|/ / / /
* \| \| \|	Merge branch 'explicit-helm-factory-certs' into 'master'	Michael Kozono	2019-08-05	2	-0/+23
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use stubbed key and certificate in Helm factory See merge request gitlab-org/gitlab-ce!31169
\| * \| \| \|	Use stubbed certificate and key in Helm factoryexplicit-helm-factory-certs	Tiger	2019-08-01	2	-0/+23
\| \| \| \| \|
* \| \| \| \|	Merge branch 'id-fix-diverging-counts' into 'master'	Stan Hu	2019-08-05	1	-1/+1
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use select instead of filter to support 2.5 See merge request gitlab-org/gitlab-ce!31480
\| * \| \| \|	Use select instead of filter to support 2.5	Igor	2019-08-05	1	-1/+1
\|/ / / /
* \| \| \|	Merge branch '64016-add-shell-style-guide-link-to-development-page' into ↵34558-clean-up-cohorts	Marcia Ramos	2019-08-05	1	-0/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Add shell scripting guides to development README Closes #64016 See merge request gitlab-org/gitlab-ce!31467