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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Migrate old notes app test from Karma to Jest	Martin Hanzel	2019-06-05	3	-250/+287
\|
*	Setup Git client for Jupyter	Amit Rathi	2019-06-05	1	-0/+2
\|
*	Merge branch 'issue_49897' into 'master'	Robert Speicher	2019-06-05	3	-20/+52
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Delete unauthorized Todos when project is private Closes #49897 See merge request gitlab-org/gitlab-ce!28560
\| *	Delete unauthorized Todos when project is privateissue_49897	Felipe Artur	2019-06-05	3	-20/+52
\| \| \| \| \| \| \| \| \| \|	Delete Todos for guest users when project visibility level is updated to private.
* \|	Merge branch '11204-turn-off-mask-by-default' into 'master'	Mike Greiling	2019-06-05	1	-13/+19
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Default masked to false for new variables Closes gitlab-ee#11204 See merge request gitlab-org/gitlab-ce!28186
\| * \|	Default masked to false for new variables11204-turn-off-mask-by-default	mfluharty	2019-06-04	1	-13/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set the default value to false Adjust tests to expect false as the default Update documentation to make new default clear
* \| \|	Merge branch '54140-non-ar-cache-commit-markdown' into 'master'	Douwe Maan	2019-06-05	11	-325/+515
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use Redis for CacheMarkDownField on non AR models Closes #54140 See merge request gitlab-org/gitlab-ce!29054
\| * \| \|	Remove requirement for id for #markdown_cache_key	Patrick Bajao	2019-06-05	3	-12/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-27/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	11	-325/+513
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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`.
* \| \| \|	Add snowplow haml attr helper	Luke Bennett	2019-06-05	1	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	6	-2/+60
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	6	-2/+60
\| \| \| \| \|
* \| \| \| \|	Merge branch '11126-fix-repository-size-check-ce' into 'master'	Stan Hu	2019-06-05	2	-0/+23
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-0/+23
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13460
* \| \| \|	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	2	-1/+151
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-1/+151
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+8
\| \| \| \| \| \|
* \| \| \| \| \|	Extract setListDetail() into issue boards store	Winnie Hellmann	2019-06-05	1	-0/+11
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch ↵	Jan Provaznik	2019-06-05	2	-0/+14
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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	2	-0/+14
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 'bvl-use-global-ids-graphql' into 'master'	Jan Provaznik	2019-06-05	6	-5/+74
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	5	-4/+73
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 '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	1	-0/+24
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+28
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This merge requests just adds the component without integrating it to the dashboard, it adds tests as well
* \| \| \| \| \| \| \| \| \|	Merge branch 'revert-git-depth-for-merge-request' into 'master'	Kamil Trzciński	2019-06-05	1	-19/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-19/+3
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Add multiple extends support	Wolphin	2019-06-05	3	-11/+39
\| \|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Fix whitespace changes visibility when the related file was initially collapsed	Ondřej Budai	2019-06-05	1	-5/+6
\| \|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	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	2	-80/+20
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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	2	-80/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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 '61964-unicorn-instrumentation' into 'master'	Bob Van Landuyt	2019-06-04	3	-8/+71
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds ruby and unicorn instrumentation Closes #61964 See merge request gitlab-org/gitlab-ce!28499
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into 61964-unicorn-instrumentation	Ryan Cobb	2019-05-29	155	-7033/+3214
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	Adds ruby and unicorn instrumentation	Ryan Cobb	2019-05-20	3	-8/+71
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds ruby and unicorn instrumentation. This was originally intended in 11.11 but due to performance concerns it was reverted. This new commit foregoes the sys-proctable gem was causing performance issues previously.
* \| \| \| \| \| \| \| \| \| \| \| \|	Handle external dashboard form submission	Adriel Santiago	2019-06-04	3	-49/+124
\| \|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Connect frontend UI with backend api for external dashboard link