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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update VERSION to 10.7.0-rc6v10.7.0-rc6	Robert Speicher	2018-04-17	1	-1/+1
\|
*	Merge branch '10-7-stable-prepare-rc6' into '10-7-stable'	Robert Speicher	2018-04-17	162	-507/+1880
\|\ \| \| \| \| \| \| \| \|	Prepare 10.7 RC6 release See merge request gitlab-org/gitlab-ce!18365
\| *	Merge branch '45271-collpased-diff-loading' into 'master'	Phil Hughes	2018-04-17	7	-17/+84
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Collapsed diff spacing wrong when failed to load" Closes #45271 and #45317 See merge request gitlab-org/gitlab-ce!18351
\| *	Merge branch '10-7-stable-prepare-rc6-fix-conflict-18366' into ↵	Dmitriy Zaporozhets	2018-04-17	6	-26/+59
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'10-7-stable-prepare-rc6' Resolve conflicts for Don't reset application settings checkboxes when save another section See merge request gitlab-org/gitlab-ce!18423
\| \| *	Fix conflict in app/controllers/admin/application_settings_controller.rb	Dmitriy Zaporozhets	2018-04-17	1	-11/+0
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| *	Merge branch 'dz-fix-admin-import-sources' into 'master'	Douwe Maan	2018-04-17	6	-18/+62
\| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Don't reset application settings checkboxes when save another section Closes #45343 See merge request gitlab-org/gitlab-ce!18366
\| *	Merge branch 'dm-archived-read-only' into 'master'	Robert Speicher	2018-04-17	91	-297/+935
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make archived projects completely read-only Closes #44788 See merge request gitlab-org/gitlab-ce!18136
\| *	Merge branch 'sh-memoize-repository-empty' into 'master'	Grzegorz Bizon	2018-04-17	5	-6/+40
\| \| \| \| \| \| \| \| \| \|	Memoize Git::Repository#has_visible_content? See merge request gitlab-org/gitlab-ce!18383
\| *	Merge branch 'workhorse-4-1-0' into 'master'	Douwe Maan	2018-04-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	Update GitLab Workhorse to v4.1.0 See merge request gitlab-org/gitlab-ce!18327
\| *	Merge branch '45269-double-checked-internal-ids' into 'master'	Yorick Peterse	2018-04-17	2	-6/+55
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Double-checked internal ID generation for transition phase Closes #45269 See merge request gitlab-org/gitlab-ce!18392
\| *	Merge branch 'docs/gb/add-support-note-to-variables-policy-docs' into 'master'	Grzegorz Bizon	2018-04-17	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add note about support of variables policy to docs Closes #45301 See merge request gitlab-org/gitlab-ce!18387
\| *	Merge branch ↵	Robert Speicher	2018-04-17	2	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	'fix_container_scanning_in_vendored_gitlab_ci_yml_for_auto_devops' into 'master' Fix container scanning in vendored GitLab CI configuration for Auto Devops See merge request gitlab-org/gitlab-ce!18374
\| *	Merge branch 'jramsay-ha-plugin-docs' into 'master'	Marcia Ramos	2018-04-17	1	-0/+5
\| \| \| \| \| \| \| \| \| \|	Add note about HA configurations See merge request gitlab-org/gitlab-ce!18354
\| *	Merge branch 'docs-for-failure-reason-tooltip' into 'master'	Achilleas Pipinellis	2018-04-17	3	-0/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing documentation about failure reason Closes #45300 See merge request gitlab-org/gitlab-ce!18352
\| *	Merge branch 'revert-93869c63' into 'master'	Filipa Lacerda	2018-04-17	7	-31/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Resolve HTML/CSS inconsistent comment forms on Issue and Merge Request" Closes #45288 See merge request gitlab-org/gitlab-ce!18346
\| *	Merge branch 'jprovazn-fix-references' into 'master'	Douwe Maan	2018-04-17	13	-22/+91
\| \| \| \| \| \| \| \| \| \|	Fix reference filters in group context See merge request gitlab-org/gitlab-ce!18340
\| *	Merge branch '10-7-update-licenses' into 'master'	Rémy Coutable	2018-04-17	1	-64/+65
\| \| \| \| \| \| \| \| \| \|	Update the dependencies license list for 10.7 See merge request gitlab-org/gitlab-ce!18339
\| *	Merge branch '10-7-update-files' into 'master'	James Lopez	2018-04-17	19	-17/+81
\| \| \| \| \| \| \| \| \| \|	Update the .gitignore, .gitlab-ci.yml, and Dockerfile templates See merge request gitlab-org/gitlab-ce!18338
\| *	Merge branch 'docs-update-instal-guide-10-7' into 'master'	James Lopez	2018-04-17	2	-1/+362
\| \| \| \| \| \| \| \| \| \|	Updates installation and update guides See merge request gitlab-org/gitlab-ce!18337
\| *	Merge branch '5103-mention-reply-by-email-in-user-docs' into 'master'	Achilleas Pipinellis	2018-04-17	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mention reply-by-email in user doc Closes gitlab-ee#5103 See merge request gitlab-org/gitlab-ce!18310
\| *	Merge branch '41436-use-simpler-env-vars-for-auto-devops-replicas' into 'master'	Achilleas Pipinellis	2018-04-17	2	-18/+24
\|/ \| \| \| \|	Update Auto-Devops docs to mention new REPLICAS env var See merge request gitlab-org/gitlab-ce!18036
*	Update VERSION to 10.7.0-rc5v10.7.0-rc5	James Lopez	2018-04-12	1	-1/+1
\|
*	Merge branch '10-7-stable-prepare-rc5' into '10-7-stable'	James Lopez	2018-04-12	399	-9993/+16178
\|\ \| \| \| \| \| \| \| \|	Prepare 10.7 RC5 release See merge request gitlab-org/gitlab-ce!18308
\| *	Merge branch 'fix/gb/fix-pipeline-statuses-illustrations' into 'master'	Marin Jankovski	2018-04-12	5	-3/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix empty state for build that does not have a trace Closes #45204 See merge request gitlab-org/gitlab-ce!18278
\| *	Merge branch 'fix/wiki-find-file-gitaly' into 'master'	Robert Speicher	2018-04-12	4	-3/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix finding wiki file when Gitaly is enabled Closes gitaly#1126 See merge request gitlab-org/gitlab-ce!18317
\| *	Merge branch 'ide-markdown-temp-file-fix' into 'master'	Tim Zallmann	2018-04-12	3	-12/+50
\| \| \| \| \| \| \| \| \| \|	Fixed markdown preview in IDE not working for new files See merge request gitlab-org/gitlab-ce!18287
\| *	Merge remote-tracking branch 'origin/10-7-stable' into 10-7-stable-prepare-rc5	James Lopez	2018-04-12	3	-11/+33
\| \|\ \| \|/ \|/\|
* \|	Update VERSION to 10.7.0-rc4v10.7.0-rc4	James Lopez	2018-04-11	1	-1/+1
\| \|
* \|	Merge branch 'revert-e9e800f5' into 'master'	Marin Jankovski	2018-04-11	4	-104/+4
\| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'improve-jobs-queuing-time-metric' into 'master'" See merge request gitlab-org/gitlab-ce!18276
* \|	Merge branch 'fix/gb/fix-variables-collection-item-file' into 'master'	Kamil Trzciński	2018-04-11	2	-10/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix file-specific variables collection item option Closes gitlab-ee#5444 See merge request gitlab-org/gitlab-ce!18307
\| *	Merge branch '10-7-stable' into 10-7-stable-prepare-rc4	Robert Speicher	2018-04-10	1	-1/+1
\| \|\ \| \|/ \|/\|
* \|	Update VERSION to 10.7.0-rc3v10.7.0-rc3	Robert Speicher	2018-04-10	1	-1/+1
\| \|
* \|	Merge branch 'sh-fix-recaptcha-test' into 'master'	Stan Hu	2018-04-10	2	-4/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the reCAPTCHA spec failures by not rendering the widget in test mode Closes #45138 See merge request gitlab-org/gitlab-ce!18235
\| *	Merge branch 'gitaly-0.95.0' into 'master'	Sean McGivern	2018-04-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	Use Gitaly 0.95.0 See merge request gitlab-org/gitlab-ce!18256
\| *	Merge branch 'update_vendored_gitlab_ci_yml_for_auto_devops' into 'master'	Robert Speicher	2018-04-10	1	-11/+42
\| \| \| \| \| \| \| \| \| \|	Update vendored .gitlab-ci.yml for Auto-Devops See merge request gitlab-org/gitlab-ce!18289
\| *	Merge branch 'ab-37125-assigned-issues-query' into 'master'	Yorick Peterse	2018-04-10	2	-4/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce complexity of issuable finder query. Closes #37125 See merge request gitlab-org/gitlab-ce!18219
\| *	Merge branch 'revert-e9e800f5' into 'master'	Marin Jankovski	2018-04-10	4	-104/+4
\| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'improve-jobs-queuing-time-metric' into 'master'" See merge request gitlab-org/gitlab-ce!18276
\| *	Merge branch ↵	Yorick Peterse	2018-04-10	22	-50/+188
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	'fix-n-plus-one-when-getting-notification-settings-for-recipients' into 'master' Use Goldiloader for handling N+1 queries See merge request gitlab-org/gitlab-ce!18217
\| *	Merge branch 'deploy-tokens-container-registry-specs' into 'master'	Kamil Trzciński	2018-04-10	5	-12/+165
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Verify that deploy token has valid access when pulling container registry image Closes #45148 See merge request gitlab-org/gitlab-ce!18260
\| *	Merge branch 'gitlab-shell-7.1.2' into 'master'	Douwe Maan	2018-04-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	Use gitlab-shell 7.1.2 See merge request gitlab-org/gitlab-ce!18258
\| *	Merge branch 'sh-fix-issue-45152' into 'master'	Grzegorz Bizon	2018-04-10	3	-4/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix undefined method `one?` when pushing to an existing merge request Closes #45152 See merge request gitlab-org/gitlab-ce!18243
\| *	Merge branch 'sh-handle-legacy-archive-requests' into 'master'	Douwe Maan	2018-04-10	2	-2/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle legacy repository archive requests with no ref given Closes #45154 See merge request gitlab-org/gitlab-ce!18246
\| *	Merge remote-tracking branch 'origin/master' into 10-7-stable-prepare-rc310-7-stable-prepare-rc3	James Lopez	2018-04-09	372	-9913/+15665
\| \|\ \|/ /
\| *	Merge branch 'winh-badges-docs' into 'master'	Douwe Maan	2018-04-08	6	-3/+83
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add user documentation for badges Closes #41174 and #41176 See merge request gitlab-org/gitlab-ce!18200
\| \| *	Add user documentation for badges	Winnie Hellmann	2018-04-08	6	-3/+83
\| \|/
\| *	Merge branch 'winh-41174-projects-groups-badges-ui' into 'master'	Douwe Maan	2018-04-08	46	-13/+3021
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Projects and groups badges settings UI Closes #41174 and #41176 See merge request gitlab-org/gitlab-ce!17114
\| \| *	Projects and groups badges settings UI	Francisco Javier López	2018-04-08	46	-13/+3021
\| \|/
\| *	Merge branch '31591-project-deploy-tokens-to-allow-permanent-access' into ↵	Kamil Trzciński	2018-04-07	47	-38/+1010
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Create Project Deploy Tokens to allow permanent access to repo and registry Closes #31591 See merge request gitlab-org/gitlab-ce!17894
\| \| *	Use proper auth_scope for deploy token	Kamil Trzciński	2018-04-07	2	-3/+3
\| \| \|
\| \| *	Handle limit for datetime attributes on MySQL	Mayra Cabrera	2018-04-06	12	-55/+89
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The TIMESTAMP data type is used for values that contain both date and time parts. TIMESTAMP has a range of '1970-01-01 00:00:01' UTC to '2038-01-19 03:14:07' UTC. A Forever lib class was included to handle future dates for PostgreSQL and MySQL, also changes were made to DeployToken to enforce Forever.date Also removes extra conditional from JwtController