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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix spelling and other minor improvementsdocs/fix-spelling-in-internationalisation-section	Evan Read	2019-01-31	3	-5/+5
\|
*	Merge branch 'docs/update-terminal-docs' into 'master'	Evan Read	2019-01-31	1	-5/+6
\|\ \| \| \| \| \| \| \| \|	Update web terminal note for shared runners See merge request gitlab-org/gitlab-ce!24754
\| *	Update web terminal note for shared runners	Steve Azzopardi	2019-01-30	1	-5/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The current documentation suggests that a user can not use his own runner for a specific group or project. At first I thought this was the case but it is not true, since we do allow websocket connections on GitLab.com, this was discovered as part of the investigation on https://gitlab.com/gitlab-org/gitlab-ce/issues/52611.
* \|	Merge branch 'highlight-environment-args' into 'master'	Evan Read	2019-01-31	1	-3/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Highlight when CI_ENVIRONMENT_* environment args are present See merge request gitlab-org/gitlab-ce!24484
\| * \|	Highlight when CI_ENVIRONMENT_* environment args are present	Oliver Bristow	2019-01-30	1	-3/+3
\| \| \|
* \| \|	Merge branch '56764-poor-ui-on-milestone-validation-error-page' into 'master'	Clement Ho	2019-01-31	4	-11/+20
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix CSS grid on a new Project/Group Milestone Closes #56764 See merge request gitlab-org/gitlab-ce!24614
\| * \| \|	Fix CSS grid on a new Project/Group Milestone	Takuya Noguchi	2019-01-30	4	-11/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* \| \| \|	Revert "Merge branch '56398-fix-cluster-installation-loading-state' into ↵	Robert Speicher	2019-01-30	6	-76/+125
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master'" This reverts merge request !24485
* \| \| \|	Merge branch 'patch-38' into 'master'	Tim Zallmann	2019-01-30	2	-1/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix display comment avatars issue in IE 11 Closes #56931 See merge request gitlab-org/gitlab-ce!24777
\| * \| \| \|	fix display comment avatars issue in IE 11	Gokhan Apaydin	2019-01-30	2	-1/+7
\|/ / / /
* \| \| \|	Merge branch 'mj/security-release-process' into 'master'	Robert Speicher	2019-01-30	4	-22/+47
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create security release MR template Closes gitlab-org/release/framework#168, gitlab-org/release/framework#166, and gitlab-org/release/framework#167 See merge request gitlab-org/gitlab-ce!24725
\| * \| \| \|	Address docs review feedback	Marin Jankovski	2019-01-29	1	-3/+3
\| \| \| \| \|
\| * \| \| \|	Create security release MR template	Marin Jankovski	2019-01-28	4	-22/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve existing issue templates for security releases
* \| \| \| \|	Merge branch 'feature/gb/pass-bridge-variables-to-downstream' into 'master'	Douwe Maan	2019-01-30	4	-51/+75
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pass build variables downstream / CE port See merge request gitlab-org/gitlab-ce!24762
\| * \| \| \| \|	Simplify relation between a build and metadata	Grzegorz Bizon	2019-01-29	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This removes erroneously defined polymorphic association, because specifying `belongs_to` relationship with a class that already supports polymorphic associations works out-of-the-box.
\| * \| \| \| \|	Extract processable metadata to a separate concern	Grzegorz Bizon	2019-01-29	3	-51/+73
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We extracted implementation of build/bridge metadata attributes to a separate concern, because in EE `Ci::Bridge` also has metadata attributes, and we want to build abstraction for storing values in build metadata table.
\| * \| \| \| \|	Add bridge variables trait to the factory	Grzegorz Bizon	2019-01-29	1	-0/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '56398-fix-cluster-installation-loading-state' into 'master'	Fatih Acet	2019-01-30	6	-125/+76
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix cluster installation processing spinner Closes #56398 See merge request gitlab-org/gitlab-ce!24485
\| * \| \| \| \| \|	Fix cluster installation processing spinner	Jacques Erasmus	2019-01-30	6	-125/+76
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'support-CNG-mirror-2-ce' into 'master'	Lin Jen-Shin	2019-01-30	1	-0/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pass $CI_COMMIT_TAG as GITLAB_TAG to the CNG triggered pipelines See merge request gitlab-org/gitlab-ce!24639
\| * \| \| \| \| \|	Pass $CI_COMMIT_TAG as GITLAB_TAG to the CNG triggered pipelines	Rémy Coutable	2019-01-30	1	-0/+1
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch 'cluster_status_for_ugprading' into 'master'	Grzegorz Bizon	2019-01-30	4	-1/+12
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose app version to frontend See merge request gitlab-org/gitlab-ce!24791
\| * \| \| \| \| \|	Expose app version to frontend	Thong Kuah	2019-01-31	4	-1/+12
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '8688-recursive-pipelines' into 'master'	Sean McGivern	2019-01-30	1	-1/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prefer to use overrides on PipelinesController See merge request gitlab-org/gitlab-ce!24793
\| * \| \| \| \| \| \|	Prefer to use overrides on PipelinesController	Kamil Trzciński	2019-01-30	1	-1/+5
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix/bamboo_api_polymorphism' into 'master'	Grzegorz Bizon	2019-01-30	3	-14/+49
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support bamboo api polymorphism See merge request gitlab-org/gitlab-ce!24680
\| * \| \| \| \| \| \| \|	Support polymorphism of Bamboo REST API results	Alex Lossent	2019-01-30	3	-14/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It may return single result or an array of results
* \| \| \| \| \| \| \| \|	Merge branch ↵	Douglas Barbosa Alexandre	2019-01-30	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'ce-6102-extract-ee-specific-files-lines-for-some-project-ci-views' into 'master' CE: Resolve "Extract EE specific files/lines for some project CI views" See merge request gitlab-org/gitlab-ce!24774
\| * \| \| \| \| \| \| \| \|	Port changes from EE. Remove unused class	Lin Jen-Shin	2019-01-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'an-opentracing-render-tracing' into 'master'	Douwe Maan	2019-01-30	7	-12/+275
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add OpenTracing instrumentation for Action View Render events See merge request gitlab-org/gitlab-ce!24728
\| * \| \| \| \| \| \| \| \| \|	Add OpenTracing instrumentation for Action View Render events	Andrew Newdigate	2019-01-30	7	-12/+275
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This change adds three new instrumentations, driven through rails notifications: render_template.action_view, render_collection.action_view and render_partial.action_view. These can help developers understand why renders are taking a long time which may in turn help them to improve their performance.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs-releases-permissions' into 'master'	Marcia Ramos	2019-01-30	1	-0/+7
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Releases permissions Closes #56471 See merge request gitlab-org/gitlab-ce!24766
\| * \| \| \| \| \| \| \| \| \|	Docs: Releases permissions	Marcia Ramos	2019-01-30	1	-0/+7
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'sh-issue-53419-fix' into 'master'	Rémy Coutable	2019-01-30	6	-7/+37
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Bitbucket Server import not allowing personal projects Closes #53419 See merge request gitlab-org/gitlab-ce!23601
\| * \| \| \| \| \| \| \| \| \|	Fix Bitbucket Server import not allowing personal projects	Stan Hu	2019-01-28	6	-7/+37
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bitbucket Server places personal projects in a namespace called `~username`. This change allows those projects and also strips them from the GitLab namespace. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53419
* \| \| \| \| \| \| \| \| \|	Merge branch 'docs/add-bundler-version' into 'master'	Achilleas Pipinellis	2019-01-30	1	-54/+76
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make supported bundler version clearer and polish topic See merge request gitlab-org/gitlab-ce!24590
\| * \| \| \| \| \| \| \| \| \|	Make supported bundler version clearer and polish topic	Evan Read	2019-01-30	1	-54/+76
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'coding-style-not-visual-style' into 'master'	Sean McGivern	2019-01-30	1	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename issue template from "Add style" to "Coding style" See merge request gitlab-org/gitlab-ce!24788
\| * \| \| \| \| \| \| \| \| \|	Rename issue template from "Add style" to "Coding style"	Lin Jen-Shin	2019-01-30	1	-0/+0
\| \| \|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Because there were a few people thought that's for UI styling...
* \| \| \| \| \| \| \| \| \|	Merge branch 'docs/restore-variable-naming' into 'master'	Achilleas Pipinellis	2019-01-30	18	-56/+61
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Documentation now matches UI copy Closes #56783 See merge request gitlab-org/gitlab-ce!24659
\| * \| \| \| \| \| \| \| \| \|	Documentation now matches UI copy	Evan Read	2019-01-30	18	-56/+61
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'anan-add-MethodCallWithoutArgsParentheses-cop' into 'master'	Lin Jen-Shin	2019-01-30	26	-47/+42
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Re-enable MethodCallWithoutArgsParentheses Cop Closes #56795 See merge request gitlab-org/gitlab-ce!24631
\| * \| \| \| \| \| \| \| \| \|	Re-enable MethodCallWithoutArgsParentheses Cop	Andrew Newdigate	2019-01-29	26	-47/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Re-enables and autocorrects all instances of the Style/MethodCallWithoutArgsParentheses rule
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs/surface-auth-section-link' into 'master'	Achilleas Pipinellis	2019-01-30	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Surface link to auth section index See merge request gitlab-org/gitlab-ce!24787
\| * \| \| \| \| \| \| \| \| \| \|	Surface link to auth section index	Evan Read	2019-01-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch ↵	Achilleas Pipinellis	2019-01-30	1	-6/+6
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'25569-changing-wording-to-delete-when-referring-to-removing-a-branch--docs' into 'master' Change `remove branch` to `delete branch` Closes #25569 See merge request gitlab-org/gitlab-ce!24574
\| * \| \| \| \| \| \| \| \| \| \|	Change `remove branch` to `delete branch`	Sam Bigelow	2019-01-24	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	this is to match `git branch -D` from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23966 This just documents the change
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'sh-disable-nil-user-id-identity-validation' into 'master'	Douwe Maan	2019-01-30	3	-1/+40
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix failed LDAP logins when nil user_id present Closes #56734 See merge request gitlab-org/gitlab-ce!24749
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix failed LDAP logins when nil user_id present	Stan Hu	2019-01-29	3	-1/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a LDAP user signs in the for the first time and if there is an `Identity` object with `user_id` of `nil`, new users will not be able to be register until that entry is cleared because of the way identities are created: 1. First, the User object is built but not saved, so it has no `id`. 2. Then, `user.identities.build(provider: 'ldapmain')` is called, but it does not have an associated `user_id` as a result. 3. `User#save` is called, but the `Identity` validation fails if an existing entry with `user_id` of `nil` already exists. The uniqueness validation for `nil` values doesn't make any sense in this case. We should be enforcing this at the database level with a foreign key constraint. To work around the issue we can validate against the user instead, which does the right thing even when the user isn't saved yet. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56734
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '56379-pipeline-stages-job-action-button-icon-is-not-aligned' ↵	Filipa Lacerda	2019-01-30	2	-2/+7
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Pipeline stages job action button icon is not aligned" Closes #56379 See merge request gitlab-org/gitlab-ce!24577