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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix inability to set visibility_level on project via APIsh-fix-issue-63158	Stan Hu	2019-06-14	1	-1/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Consider the scenario: 1. The default visibility level is set to internal 2. A user attempts to create a private project within a private group Previously this would always fail because default_value_for would overwrite the private visibility setting, no matter what visibility_level were specified. This was happening because default_value_for was confused by the default value of 0 specified by the database schema. default_value_for attempts to assign the default value in the block by checking whether the attribute has changed. The problem is that since the default value by the database was 0, and the user requested 0, this appeared as though no changes were made. As a result, default_value_for would always overwrite the user's preference. To fix this, we remove the use of default_value_for and only set the visibility level to the default application setting when no preference has been given at creation time. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63158
*	Speed up merge request loads by disabling BatchLoader replace_methods	Stan Hu	2019-06-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|	In production, we've seen the rendering times of the merge request widget increase as a result of loading commit data. BatchLoader attempts to call replace_methods on the lazy object, but this has a significant performance penalty for modules that have many methods. Disabling this mode (https://github.com/exAspArk/batch-loader/pull/45) appears to cut load times by about 50% for MergeRequestsController#show. Relates to https://gitlab.com/gitlab-com/gl-infra/infrastructure/issues/6941
*	Merge branch 'sh-omit-blocked-admins-from-notification' into 'master'	Robert Speicher	2019-06-13	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Omit blocked admins from repository check e-mails Closes #63019 See merge request gitlab-org/gitlab-ce!29507
\| *	Omit blocked admins from repository check e-mailssh-omit-blocked-admins-from-notification	Stan Hu	2019-06-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Blocked admins should not receive notifications about failed repository checks. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63019
* \|	Merge branch 'ce-3861-use-serializers-for-project-group-boards' into 'master'	Stan Hu	2019-06-13	4	-1/+23
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Use serialization for project boards See merge request gitlab-org/gitlab-ce!29263
\| * \|	Add `to_json` to `represent` method callce-3861-use-serializers-for-project-group-boards	charlieablett	2019-06-13	1	-1/+1
\| \| \|
\| * \|	Add `to_json` to `represent` method call	charlieablett	2019-06-10	1	-1/+1
\| \| \|
\| * \|	Use serialization for project boards	charlieablett	2019-06-06	4	-1/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Add serializers and Grape::Entity - Replace to_json - Add specs
* \| \|	Disable unnecessary ESLint i18n offences	Brandon Labuschagne	2019-06-13	11	-7/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unnecessary offences include false positives as well as flagged errors which have follow up issues in order to be addressed. Not all issues have been addressed before this being submitted in the spirit of results and iteration.
* \| \|	Refactor for cleaner caching in dashboards	Sarah Yasonik	2019-06-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Opts to cache a full list of cached dashboards to better manage removing items from the cache. This also allows dashboards to be stored in the cache that don't necessarily correspond to a single dashboard yml.
* \| \|	Merge branch '62690-raise-error-when-creating-mr-diff-fails' into 'master'	Douglas Barbosa Alexandre	2019-06-13	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Raise an error if creating the MergeRequestDiff fails See merge request gitlab-org/gitlab-ce!29434
\| * \| \|	Raise an error if creating the MergeRequestDiff fails	Nick Thomas	2019-06-13	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'blob-row-click-to-open' into 'master'	Filipa Lacerda	2019-06-13	1	-0/+3
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	Click file row in repository Vue app to view file See merge request gitlab-org/gitlab-ce!29596
\| * \| \|	Click file row in repository Vue app to view file	Phil Hughes	2019-06-13	1	-0/+3
\| \| \| \|
* \| \| \|	Merge branch 'ce-12091-remove-elasticsearch-lite-project' into 'master'	Sean McGivern	2019-06-13	4	-8/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport changes from 'Partially revert d9cb907c: "Avoid loading objects from DB in ES results"' See merge request gitlab-org/gitlab-ce!29597
\| * \| \| \|	Restore some unrelated changes from d9cb907c	Nick Thomas	2019-06-13	3	-3/+3
\| \| \| \| \|
\| * \| \| \|	Revert "Avoid loading objects from DB in ES results"	Nick Thomas	2019-06-13	7	-11/+4
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit d9cb907c3e987363065136bafb2156e86bc5de26.
* \| \| \|	Modify the branch hooks spec to expect processing of commit messages	Fabio Papa	2019-06-13	1	-5/+1
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Commit messages are not processed for references to issues when creating the default branch on push. This was expected behavior (probably to avoid performance problems when first pushing a repository with thousands of commits). However, this is not an issue because we always limit the number of commits to process to 100 regardless of whether we are creating the default branch or not.
* \| \|	Add trackEvent when accessing the Register tab	Ash McKenzie	2019-06-13	1	-1/+1
\| \|/ \|/\| \| \| \| \|	This is a no-op for CE.
* \|	Remove the grafana_dashboard_link feature flag	Reuben Pereira	2019-06-12	3	-13/+0
\| \|
* \|	Adding break-word css to home-panel-description class to correctly word wrap ↵	Erik van der Gaag	2019-06-12	1	-1/+1
\| \| \| \| \| \| \| \|	long words
* \|	Merge branch ↵	Annabel Dunstone Gray	2019-06-12	1	-3/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'63010-visual-regression-in-12-0-line-numbers-not-lining-up-in-file-view' into 'master' Resolve "Visual regression in 12.0: line numbers not lining up in file view" Closes #63010 See merge request gitlab-org/gitlab-ce!29403
\| * \|	Align line numbers for non-default font size63010-visual-regression-in-12-0-line-numbers-not-lining-up-in-file-view	Simon Knox	2019-06-10	1	-3/+3
\| \| \|
* \| \|	Merge branch 'sh-fix-resolve-button-not-available' into 'master'	Fatih Acet	2019-06-12	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix "Resolve conflicts" button not appearing for some users Closes #47954 See merge request gitlab-org/gitlab-ce!29535
\| * \| \|	Fix "Resolve conflicts" button not appearing for some userssh-fix-resolve-button-not-available	Stan Hu	2019-06-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously the frontend assumed that the user had to be able to merge to that project in order to resolve conflicts. However, this is overly restrictive, as the user only has to be able to push to the source branch. In fact, appending the text /conflicts to the merge request would bring up the conflict resolution page. This confusion happens when a project contains a protected branch that only allows maintainers to push. Users with Developer access no longer have permission to merge, but they still can create branches in that project. To fix this issue, we now loosen the permission check for the "Resolve conflicts" button and only check for access to push to the source branch. This is consistent with what the backend does in MergeRequests::Conflicts::ListService#can_be_resolved_by?. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/47954
* \| \| \|	Merge branch 'ealcantara-popover-styling' into 'master'	Annabel Dunstone Gray	2019-06-12	7	-43/+93
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Style popovers according to the design specs See merge request gitlab-org/gitlab-ce!28375
\| * \| \| \|	Nest category-icon inside .user-popoverealcantara-popover-styling	Enrique Alcantara	2019-06-07	1	-4/+4
\| \| \| \| \|
\| * \| \| \|	Cleanup deprecation message popover	Enrique Alcantara	2019-06-07	3	-25/+1
\| \| \| \| \|
\| * \| \| \|	Extract user-popover styles	Enrique Alcantara	2019-06-07	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Separate use-case specific user-popover styles from general popover styles.
\| * \| \| \|	Address feature highlight popover inconsistencies	Enrique Alcantara	2019-06-07	3	-6/+4
\| \| \| \| \|
\| * \| \| \|	Style popovers according to the design specs	Enrique Alcantara	2019-06-07	4	-15/+87
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Apply new styles for header, padding, border, and fonts - Remove bootstrap 3 backward compat code
* \| \| \| \|	Merge branch 'prom-api-3' into 'master'	Mike Greiling	2019-06-12	7	-13/+117
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Switch charts to Prometheus API endpoint CE-3 Closes #58516 See merge request gitlab-org/gitlab-ce!29280
\| * \| \| \| \|	Use Prometheus API for dashboard metricsprom-api-3	Simon Knox	2019-06-07	7	-13/+117
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make API request for each chart
* \| \| \| \| \|	Merge branch 'fix-diverged-branch-locals' into 'master'	Stan Hu	2019-06-12	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix diverged branch locals See merge request gitlab-org/gitlab-ce!29508
\| * \| \| \| \| \|	Fix diverged branch localsfix-diverged-branch-locals	Luke Bennett	2019-06-12	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'prom-api-2' into 'master'	Mike Greiling	2019-06-12	9	-7/+80
\|\ \ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Switch charts to Prometheus API endpoint CE-2 See merge request gitlab-org/gitlab-ce!29226
\| * \| \| \| \| \|	Add feature flag and dashboard endpointprom-api-2	Simon Knox	2019-06-07	9	-7/+80
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	First part of FE for Prometheus API Dashboard endpoint fetches all info except for chart results Renders empty groups after loading
* \| \| \| \| \| \|	Whitelist query limiting admin usage data endpoint	Peter Leitzen	2019-06-12	1	-0/+6
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Extract ide_status_list from ide_status_bar	Paul Slaughter	2019-06-12	4	-23/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Why? The ide_status_list will be used and extended in EE.
* \| \| \| \| \| \|	Resolve "Email notifications do not work properly (issue due date)"	Eugenia Grieff	2019-06-12	1	-2/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '59651-remove-unnecessary-decimal-places-on-chart-axes' into ↵	Phil Hughes	2019-06-12	1	-2/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Remove unnecessary decimal places on chart axes" Closes #59651 See merge request gitlab-org/gitlab-ce!29468
\| * \| \| \| \| \| \|	Strip trailing decimal zeros from Metrics axis59651-remove-unnecessary-decimal-places-on-chart-axes	Simon Knox	2019-06-12	1	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '5615-non-admins-only-archieve-ce' into 'master'	Stan Hu	2019-06-12	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add EE backport for the admin view See merge request gitlab-org/gitlab-ce!29268
\| * \| \| \| \| \| \| \|	Add EE backport for the admin view	Małgorzata Ksionek	2019-06-11	1	-0/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '62788-clean-up-pagination' into 'master'	Phil Hughes	2019-06-12	6	-5/+5
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moves table pagination component Closes #62788 See merge request gitlab-org/gitlab-ce!29543
\| * \| \| \| \| \| \| \| \|	Moves table pagination component	Filipa Lacerda	2019-06-12	6	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move the table paginaiton component under the new pagination folder in vue shared components and updates all the paths
* \| \| \| \| \| \| \| \| \|	Merge branch 'expose-project-git-depth-via-api' into 'master'	Kamil Trzciński	2019-06-12	3	-5/+5
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose default_git_depth via project API Closes #62908 See merge request gitlab-org/gitlab-ce!29353
\| * \| \| \| \| \| \| \| \| \|	Expose ci_default_git_depth via project APIexpose-project-git-depth-via-api	Fabio Pitino	2019-06-12	3	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable Get and Update of ci_default_git_depth for Project API. Renaming Project#default_git_depth to :ci_default_git_depth to give more context through the API usage. Add API documentation
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'bvl-rename-loader-for-lfs-oids' into 'master'	Jan Provaznik	2019-06-12	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename `BatchCommitLoader` to `BatchLfsOidLoader` See merge request gitlab-org/gitlab-ce!29487
\| * \| \| \| \| \| \| \| \| \| \|	Rename `BatchCommitLoader` to `BatchLfsOidLoader`	Bob Van Landuyt	2019-06-11	1	-1/+1
\| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since we're not actually loading commits in that loader, but we're loading blobs with LFS oids in batch and returning only the oids.