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

	Commit message (Collapse)	Author	Age	Files	Lines
*	WIP: Adds jasmine clock to the job app specjasmine-clock	samdbeckham	2019-06-05	1	-0/+5
\|
*	Merge branch 'add_codeowners_for_security_templates' into 'master'	Sean McGivern	2019-06-05	1	-0/+1
\|\ \| \| \| \| \| \| \| \|	Add code owners for security templates See merge request gitlab-org/gitlab-ce!26948
\| *	Add code owners for security templates	Olivier Gonzalez	2019-06-05	1	-0/+1
\|/
*	Merge branch ↵	Nick Thomas	2019-06-05	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'62760-persistent-failure-in-spec-models-ci-pipeline_schedule_spec-rb' into 'master' Resolve "Persistent failure in spec/models/ci/pipeline_schedule_spec.rb" Closes #62760 See merge request gitlab-org/gitlab-ce!29191
\| *	Prefer Time.zone.now to pair with Time.zone.name	Lin Jen-Shin	2019-06-05	1	-1/+1
\|/ \| \| \| \|	`Time.now` is local time, yet `Time.zone.now` is application configuration time. They can be different.
*	Merge branch '28996-create-mvc-ui-in-haml' into 'master'	Filipa Lacerda	2019-06-05	12	-21/+305
\|\ \| \| \| \| \| \| \| \|	Add Let's Encrypt option in Pages domain new/edit Haml form See merge request gitlab-org/gitlab-ce!26438
\| *	Add auto SSL toggle to Pages domain settings page28996-create-mvc-ui-in-haml	Nathan Friend	2019-06-03	12	-21/+305
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit adds an auto SSL toggle switch to the settings page of GitLab Pages domains. This toggle enable or disabled auto SSL management via Let's Encrypt. Toggling the button dynamically updates the form using client-side JavaScript. All changes are behind feature flags.
* \|	Merge branch 'osw-avoid-500-on-suggestions-check' into 'master'	Lin Jen-Shin	2019-06-05	3	-1/+14
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid 500 when evaluating `DiffNote#supports_suggestion?` and commit is not reachable Closes #57570 See merge request gitlab-org/gitlab-ce!25408
\| * \|	Avoid 500's when commit is not reachable	Oswaldo Ferreira	2019-06-05	3	-1/+14
\| \| \|
* \| \|	Merge branch 'patch-67' into 'master'	Marcia Ramos	2019-06-05	1	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update code_quality.md to fix grammatical errors. See merge request gitlab-org/gitlab-ce!29161
\| * \| \|	Update code_quality.md to fix grammatical errors.	PatOnTheBack	2019-06-04	1	-2/+2
\| \| \| \|
* \| \| \|	Merge branch 'winh-issue-boards-setListDetail' into 'master'	Fatih Acet	2019-06-05	4	-2/+17
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extract setListDetail() into issue boards store See merge request gitlab-org/gitlab-ce!29063
\| * \| \| \|	Extract setListDetail() into issue boards store	Winnie Hellmann	2019-06-05	4	-2/+17
\|/ / / /
* \| \| \|	Merge branch 'docs/ssot_group_clusters' into 'master'	Marcia Ramos	2019-06-05	1	-0/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Edited "Group cluster" for SSOT guidelines See merge request gitlab-org/gitlab-ce!29176
\| * \| \| \|	Edited "Group cluster" for SSOT guidelines	Russell Dickenson	2019-06-05	1	-0/+4
\|/ / / /
* \| \| \|	Merge branch 'docs/ssot_groups_index' into 'master'	Marcia Ramos	2019-06-05	1	-1/+17
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Edit Groups index for SSOT guidelines See merge request gitlab-org/gitlab-ce!29173
\| * \| \| \|	Edit Groups index for SSOT guidelines	Russell Dickenson	2019-06-05	1	-1/+17
\|/ / / /
* \| \| \|	Merge branch 'docs/ssot_admin_area_terms_of_service' into 'master'	Marcia Ramos	2019-06-05	1	-14/+32
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Edited `Terms of Service` for SSOT guidelines See merge request gitlab-org/gitlab-ce!29107
\| * \| \| \|	Edited `Terms of Service` for SSOT guidelines	Russell Dickenson	2019-06-05	1	-14/+32
\|/ / / /
* \| \| \|	Merge branch 'clarify-ce-first-docs' into 'master'	Achilleas Pipinellis	2019-06-05	1	-3/+8
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify the process for CE-first documentation See merge request gitlab-org/gitlab-ce!29197
\| * \| \| \|	Clarify the process for CE-first documentation	Markus Koller	2019-06-05	1	-3/+8
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously it was unclear if the docs changes should be included in the MR as well, and adding a changelog entry in the CE MR also triggers the ee-specific-lines-check job in CI.
* \| \| \|	Merge branch ↵	Jan Provaznik	2019-06-05	4	-0/+18
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'11925-geo-sidekiq-nodes-try-to-run-jobs-even-thought-db-is-readonly' into 'master' Ensure DB is writable before continuing jobs See merge request gitlab-org/gitlab-ce!29134
\| * \| \| \|	Ensure DB is writable before continuing jobs11925-geo-sidekiq-nodes-try-to-run-jobs-even-thought-db-is-readonly	Ash McKenzie	2019-06-05	4	-0/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In the context of a Geo setup, some jobs can be running on a Geo secondary where the database is read-only and therefore we should guard against various jobs attempting to write.
* \| \| \| \|	Merge branch 'master' into 'master'	Marcia Ramos	2019-06-05	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: fix grammar in getting_started_part_three.md See merge request gitlab-org/gitlab-ce!29024
\| * \| \| \| \|	Docs: fix grammar in getting_started_part_three.md	Daniel Tam	2019-06-05	1	-1/+1
\|/ / / / /
* \| \| \| \|	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
\|/ / / / / / / / / / /