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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '57668-create-file-from-url' into 'master'	Phil Hughes	2019-04-05	8	-17/+271
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Support creating new file from URL in the Web IDE" Closes #57668 See merge request gitlab-org/gitlab-ce!26622
\| *	Set tree list accounting for already-opened files57668-create-file-from-url	Denys Mishunov	2019-04-04	6	-17/+249
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since we can create files from URL now, this means that these files will not exist in the tree returned from API: they exist on the client only before the first commit. In order to still show the newly-created files in the tree, we should not override the tree, but merge the tree existing on the client and the one coming from API. Changelog entry Moved trees merging into mutation
\| *	Create a new file if URL references non-existent one	Denys Mishunov	2019-04-04	2	-0/+22
\| \|
* \|	Merge branch 'winh-jest-ee_else_ce' into 'master'	Phil Hughes	2019-04-05	1	-4/+7
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add ee_else_ce to Jest config See merge request gitlab-org/gitlab-ce!27040
\| * \|	Add ee_else_ce to Jest configwinh-jest-ee_else_ce	Winnie Hellmann	2019-04-05	1	-4/+7
\| \| \|
* \| \|	Merge branch 'allow-ref-name-caching-projects-controller' into 'master'	Douglas Barbosa Alexandre	2019-04-05	5	-0/+15
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable FindCommit caching for project and commits pages See merge request gitlab-org/gitlab-ce!27048
\| * \| \|	Enable FindCommit caching for project and commits pages	Stan Hu	2019-04-05	5	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reduces a handful of duplicate FindCommit calls while viewing the projects and commits pages.
* \| \| \|	Merge branch 'remove-ci-charts-undescriptive-header' into 'master'	Filipa Lacerda	2019-04-05	47	-139/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes the undescriptive CI Charts header Closes #59905 See merge request gitlab-org/gitlab-ce!26869
\| * \| \| \|	Removes the undescriptive CI Charts header	Dimitrie Hoekstra	2019-04-05	47	-139/+5
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Additional changes include removal of translation records Added changelog
* \| \| \|	Merge branch 'mc/fix/ci-variable-qa' into 'master'	Sanad Liaquat	2019-04-05	1	-5/+4
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove spaces from variable name in CI variable QA test Closes gitlab-org/quality/nightly#91 See merge request gitlab-org/gitlab-ce!27042
\| * \| \|	Remove spaces from variable namemc/fix/ci-variable-qa	Matija Čupić	2019-04-05	1	-5/+4
\| \| \| \|
* \| \| \|	Merge branch 'if-57131-external_auth_to_ce' into 'master'	Andreas Brandl	2019-04-05	103	-35/+3058
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE port of Move "Authorize project access with external service" to Core See merge request gitlab-org/gitlab-ce!26823
\| * \| \| \|	Move Contribution Analytics related spec in ↵	Imre Farkas	2019-04-05	103	-35/+3058
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	spec/features/groups/group_page_with_external_authorization_service_spec to EE
* \| \| \|	Merge branch '57493-add-limit-to-user-name' into 'master'	Andreas Brandl	2019-04-05	5	-1/+53
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a length limit of 128 char to the user name field See merge request gitlab-org/gitlab-ce!26146
\| * \| \| \|	Add limit of 128 characters to users name57493-add-limit-to-user-name	Brandon Labuschagne	2019-04-05	5	-1/+53
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Truncate existing users names which exceed 128 characters Include test for truncating users names
* \| \| \| \|	Merge branch 'docs/point-to-new-chart-links' into 'master'	Marcia Ramos	2019-04-05	12	-931/+46
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Redirect Kubernetes installation to the charts docs Closes #58870 See merge request gitlab-org/gitlab-ce!26159
\| * \| \| \| \|	Redirect Kubernetes installation to the charts docsdocs/point-to-new-chart-links	Achilleas Pipinellis	2019-03-19	12	-931/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	With the advent of the new chart docs, we should deprecate the old ones and redirect them to the new ones.
* \| \| \| \| \|	Merge branch 'docs-run-pipeline-on-merge-ref' into 'master'	Marcia Ramos	2019-04-05	4	-12/+63
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs for combined ref pipelines Closes #59495 and gitlab-ee#7380 See merge request gitlab-org/gitlab-ce!26762
\| * \| \| \| \| \|	Docs for use combined merge refs with merge request pipelines	Shinya Maeda	2019-04-05	4	-12/+63
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	pdate
* \| \| \| \| \|	Merge branch 'bvl-fix-git-pull-repo-when-project-does-not-exist' into 'master'	Douwe Maan	2019-04-05	5	-7/+30
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fall back to project repository type by default Closes #60007 See merge request gitlab-org/gitlab-ce!27003
\| * \| \| \| \| \|	Fall back to project repository type by default	Bob Van Landuyt	2019-04-05	5	-7/+30
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes sure that we always have a repository type when trying to parse a repository from a path. This is needed because sometimes we want to perform access checks as if the project already existed, for example when creating a project on push. Before this we were only doing that when accessing git over http, this makes sure it also works correctly when accessing git over SSH
* \| \| \| \| \|	Merge branch 'keyval-labels' into 'master'	Sean McGivern	2019-04-05	36	-99/+573
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE] Add mutually exclusive labels See merge request gitlab-org/gitlab-ce!26804
\| * \| \| \| \| \|	Fix scoped links styling on milestones page	Jan Provaznik	2019-04-05	1	-2/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix labels selection, escape text in templateskeyval-labels	Kushal Pandya	2019-04-05	1	-9/+11
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix scoped_labels feature check	Jan Provaznik	2019-04-04	4	-5/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Check this feature per project/group instead of globally. Also do not show tooltip if it's disabled.
\| * \| \| \| \| \|	[backend] backport of scoped labels	Jan Provaznik	2019-04-04	14	-31/+78
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Scoped labels in EE require additional changes in CE code.
\| * \| \| \| \| \|	[frontend] backport of scoped labels	Rajat Jain	2019-04-04	20	-65/+467
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Scoped labels in EE require additional changes in CE code.
* \| \| \| \| \|	Merge branch 'require-all-templates-to-include-default-stages' into 'master'	Sean McGivern	2019-04-05	18	-50/+64
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Require all templates to use default stages Closes #59992 See merge request gitlab-org/gitlab-ce!26954
\| * \| \| \| \| \|	Require all templates to use default stages	Kamil Trzciński	2019-04-05	18	-50/+64
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Our templates are free to override the 'stages:'. However, they should follow the convention to always include 'build', 'test', 'deploy' which are defaults when not defined.
* \| \| \| \| \| \|	Merge branch 'sh-update-rails-5.0.7.2' into 'master'	Robert Speicher	2019-04-05	3	-36/+41
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Rails to 5.0.7.2 Closes #58963 See merge request gitlab-org/gitlab-ce!27022
\| * \| \| \| \| \|	Upgrade globalid and i8n gems to match Rails 5.0.7.2sh-update-rails-5.0.7.2	Stan Hu	2019-04-04	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update Rails to 5.0.7.2	Stan Hu	2019-04-04	3	-34/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes a number of issues as described in https://weblog.rubyonrails.org/releases/. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58963
* \| \| \| \| \| \|	Merge branch 'gitaly-version-v1.32.0' into 'master'	Douwe Maan	2019-04-05	2	-1/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade Gitaly to v1.32.0 See merge request gitlab-org/gitlab-ce!26989
\| * \| \| \| \| \| \|	Upgrade Gitaly to v1.32.0	GitalyBot	2019-04-05	2	-1/+6
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'bump_kubernetes_1_11_9' into 'master'	Douwe Maan	2019-04-05	3	-3/+8
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump Helm to 2.13.1 and kubectl to 1.11.9 See merge request gitlab-org/gitlab-ce!26991
\| * \| \| \| \| \| \|	Bump Helm to 2.13.1 and kubectl to 1.11.9bump_kubernetes_1_11_9	Thong Kuah	2019-04-05	3	-3/+8
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '59570-remove-due-date-quick-action' into 'master'	Sean McGivern	2019-04-05	2	-34/+27
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extract remove due date spec to shared example Closes #59570 See merge request gitlab-org/gitlab-ce!26922
\| * \| \| \| \| \| \|	Extract remove due date spec to shared example59570-remove-due-date-quick-action	Alexandru Croitor	2019-04-05	2	-34/+27
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '58717-checkbox-cannot-be-checked-if-a-blockquote-is-above' ↵	Sean McGivern	2019-04-05	6	-3/+49
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Checkbox cannot be checked if preceded by a blockquote Closes #58717 See merge request gitlab-org/gitlab-ce!26937
\| * \| \| \| \| \| \| \|	Fenced blockquotes to not change source line pos58717-checkbox-cannot-be-checked-if-a-blockquote-is-above	Brett Walker	2019-04-04	6	-3/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replaces blockquote fences with \n, keeping the line numbering intact.
* \| \| \| \| \| \| \| \|	Merge branch '58375-api-controller' into 'master'	Sean McGivern	2019-04-05	7	-0/+204
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a prometheus proxy API per environment Closes #58375 See merge request gitlab-org/gitlab-ce!26841
\| * \| \| \| \| \| \| \| \|	Use environment_params when defining expected_params58375-api-controller	rpereira2	2019-04-05	1	-10/+8
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Allow message strings to be translated	rpereira2	2019-04-05	2	-2/+8
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Do not hardcode project and namespace name in url	rpereira2	2019-04-05	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The names can change in different runs of the spec.
\| * \| \| \| \| \| \| \| \|	Call permit! on params	rpereira2	2019-04-05	2	-2/+15
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Remove permitting of params	rpereira2	2019-04-05	2	-21/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- It is now being done in ProxyService class.
\| * \| \| \| \| \| \| \| \|	Add spec for invalid environment id	rpereira2	2019-04-05	2	-2/+11
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Make filter params specs more readable	Peter Leitzen	2019-04-05	1	-5/+7
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Streamline controller specs	Peter Leitzen	2019-04-05	2	-87/+76
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add a Prometheus API per environment	rpereira2	2019-04-05	6	-0/+203
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The api will proxy requests to the environment's prometheus server. The Prometheus::ProxyService class can be reused when we add support for group prometheus servers.