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

	Commit message (Collapse)	Author	Age	Files	Lines
*	46210 Display logo and user dropdown on mobile for terms page and fix styling46210-terms-acceptance-dropdown-menu	tauriedavis	2018-05-09	3	-4/+14
\|
*	Merge branch 'dm-repository-xcode-project' into 'master'	Robert Speicher	2018-05-09	3	-3/+41
\|\ \| \| \| \| \| \| \| \|	Add Repository#xcode_project? method See merge request gitlab-org/gitlab-ce!18854
\| *	Add Repository#xcode_project? method	Douwe Maan	2018-05-09	3	-3/+41
\| \|
* \|	Merge branch '46032/deploy-keys-axios' into 'master'	Clement Ho	2018-05-09	4	-40/+24
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	refactor "deploy_keys" to use axios See merge request gitlab-org/gitlab-ce!18792
\| * \|	refactor "deploy_keys" to use axios	Paul Slaughter	2018-05-09	4	-40/+24
\|/ /
* \|	Merge branch 'fix-project-mirror-data-schema' into 'master'	Douwe Maan	2018-05-09	5	-2/+78
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix project mirror data schema See merge request gitlab-org/gitlab-ce!18811
\| * \	Merge branch 'master' into 'fix-project-mirror-data-schema'	Douwe Maan	2018-05-09	197	-1728/+1367
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \| \|	Adds changelog	Tiago Botelho	2018-05-08	1	-0/+6
\| \| \| \|
\| * \| \|	Adds unique constraint to ProjectMirrorData project_id index	Tiago Botelho	2018-05-08	2	-2/+33
\| \| \| \|
\| * \| \|	Adds not null constraint to ProjectMirrorData's foreign_key project_id	Tiago Botelho	2018-05-08	3	-2/+41
\| \| \| \|
* \| \| \|	Merge branch 'jivl-delete-d3-rails-gem' into 'master'	Douwe Maan	2018-05-09	2	-6/+0
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \|	Removed the d3_rails gem See merge request gitlab-org/gitlab-ce!18860
\| * \| \|	Removed the d3_rails gem	Jose	2018-05-09	2	-6/+0
\| \| \| \|
* \| \| \|	Merge branch 'docs/bdo-inclusive-language-groups-docs' into 'master'	🚄 Job van der Voort 🚀	2018-05-09	1	-10/+10
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update documentation to use inclusive language, gender neutral name and pronoun. See merge request gitlab-org/gitlab-ce!18858
\| * \| \| \|	Update documentation to use inclusive language, gender neutral name and pronoun.	Brendan O'Leary 🐢	2018-05-09	1	-10/+10
\| \| \| \| \|
* \| \| \| \|	Merge branch '45840-fix-cache-key-docs' into 'master'	Achilleas Pipinellis	2018-05-09	1	-7/+11
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Incorrect documentation for .gitlab-ci.yml cache:key default value" Closes #45840 See merge request gitlab-org/gitlab-ce!18841
\| * \| \| \| \|	Fix cache:key documentation for the default value	Lin Jen-Shin	2018-05-09	1	-7/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Re-apply changes from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9666 * Update the wordings accordingly for the current revision * Update the example to make it less confusing
* \| \| \| \| \|	Merge branch 'docs-fix-duplicate-titles' into 'master'	Achilleas Pipinellis	2018-05-09	20	-109/+52
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: fix duplicate titles Closes #46061 See merge request gitlab-org/gitlab-ce!18758
\| * \| \| \| \| \|	Docs: fix duplicate titles	Marcia Ramos 🚫 (OOO - back on May 21)	2018-05-09	20	-109/+52
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'fix/gb/add-missing-foreign-key-to-database-schema' into 'master'	Kamil Trzciński	2018-05-09	1	-0/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing pipeline build foreign key to the schema See merge request gitlab-org/gitlab-ce!18846
\| * \| \| \| \| \|	Add missing pipeline build foreign key to the schema	Grzegorz Bizon	2018-05-09	1	-0/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix/gb/add-tmp-index-to-improve-stages-migration-cleanup' into ↵	Kamil Trzciński	2018-05-09	1	-1/+34
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Add tmp index to ci_builds to optimize stages migration Closes #46179 See merge request gitlab-org/gitlab-ce!18844
\| * \| \| \| \| \| \|	Add tmp index to ci_builds to optimize stages migration	Grzegorz Bizon	2018-05-09	1	-1/+34
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'zj-remove-rugged-call' into 'master'	Robert Speicher	2018-05-09	1	-7/+3
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove rugged call in blame controller See merge request gitlab-org/gitlab-ce!18817
\| * \| \| \| \| \|	Remove rugged call in blame controller	Zeger-Jan van de Weg	2018-05-08	1	-7/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fetching commits through #lookup uses rugged, and this is phased out. Also adds a short circuit in the `feature_enabled?` Gitaly method to allow Gitaly to be used when objects are set up with `let` before an example is run.
* \| \| \| \| \| \|	Merge branch 'docs-update-docstyleguide' into 'master'	Achilleas Pipinellis	2018-05-09	1	-23/+91
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: update docs style guidelines Closes #46157 and #45321 See merge request gitlab-org/gitlab-ce!18819
\| * \| \| \| \| \| \|	Docs: update docs style guidelines	Marcia Ramos 🚫 (OOO - back on May 21)	2018-05-09	1	-23/+91
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'support-active-setting-while-registering-a-runner' into 'master'	Kamil Trzciński	2018-05-09	3	-1/+30
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support 'active' setting on Runner Registration API endpoint See merge request gitlab-org/gitlab-ce!18848
\| * \| \| \| \| \| \|	Add CHANGELOG entry	Tomasz Maczukin	2018-05-09	1	-0/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Support 'active' setting on Runner Registration API endpoint	Tomasz Maczukin	2018-05-09	2	-1/+25
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '46003-fix-node-10-compatibility' into 'master'	Mike Greiling	2018-05-09	1	-23/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Bump upath to 1.0.5" Closes #46003 and gitlab-development-kit#348 See merge request gitlab-org/gitlab-ce!18852
\| * \| \| \| \| \| \| \|	bump upath dependency to a version compatible with node 10	Mike Greiling	2018-05-09	1	-23/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '46010-runner-type-not-null' into 'master'	Kamil Trzciński	2018-05-09	5	-2/+15
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set `ci_runners.runner_type` not null See merge request gitlab-org/gitlab-ce!18825
\| * \| \| \| \| \| \| \| \|	Add validation Ci::Runner runner_type must be present	Dylan Griffith	2018-05-09	2	-0/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add DB constraint ci_runners.runner_type not null	Dylan Griffith	2018-05-09	3	-2/+13
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'fix-ide-empty-editor' into 'master'	Filipa Lacerda	2018-05-09	4	-3/+25
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed empty editors in the IDE Closes #46153 See merge request gitlab-org/gitlab-ce!18842
\| * \| \| \| \| \| \| \| \|	added specs	Phil Hughes	2018-05-09	2	-0/+20
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fixed empty editors in the IDE	Phil Hughes	2018-05-09	2	-3/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #46153
* \| \| \| \| \| \| \| \| \|	Merge branch '10-8-dependencies-update' into 'master'	James Lopez	2018-05-09	1	-162/+234
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update the dependencies license list See merge request gitlab-org/gitlab-ce!18847
\| * \| \| \| \| \| \| \| \| \|	Update the dependencies license list	Filipa Lacerda	2018-05-09	1	-162/+234
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch '10-8-update-gitignore' into 'master'	James Lopez	2018-05-09	12	-15/+27
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update the .gitignore, .gitlab-ci.yml, and Dockerfile templates See merge request gitlab-org/gitlab-ce!18845
\| * \| \| \| \| \| \| \| \| \|	Update the .gitignore, .gitlab-ci.yml, and Dockerfile templates	Filipa Lacerda	2018-05-09	12	-15/+27
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'cherry-pick-7b8d754e-ce' into 'master'	Grzegorz Bizon	2018-05-09	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adjust spec to build correct path when storage path ends in slash See merge request gitlab-org/gitlab-ce!18843
\| * \| \| \| \| \| \| \| \|	Adjust spec to build correct path when storage path ends in slash	Douwe Maan	2018-05-09	1	-1/+1
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'blackst0ne-fix-downtime-check-job' into 'master'	Douwe Maan	2018-05-09	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix `downtime_check` job See merge request gitlab-org/gitlab-ce!18840
\| * \| \| \| \| \| \| \| \|	Fix `downtime_check` job	blackst0ne	2018-05-09	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	15fcd9650f6a4a5832e2ed57419b11e30d3f606f (!18547) squashes old migrations to a single one. Old migrations had `rubocop:disable all` rule, but the new migration doesn't have it, so the `downtime_check` fails. This commit explicitly tells that the migration requires downtime.
* \| \| \| \| \| \| \| \| \|	Merge branch 'docs-document-redirect-to' into 'master'	Achilleas Pipinellis	2018-05-09	1	-0/+13
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: document the redirect_to method See merge request gitlab-org/gitlab-ce!18788
\| * \| \| \| \| \| \| \| \| \|	document the redirect_to method	Marcia Ramos	2018-05-07	1	-0/+13
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs-add-descriptions' into 'master'	Achilleas Pipinellis	2018-05-09	15	-4/+48
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: add custom descriptions to most relevant docs Closes gitlab-com/gitlab-docs#200 See merge request gitlab-org/gitlab-ce!18789
\| * \| \| \| \| \| \| \| \| \|	Docs: add custom descriptions to most relevant docs	Marcia Ramos	2018-05-09	15	-4/+48
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Align with EE	Lin Jen-Shin	2018-05-09	1	-3/+3
\| \|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \|