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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'winh-fix-frontend-link-docs' into 'master'rails5-master	Annabel Gray	2018-07-09	1	-3/+3
\|\ \| \| \| \| \| \| \| \|	Fix link to frontend in handbook See merge request gitlab-org/gitlab-ce!20504
\| *	Fix link to frontend in handbook	Winnie Hellmann	2018-07-09	1	-3/+3
\|/
*	Merge branch 'sh-shorten-filenames-changelog' into 'master'	Felipe Artur	2018-07-09	1	-0/+0
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Shorten CHANGELOG filename to avoid breaking ecryptfs users Closes #49038 See merge request gitlab-org/gitlab-ce!20512
\| *	Shorten CHANGELOG filename to avoid breaking ecryptfs users	Stan Hu	2018-07-09	1	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Closes #49038
* \|	Replace ↵	Felipe Artur	2018-07-09	0	-0/+0
\|/ \| \| \|	48976-rails5-invalid-single-table-inheritance-type-group-is-not-a-subclass-of-gitlab-backgroundmigration-fixcrossprojectlabellinks-namespace.yml
*	Merge branch 'minor-update-ssh-key-docs' into 'master'	Achilleas Pipinellis (🌴 July 10 - July 20 🌴)	2018-07-09	1	-0/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Add additional headline for Adding SSH keys to GitLab Closes #46395 See merge request gitlab-org/gitlab-ce!20507
\| *	Add additional headline for Adding SSH keys to GitLab	Andreas Kämmerle	2018-07-09	1	-0/+2
\| \|
* \|	Merge branch 'winh-waiting-in-tests-docs' into 'master'	Tim Zallmann	2018-07-09	1	-0/+4
\|\ \ \| \|/ \|/\| \| \| \| \|	Document that we don't want to wait in tests See merge request gitlab-org/gitlab-ce!20502
\| *	Document that we don't want to wait in testswinh-waiting-in-tests	Winnie Hellmann	2018-07-09	1	-0/+4
\| \|
* \|	Merge branch 'od/41671' into 'master'	Mike Greiling	2018-07-09	3	-1/+30
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Preserve the correct start/due dates on milestones when editing Closes #41671 See merge request gitlab-org/gitlab-ce!20279
\| * \|	save current date before Pikaday init	Orlando Del Aguila	2018-06-29	3	-1/+30
\| \| \|
* \| \|	Merge branch 'update-rubocop'	Sean McGivern	2018-07-09	220	-493/+459
\|\ \ \
\| * \| \|	Remove useless return	Lin Jen-Shin	2018-07-09	1	-1/+1
\| \| \| \|
\| * \| \|	Use latest gitlab-styles	Lin Jen-Shin	2018-07-09	3	-10/+4
\| \| \| \|
\| * \| \|	Resolve Naming/UncommunicativeMethod	Lin Jen-Shin	2018-07-09	26	-156/+156
\| \| \| \|
\| * \| \|	Use stable gitlab-styles and eliminate offenses	Lin Jen-Shin	2018-07-09	14	-35/+29
\| \| \| \|
\| * \| \|	Updates from `rubocop -a`	Lin Jen-Shin	2018-07-09	188	-309/+279
\| \| \| \|
\| * \| \|	Update rubocop to get rid of a warning in other MR	Lin Jen-Shin	2018-07-09	5	-24/+32
\| \| \| \|
* \| \| \|	Merge branch 'dz-remote-badges-from-readme' into 'master'	Rémy Coutable	2018-07-09	1	-6/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove badges from README.md in favor of GitLab badges feature Closes #48895 See merge request gitlab-org/gitlab-ce!20447
\| * \| \| \|	Remove badges from README.md in favor of GitLab badges feature	Dmitriy Zaporozhets	2018-07-06	1	-6/+0
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master' into 'master'	Rémy Coutable	2018-07-09	1	-0/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Request to be a proofreader. See merge request gitlab-org/gitlab-ce!19423
\| * \| \| \| \|	Request to be a proofreader.	Yi-Jyun Pan	2018-07-09	1	-0/+1
\|/ / / / /
* \| \| \| \|	Merge branch 'rails5-mysql-fix-pr-importer-spec' into 'master'	Rémy Coutable	2018-07-09	2	-3/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails5 mysql fix milliseconds problem in pull request importer spec See merge request gitlab-org/gitlab-ce!20475
\| * \| \| \| \|	Rails5 mysql fix milliseconds problem in pull request importer spec	Jasper Maes	2018-07-08	2	-3/+8
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'gitaly-update-branch' into 'master'	Robert Speicher	2018-07-09	3	-1/+64
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use Gitaly's OperationService.UserUpdateBranch RPC Closes gitaly#1252 See merge request gitlab-org/gitlab-ce!20231
\| * \| \| \| \| \|	Use Gitaly's OperationService.UserUpdateBranch RPC	Alejandro Rodríguez	2018-07-08	3	-1/+64
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'use-correct-script-location' into 'master'	Rémy Coutable	2018-07-09	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use the correct script location for the build trigger script See merge request gitlab-org/gitlab-ce!20454
\| * \| \| \| \| \| \|	Use the correct script location for the build trigger script	DJ Mountney	2018-07-06	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'upgrade-hamlit-for-ruby25' into 'master'	Rémy Coutable	2018-07-09	5	-12/+17
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update hamlit to fix ruby 2.5 incompatibilities, fixes #42045 Closes #42045 See merge request gitlab-org/gitlab-ce!20315
\| * \| \| \| \| \| \| \|	Update hamlit to fix ruby 2.5 incompatibilities, fixes #42045	Matthew Dawson	2018-07-08	5	-12/+17
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also update the hook logs to escape the contents properly, as the :plain filter does not do html escaping.
* \| \| \| \| \| \| \|	Merge branch 'fix-search-bar' into 'master'	Mike Greiling	2018-07-09	2	-1/+9
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix search bar text input alignment Closes #48288 See merge request gitlab-org/gitlab-ce!20155
\| * \| \| \| \| \| \| \|	Fix search bar text input alignment	Clement Ho	2018-07-09	2	-1/+9
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'rails5-fix-48977' into 'master'	Rémy Coutable	2018-07-09	3	-3/+18
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails5 fix mysql milliseconds problem in specs Closes #48977 See merge request gitlab-org/gitlab-ce!20464
\| * \| \| \| \| \| \| \|	Rails5 fix mysql milliseconds problem in specs	Jasper Maes	2018-07-07	3	-3/+18
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'rails5-update-gemfile-lock' into 'master'	Rémy Coutable	2018-07-09	2	-5/+10
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Gemfile.rails5.lock with latest Gemfile.lock changes See merge request gitlab-org/gitlab-ce!20466
\| * \| \| \| \| \| \| \|	Update Gemfile.rails5.lock with latest Gemfile.lock changes	Jasper Maes	2018-07-07	2	-5/+10
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge branch ↵	Sean McGivern	2018-07-09	1	-2/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'48970-markdown-wiki-help-incorrect-in-how-wiki-pages-are-rendered' into 'master' Resolve "Markdown help incorrect in how wiki pages are rendered" Closes #48970 See merge request gitlab-org/gitlab-ce!20459
\| * \| \| \| \| \| \| \|	specify that wiki pags are rendered with Redcarpet	Brett Walker	2018-07-06	1	-2/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'docs-clarify-pages-domain' into 'master'	Achilleas Pipinellis (🌴 July 10 - July 20 🌴)	2018-07-09	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: make it clear that you need a completely separate domain for Pages Closes #31961 See merge request gitlab-org/gitlab-ce!20369
\| * \| \| \| \| \| \| \| \|	Docs: make it clear that you need a completely separate domain for Pages	Marcia Ramos	2018-07-09	1	-2/+2
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'jprovazn-upload-symlink' into 'master'	Kamil Trzciński	2018-07-09	4	-3/+36
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add FileUploader.root to allowed upload paths Closes gitlab-qa#291 See merge request gitlab-org/gitlab-ce!20472
\| * \| \| \| \| \| \| \|	Added test and used Array() instead of .wrap	Jan Provaznik	2018-07-09	2	-1/+28
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add FileUploader.root to allowed upload paths	Jan Provaznik	2018-07-08	3	-3/+9
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently we check if uploaded file is under `Gitlab.config.uploads.storage_path`, the problem is that uploads are placed in `uploads` subdirectory which is symlink. In allow_path? method we check real (expanded) paths, which causes that `Gitlab.config.uploads.storage_path` is expaned into symlink path and there is a mismatch with upload file path. By adding `Gitlab.config.uploads.storage_path/uploads` into allowed paths, this path is expaned during path check. `Gitlab.config.uploads.storage_path` is left there intentionally in case some uploader wouldn't use `uploads` subdir.
* \| \| \| \| \| \| \|	Merge branch 'DustinU/fix/sign-in-button-text-48917' into 'master'	Douwe Maan	2018-07-09	2	-1/+27
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show "Sign in" instead of "Sign in / Register" when sign up is disabled See merge request gitlab-org/gitlab-ce!20474
\| * \| \| \| \| \| \| \|	Show "Sign in" instead of "Sign in / Register" when sign up is disabled	Dustin Utecht	2018-07-09	2	-1/+27
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'sh-fix-issue-47797-ce' into 'master'	Douwe Maan	2018-07-09	3	-0/+36
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix handling of annotated tags when Gitaly is not in use Closes #47797 See merge request gitlab-org/gitlab-ce!20497
\| * \| \| \| \| \| \| \|	Fix handling of annotated tags when Gitaly is not in use	Stan Hu	2018-07-09	3	-0/+36
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Attempting to view an annotated tag in the TreeController would result in `NoMethodError: undefined method 'tree'` when Rugged was in use. `Blob#find_by_rugged` assumes that the ref is a true. Using the commit ID ensures that the right ref is being used. Note that in 11.1, `Blob#find` no longer uses Rugged, so this is only a bug in 11.0. Closes gitlab-org/gitlab-ce#47797
* \| \| \| \| \| \| \|	Merge branch '48960-namespace-diff-module' into 'master'	Tim Zallmann	2018-07-09	12	-13/+18
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Use namespaped module for diffs" Closes #48960 See merge request gitlab-org/gitlab-ce!20442
\| * \| \| \| \| \| \|	Call correct action in spec	Filipa Lacerda	2018-07-09	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' into 48960-namespace-diff-module	Filipa Lacerda	2018-07-09	29	-400/+286
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: Resolve "MR refactor: Performance costs of main element with `v-if`" Add documentation on private projects Make blob and other RPC's mandatory Removed return statements from prettier script Add missing strings to `locale/gitlab.pot` Update `gettext:updated_check` regenerate pot file Include wget in apk add command [Rails5] Fix 'Invalid single-table inheritance type: Group is not a subclass of Gitlab::BackgroundMigration::FixCrossProjectLabelLinks::Namespace' Updated color Update doc on new option to add README when creating a project Make more things mandatory Updated (color of indent guide in Web IDE Make all Gitaly diff flags mandatory