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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Simplify notification check for participatingsimplify-pipeline-notification-check	Heinrich Lee Yu	2019-06-06	2	-13/+4
\|
*	Merge branch '10403-harden-against-gitlab-assets-compile-transient-failures' ↵	Stan Hu	2019-06-05	1	-4/+4
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Harden gitlab:assets:compile against transient network failures Closes gitlab-ee#10403 See merge request gitlab-org/gitlab-ce!29211
\| *	Harden gitlab:assets:compile against transient network failures	Nick Thomas	2019-06-05	1	-4/+4
\| \|
* \|	Merge branch '60819_yamllint_gitlabci' into 'master'	Rémy Coutable	2019-06-05	54	-348/+372
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	60819 yamllint gitlabci See merge request gitlab-org/gitlab-ce!29124
\| * \|	Add yaml lint	Kamil Trzciński	2019-06-05	54	-348/+372
\|/ / \| \| \| \| \| \| \| \| \| \| \| \|	This commit adds CI job that validates all `*.yml` with `yamllint`. This commit fixes all offenses present in repository.
* \|	Merge branch '54140-non-ar-cache-commit-markdown' into 'master'	Douwe Maan	2019-06-05	21	-406/+758
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use Redis for CacheMarkDownField on non AR models Closes #54140 See merge request gitlab-org/gitlab-ce!29054
\| * \|	Cleanup #attributes method54140-non-ar-cache-commit-markdown	Patrick Bajao	2019-06-05	1	-20/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since we're prepending the ActiveRecord::Extension module, we can take advantage of it and avoid using an alias to extend the original #attributes method.
\| * \|	Use markdown_field helper to display full_title	Patrick Bajao	2019-06-05	1	-1/+2
\| \| \|
\| * \|	Remove requirement for id for #markdown_cache_key	Patrick Bajao	2019-06-05	4	-14/+2
\| \| \| \| \| \| \| \| \| \| \| \|	It's not needed anymore as we require `#cache_key` instead.
\| * \|	Use #cache_key of subject for generated redis key	Patrick Bajao	2019-06-05	5	-28/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit also includes some changes in specs to use `Class.new` approach.
\| * \|	Use Redis for CacheMarkDownField on non AR models	Patrick Bajao	2019-06-05	20	-405/+760
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows using `CacheMarkdownField` for models that are not backed by ActiveRecord. When the including class inherits `ActiveRecord::Base` we include `Gitlab::MarkdownCache::ActiveRecord::Extension`. This will cause the markdown fields to be rendered and the generated HTML stored in a `<field>_html` attribute on the record. We also store the version used for generating the markdown. All other classes that include this model will include the `Gitlab::MarkdownCache::Redis::Extension`. This add the `<field>_html` attributes to that model and will generate the html in them. The generated HTML will be cached in redis under the key `markdown_cache:<class>:<id>`. The class this included in must therefore respond to `id`.
* \| \|	Merge branch 'snowplow-attrs-helper' into 'master'	Mayra Cabrera	2019-06-05	3	-11/+28
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add snowplow haml attr helper See merge request gitlab-org/gitlab-ce!28724
\| * \| \|	Add snowplow haml attr helper	Luke Bennett	2019-06-05	3	-11/+28
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Helps build a hash of snowplow tracking data attrs. Updates import project pane to use new helper.
* \| \|	Merge branch 'graphql-file-entry-url' into 'master'	Nick Thomas	2019-06-05	15	-5/+129
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add web_url to tree entry in GraphQL API See merge request gitlab-org/gitlab-ce!28646
\| * \| \|	Add web_url to tree entry in GraphQL API	Phil Hughes	2019-06-05	15	-5/+129
\| \| \| \|
* \| \| \|	Merge branch 'ce-10446-resolve-ee-diff-repository-check-mailer-notify' into ↵	Phil Hughes	2019-06-05	1	-0/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' [CE] Resolve CE/EE in repo check mailer notify html See merge request gitlab-org/gitlab-ce!29195
\| * \| \| \|	Resolve CE/EE in repo check mailer notify html	Paul Slaughter	2019-06-05	1	-0/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch '61246-fix-label-click-scroll-to-top' into 'master'	Fatih Acet	2019-06-05	2	-0/+10
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix label click scrolling to top Closes #61246 See merge request gitlab-org/gitlab-ce!29202
\| * \| \| \|	Fix label click scrolling to top	Paul Slaughter	2019-06-05	2	-0/+10
\| \|/ / /
* \| \| \|	Merge branch '11126-fix-repository-size-check-ce' into 'master'	Stan Hu	2019-06-05	7	-4/+39
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add client code to call GetObjectDirectorySize RPC See merge request gitlab-org/gitlab-ce!28918
\| * \| \| \|	Add client code to call GetObjectDirectorySize RPC11126-fix-repository-size-check-ce	Patrick Bajao	2019-06-05	7	-4/+39
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|	CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13460
* \| \| \|	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.