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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Allow BetterErrors REPL to be enabledashmckenzie/enable-better-errors-repl	Ash McKenzie	2019-06-05	1	-0/+3
\| \| \| \| \| \|	This allows the BetterErrors REPL to be available when your GitLab instance is listening on something _other_ than localhost.
*	Merge branch 'bvl-fix-permission-on-image' into 'master'	Achilleas Pipinellis	2019-06-05	1	-0/+0
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Remove executable permission from docs Closes #62782 See merge request gitlab-org/gitlab-ce!29200
\| *	Remove executable permission from docs	Bob Van Landuyt	2019-06-05	1	-0/+0
\|/ \| \| \| \|	`doc/user/admin_area/img/index_runners_search_or_filter.png` does not need x permissions.
*	Merge branch 'bvl-use-global-ids-graphql' into 'master'	Jan Provaznik	2019-06-05	16	-16/+135
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Use global IDs when exposing GraphQL resources Closes #62650 See merge request gitlab-org/gitlab-ce!29080
\| *	Fix incorrect instances of `GraphQL::ID_TYPE`	Bob Van Landuyt	2019-06-03	6	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since the `GraphQL::ID_TYPE` usages should represent globally unique ids, this changes some fields for which this is not the case into strings. The `ID_TYPE` is a specialised, so this change should be backwards compatible. https://graphql-ruby.org/type_definitions/scalars.html
\| *	Expose IDs in GraphQL as a GlobalID	Bob Van Landuyt	2019-06-03	10	-8/+127
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This exposes all fields named `id` as GlobalIDs so they can be used across our entire GraphQL implementation. When the objects loaded are `ApplicationRecord`s. We'll use our existing batchloading to find them. Otherwise, we'll fall back to the default implementation of `GlobalID`: Calling the `.find` method on the class.
* \|	Merge branch 'docs-its-relative-8' into 'master'	Achilleas Pipinellis	2019-06-05	11	-33/+33
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Clean up links to remove ./ usage See merge request gitlab-org/gitlab-ce!29182
\| * \|	Docs: Clean up links to remove ./ usage	Marcel Amirault	2019-06-05	11	-33/+33
\|/ /
* \|	Merge branch 'docs-ssot-ci-variables' into 'master'	Achilleas Pipinellis	2019-06-05	8	-17/+69
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Docs: ssot - ci variables See merge request gitlab-org/gitlab-ce!28606
\| * \|	Delete proposed paragraph	Marcia Ramos	2019-06-05	8	-17/+69
\|/ / \| \| \| \| \| \|	TBA to a different MR/issue
* \|	Merge branch 'renovate/gitlab-ui-3.x' into 'master'	Fatih Acet	2019-06-05	2	-5/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update dependency @gitlab/ui to ^3.11.0 Closes gitlab-ee#11308 See merge request gitlab-org/gitlab-ce!29185
\| * \|	Update dependency @gitlab/ui to ^3.11.0	Lukas 'Eipi' Eipert	2019-06-05	2	-5/+5
\| \| \|
* \| \|	Merge branch 'issue-6568-single-codebase-spec-controllers' into 'master'	Lin Jen-Shin	2019-06-05	2	-0/+34
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	single codebase spec controllers See merge request gitlab-org/gitlab-ce!29041
\| * \| \|	Move specs to ce directoryissue-6568-single-codebase-spec-controllers	Małgorzata Ksionek	2019-06-03	2	-0/+34
\| \| \| \|
* \| \| \|	Merge branch '62713-fix-uninstalling-cluster-apps' into 'master'	Douglas Barbosa Alexandre	2019-06-05	3	-0/+30
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix connection to Tiller error while uninstalling Closes #62713 See merge request gitlab-org/gitlab-ce!29131
\| * \| \| \|	Fix connection to Tiller error while uninstalling62713-fix-uninstalling-cluster-apps	Thong Kuah	2019-06-05	3	-0/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Both the `install-<app>` and `uninstall-<app>` pods loads the `values-content-configuration-<app>` configmap into the pod (see `#volume_specification`). This configmap contains the cert necessary to connect to Tiller. The cert though is only valid for 30 minutes. So this fixes the bug where the configmap when uninstalling should be updated as well.
* \| \| \| \|	Merge branch ↵	Filipa Lacerda	2019-06-05	1	-8/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'61910-common_utils_spec-js-fails-locally-on-master-for-roundofffloat' into 'master' Resolve "common_utils_spec.js fails locally for roundOffFloat" Closes #61910 See merge request gitlab-org/gitlab-ce!28963
\| * \| \| \| \|	Fix broken floating point tests61910-common_utils_spec-js-fails-locally-on-master-for-roundofffloat	jboyson1	2019-05-30	1	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update tests to use toBeCloseTo instead of toBe for floating point checks. More info here: https://jestjs.io/docs/en/expect#tobeclosetonumber-numdigits
* \| \| \| \| \|	Merge branch 'jivanvl-add-single-stat-chart-component' into 'master'	Filipa Lacerda	2019-06-05	2	-0/+65
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add single_stat chart component to the monitoring bundle See merge request gitlab-org/gitlab-ce!28948
\| * \| \| \| \| \|	Add single_stat chart component to the monitoring bundlejivanvl-add-single-stat-chart-component	Jose Vargas	2019-06-04	2	-0/+65
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This merge requests just adds the component without integrating it to the dashboard, it adds tests as well
* \| \| \| \| \| \|	Merge branch 'qa-ml-fix-add-file-template-tests' into 'master'	Rémy Coutable	2019-06-05	12	-32/+76
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[QA] Fix add file template tests Closes gitlab-org/quality/staging#46 and gitlab-org/quality/nightly#97 See merge request gitlab-org/gitlab-ce!28915
\| * \| \| \| \| \| \|	Fix Web IDE add template test	Mark Lapierre	2019-06-05	12	-32/+76
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Wait for the new file modal to stop animating before clicking it We now need to click the commit button 3 times: 1. To enter commit mode 2. To being staging changes 3. To submit the commit
* \| \| \| \| \| \|	Merge branch 'revert-git-depth-for-merge-request' into 'master'	Kamil Trzciński	2019-06-05	3	-22/+10
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert a default GIT_DEPTH for MR pipeline See merge request gitlab-org/gitlab-ce!28926
\| * \| \| \| \| \| \|	Revert a default GIT_DEPTH for MR pipelinerevert-git-depth-for-merge-request	Fabio Pitino	2019-05-31	3	-22/+10
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '53134-multiple-extendes-for-a-job' into 'master'	Kamil Trzciński	2019-06-05	7	-31/+129
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add multiple extends support Closes #53134 See merge request gitlab-org/gitlab-ce!26801
\| * \| \| \| \| \| \| \|	Add multiple extends support	Wolphin	2019-06-05	7	-31/+129
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch '55253-activity-feed-ui-enhance-line-height' into 'master'	Phil Hughes	2019-06-05	3	-3/+9
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Activity feed UI: Enhance line-height" Closes #55253 See merge request gitlab-org/gitlab-ce!28856
\| * \| \| \| \| \| \| \|	Enhance line-height of Activity feed UI55253-activity-feed-ui-enhance-line-height	Jacopo	2019-05-31	3	-3/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enhances line-height of Activity feed UI to 20px.
* \| \| \| \| \| \| \| \|	Merge branch '50106-hide-whitespace-changes' into 'master'	Phil Hughes	2019-06-05	3	-6/+13
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix whitespace changes visibility when the related file was initially collapsed Closes #50106 See merge request gitlab-org/gitlab-ce!28950
\| * \| \| \| \| \| \| \|	Fix whitespace changes visibility when the related file was initially collapsed	Ondřej Budai	2019-06-05	3	-6/+13
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'Docs-add-info-about-runner-server-requirements' into 'master'	Evan Read	2019-06-05	1	-2/+13
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add info about runner server requirements See merge request gitlab-org/gitlab-ce!25242
\| * \| \| \| \| \| \| \|	Mentioned executors type	Andrew Winata	2019-06-05	1	-2/+13
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also another factor of consideration for runner server requirements.
* \| \| \| \| \| \| \|	Merge branch 'docs-its-relative-6' into 'master'	Evan Read	2019-06-05	21	-87/+74
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Update all links to relative in /workflow and /administration See merge request gitlab-org/gitlab-ce!28971
\| * \| \| \| \| \| \| \|	Docs: Update all links to relative in /workflow and /administration	Marcel Amirault	2019-06-05	21	-87/+74
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'ce-mw-onboarding-tour-skeleton' into 'master'	Mayra Cabrera	2019-06-05	3	-6/+16
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(CE Port) New user onboarding (Skeleton) See merge request gitlab-org/gitlab-ce!28753
\| * \| \| \| \| \| \| \|	Add render_projects method to controller	Martin Wortschack	2019-06-05	3	-6/+16
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Render EE specific partial if exists
* \| \| \| \| \| \| \|	Merge branch 'docs/ssot-installation-guides' into 'master'	Mike Lewis	2019-06-04	17	-239/+256
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	SSoT - Clean up docs under install/ Closes #61509 See merge request gitlab-org/gitlab-ce!28688
\| * \| \| \| \| \| \| \|	Clean up docs under install/docs/ssot-installation-guides	Achilleas Pipinellis	2019-06-03	17	-239/+256
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is an initiative to ensure all documentation complies completely with the Documentation Style Guide section "Documentation is the single source of truth (SSOT)" according to this epic https://gitlab.com/groups/gitlab-org/-/epics/1280. In particular, the changes of this commit touch all files under doc/install/. Most notably: - install/redis.md: Redirect to Redis section of install guide. - install/pivotal/index.md: Changed its content to reflect the current status, which is no longer supported (since 2017!). - install/google-protobuf.md: Incorporated inside installation.md under the troubleshooting section. - install/openshift_and_gitlab.md: Clarified that this guide is no longer relevant. We might want to redirect to the Chart docs in the future. - install/structure.md: Incorporated inside installation.md under its own section. - install/kubernetes/index.md: Redirected to https://docs.gitlab.com/charts
* \| \| \| \| \| \| \| \|	Merge branch 'sast-catch-unexpected-token' into 'master'	Robert Speicher	2019-06-04	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix `SyntaxError: Unexpected token` in SAST jobs See merge request gitlab-org/gitlab-ce!29156
\| * \| \| \| \| \| \| \| \|	Specify exception identifer in catch blocksast-catch-unexpected-token	Paul Gascou-Vaillancourt	2019-06-04	1	-1/+1
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'fix-external-dashboard-specs' into 'master'	Clement Ho	2019-06-04	1	-3/+5
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix "operation settings external dashboard component" Jest specs See merge request gitlab-org/gitlab-ce!29160
\| * \| \| \| \| \| \| \| \|	Fix submit button selector in specs	Paul Gascou-Vaillancourt	2019-06-04	1	-3/+5
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'ce-9578-adjust-opened-issues-count-and-completion-rate' into ↵	Robert Speicher	2019-06-04	6	-96/+33
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Port: EE adjust burndown chart opened issues count See merge request gitlab-org/gitlab-ce!28777
\| * \| \| \| \| \| \| \| \| \|	Adjust burndown chart opened issues countce-9578-adjust-opened-issues-count-and-completion-rate	Alexandru Croitor	2019-06-04	6	-96/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Adjust opened issues count in the milestone burndown chart to match current opened issues in the milestone. * Fix completion rate calculation to include milestones only.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'fe-jestify-specs-starting-with-a-1' into 'master'	Mike Greiling	2019-06-04	4	-14/+51
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Jestify some specs that start with "A" See merge request gitlab-org/gitlab-ce!28727
\| * \| \| \| \| \| \| \| \| \| \|	Jestify autosave spec and add localStorage helperfe-jestify-specs-starting-with-a-1	Paul Slaughter	2019-06-04	2	-11/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The helper was needed because `jest.spyOn` would not work on this special window object property. The only way we could successfully spy on `localStorage` was with this helper.
\| * \| \| \| \| \| \| \| \| \| \|	Jestify api spec	Paul Slaughter	2019-05-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Jestify activities spec	Paul Slaughter	2019-05-30	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also add `jQuery` to global in `test_setup`. This was needed because: - `vendor/jquery.endless-scroll` depends on it. - Adding it to `global` in the spec itself didn't work.
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '61045-charts-with-many-overlapping-series-display-incorrectly' ↵	Filipa Lacerda	2019-06-04	3	-5/+10
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Charts with many overlapping series display incorrectly" Closes #61045 See merge request gitlab-org/gitlab-ce!29127
\| * \| \| \| \| \| \| \| \| \| \|	Resolve "Charts with many overlapping series display incorrectly"	Adriel Santiago	2019-06-04	3	-5/+10
\|/ / / / / / / / / / /