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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Extract wip quick action to a shared example59570-wip-quick-action	Alexandru Croitor	2019-04-05	2	-47/+44
\|
*	Merge branch 'duplicate-related-mrs' into 'master'	Michael Kozono	2019-04-05	1	-0/+12
\|\ \| \| \| \| \| \| \| \|	Remove duplicates from issue related merge requests See merge request gitlab-org/gitlab-ce!27067
\| *	Remove duplicates from issue related merge requestsduplicate-related-mrs	Alexandru Croitor	2019-04-05	1	-0/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove duplicates returned by Issues#related_merge_requests API that relies on ReferencedMergeRequestsService which returns 2 arrays one of related MRs and one of related MRs that close the issue(i.e. a subset of first one). We only need related MRs in this case so just pick the first array.
* \|	Improve diff navigation header	Sam Bigelow	2019-04-05	4	-5/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Compare versions header is full width except in the unified diff mode with no tree sidebar - Bar is always full width, but the content within stays centered when unified and no tree sidebar - File header is the same height as the "Compare versions header" - aligns with the design system grid guidelines => 56px - Diff file headers use a button group, switch icon order to open file externally being the last option, all buttons will become icon buttons (icon delivery by @dimitrieh) - If a file header becomes sticky no rounded corner/double border problem is visible anymore
* \|	Merge branch 'winh-ee-environment-variable' into 'master'	Mike Greiling	2019-04-05	1	-3/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename environment variable EE to IS_GITLAB_EE Closes #60080 See merge request gitlab-org/gitlab-ce!27044
\| * \|	Rename environment variable EE to IS_GITLAB_EEwinh-ee-environment-variable	Winnie Hellmann	2019-04-05	1	-3/+3
\| \| \|
* \| \|	Add part of needed code	Gosia Ksionek	2019-04-05	11	-4/+269
\| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add columns to store project creation settings Add project creation level column in groups and default project creation column in application settings Remove obsolete line from schema Update migration with project_creation_level column existence check Rename migrations to avoid conflicts Update migration methods Update migration method
* \|	Merge branch ↵	Filipa Lacerda	2019-04-05	6	-35/+364
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'ce-9262-move-project-search-bar-into-modal-dialog-on-operations-dashboard-page' into 'master' CE backport: Add reusable project_selector component See merge request gitlab-org/gitlab-ce!25036
\| * \|	Make corrections to address review feedbackce-9262-move-project-search-bar-into-modal-dialog-on-operations-dashboard-page	mfluharty	2019-04-02	4	-172/+146
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor tests to follow conventions Add XSS test Eliminate a few unnecessary lines, comments, and parameters Use Vue.set for nested state changes
\| * \|	Add reusable project_selector component	Nathan Friend	2019-04-02	5	-10/+365
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit adds a resuable UI component that allows a user to search for a project name, shows the search results, and allows the user to select one or more projects. This component communicates with its parent using props and events. This component was originally created for use in the EE-specific "Operations Dashboard" page, but it is applicable for CE use cases as well, and so was added as a CE shared component. In addition, some logic was extracted from the frequent_items_list_item component into shared filters to avoid logic duplication.
* \| \|	Add checkbox to choose to create new list when creating new label	Tucker Chapman	2019-04-05	2	-1/+19
\| \| \|
* \| \|	Merge branch 'port-6539-extract-ee-specific-code' into 'master'	Robert Speicher	2019-04-05	1	-0/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extract EE specific files/lines for quick actions tests See merge request gitlab-org/gitlab-ce!26872
\| * \| \|	Extract EE specific files/lines for quick actions testsport-6539-extract-ee-specific-code	Alexandru Croitor	2019-04-03	1	-0/+1
\| \|/ /
* \| \|	Merge branch 'revert-3962b00b' into 'master'	Andreas Brandl	2019-04-05	64	-2206/+22
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'if-57131-external_auth_to_ce' into 'master'" See merge request gitlab-org/gitlab-ce!27051
\| * \| \|	Revert "Merge branch 'if-57131-external_auth_to_ce' into 'master'"	Andreas Brandl	2019-04-05	64	-2206/+22
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !26823
* \| \| \|	Merge branch 'revert-39eb16aa' into 'master'	Sean McGivern	2019-04-05	2	-30/+37
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'require-all-templates-to-include-default-stages' into 'master'" See merge request gitlab-org/gitlab-ce!27053
\| * \| \| \|	Revert "Merge branch 'require-all-templates-to-include-default-stages' into ↵	Sean McGivern	2019-04-05	2	-30/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master'" This reverts merge request !26954
* \| \| \| \|	Merge branch '57482-shortcut-to-create-merge-request-from-web-ide' into 'master'	Phil Hughes	2019-04-05	4	-29/+155
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Shortcut to create merge request from Web IDE" Closes #57482 See merge request gitlab-org/gitlab-ce!26792
\| * \| \| \| \|	Shortcut to create MR in web IDE57482-shortcut-to-create-merge-request-from-web-ide	Sam Bigelow	2019-04-04	4	-29/+155
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Before the user had to choose between committing to a new branch, committing to a new branch AND creating an MR, or committing to the current branch regardless of whether or not it already has an MR. This commit separates the creation of an MR from whether or not they commit to an existing or new branch
* \| \| \| \| \|	Merge branch '57668-create-file-from-url' into 'master'	Phil Hughes	2019-04-05	4	-13/+223
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-13/+206
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+17
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'allow-ref-name-caching-projects-controller' into 'master'	Douglas Barbosa Alexandre	2019-04-05	2	-0/+6
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-0/+6
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reduces a handful of duplicate FindCommit calls while viewing the projects and commits pages.
* \| \| \| \| \|	Removes the undescriptive CI Charts header	Dimitrie Hoekstra	2019-04-05	1	-3/+0
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Additional changes include removal of translation records Added changelog
* \| \| \| \|	Move Contribution Analytics related spec in ↵	Imre Farkas	2019-04-05	64	-22/+2206
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-0/+26
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-0/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Truncate existing users names which exceed 128 characters Include test for truncating users names
* \| \| \| \| \|	Fall back to project repository type by default	Bob Van Landuyt	2019-04-05	2	-2/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	8	-41/+182
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE] Add mutually exclusive labels See merge request gitlab-org/gitlab-ce!26804
\| * \| \| \| \| \|	Fix scoped_labels feature check	Jan Provaznik	2019-04-04	2	-2/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Check this feature per project/group instead of globally. Also do not show tooltip if it's disabled.
\| * \| \| \| \| \|	[frontend] backport of scoped labels	Rajat Jain	2019-04-04	6	-39/+161
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-37/+30
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-37/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 'bump_kubernetes_1_11_9' into 'master'	Douwe Maan	2019-04-05	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+1
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	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	4	-2/+41
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-2/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replaces blockquote fences with \n, keeping the line numbering intact.
* \| \| \| \| \| \| \| \|	Merge branch '58375-api-controller' into 'master'	Sean McGivern	2019-04-05	2	-0/+153
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	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	1	-1/+14
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Remove permitting of params	rpereira2	2019-04-05	1	-9/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- It is now being done in ProxyService class.
\| * \| \| \| \| \| \| \| \|	Add spec for invalid environment id	rpereira2	2019-04-05	1	-0/+10
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Make filter params specs more readable	Peter Leitzen	2019-04-05	1	-5/+7
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Streamline controller specs	Peter Leitzen	2019-04-05	1	-83/+74
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add a Prometheus API per environment	rpereira2	2019-04-05	2	-0/+148
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
\| * \| \| \| \| \| \| \| \|	Some code improvements58375-proxy-service	rpereira2	2019-04-04	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Use strong_memoize for prometheus_adapter since it can be nil in some cases. - Do not phrase spec descriptions with 'should'.