Commit Graph

246 Commits

Author SHA1 Message Date
Mario de la Ossa 49c74068ae
Save sorting preference for Issues/MRs in BE
In order to let users' sorting preferences transfer between devices, we
save the preference for issues and MRs (one preference for issues, one
for MRs) in the backend inside the UserPreference object
2019-01-28 12:48:05 -06:00
Rémy Coutable 3a2abc1d50
Enable the Layout/ExtraSpacing cop
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-01-24 13:05:45 +01:00
Filipa Lacerda 3ed8078507 Merge branch '25569-changing-wording-to-delete-when-referring-to-removing-a-branch' into 'master'
Resolve "Changing wording to "Delete" when referring to removing a branch"

Closes #25569

See merge request gitlab-org/gitlab-ce!23966
2019-01-23 11:02:22 +00:00
Sam Bigelow c607b35824 Use 'delete' instead of 'remove' for source branch
This is to match `git branch -D <branchname>`
2019-01-22 12:57:01 -05:00
Filipa Lacerda ed1da73020 Merge branch '53856-changing-group-visibility-does-not-re-enable-save-button' into 'master'
Resolve "Changing group visibility does not re-enable Save button"

Closes #53856

See merge request gitlab-org/gitlab-ce!23022
2019-01-22 10:41:01 +00:00
Luke Bennett 88ce491fc9
Fix DirtySubmit handling of checkbox and radio inputs
Most browsers do not fire the "input" event for checkboxes or radios.
Adds a "change" listener to properly trigger these DirtySubmit updates.
2019-01-22 02:04:32 +00:00
Fatih Acet fc67614164 Merge branch 'ce-issue_7526' into 'master'
[EE Backport] Add notes filters for epics

See merge request gitlab-org/gitlab-ce!24372
2019-01-18 14:02:19 +00:00
Felipe Artur d99d6494f9 [EE Backport] Add notes filters for epics 2019-01-14 17:20:11 -02:00
Toon Claes d3e028b85f Load all projects, namespaces, routes in 1 query
Avoid doing sequential database queries to load the namespaces and the
routes of projects and namespaces.

This results in the following query:

```sql
SELECT "projects"."id" AS t0_r0,
       "projects"."name" AS t0_r1,
       "projects"."path" AS t0_r2,
       "projects"."description" AS t0_r3,
       "projects"."created_at" AS t0_r4,
       "projects"."updated_at" AS t0_r5,
       "projects"."creator_id" AS t0_r6,
       "projects"."namespace_id" AS t0_r7,
       "projects"."last_activity_at" AS t0_r8,
       "projects"."import_url" AS t0_r9,
       "projects"."visibility_level" AS t0_r10,
       "projects"."archived" AS t0_r11,
       "projects"."avatar" AS t0_r12,
       "projects"."import_status" AS t0_r13,
       "projects"."star_count" AS t0_r14,
       "projects"."import_type" AS t0_r15,
       "projects"."import_source" AS t0_r16,
       "projects"."import_error" AS t0_r17,
       "projects"."ci_id" AS t0_r18,
       "projects"."shared_runners_enabled" AS t0_r19,
       "projects"."runners_token" AS t0_r20,
       "projects"."build_coverage_regex" AS t0_r21,
       "projects"."build_allow_git_fetch" AS t0_r22,
       "projects"."build_timeout" AS t0_r23,
       "projects"."pending_delete" AS t0_r24,
       "projects"."public_builds" AS t0_r25,
       "projects"."last_repository_check_failed" AS t0_r26,
       "projects"."last_repository_check_at" AS t0_r27,
       "projects"."container_registry_enabled" AS t0_r28,
       "projects"."only_allow_merge_if_pipeline_succeeds" AS t0_r29,
       "projects"."has_external_issue_tracker" AS t0_r30,
       "projects"."repository_storage" AS t0_r31,
       "projects"."request_access_enabled" AS t0_r32,
       "projects"."has_external_wiki" AS t0_r33,
       "projects"."ci_config_path" AS t0_r34,
       "projects"."lfs_enabled" AS t0_r35,
       "projects"."description_html" AS t0_r36,
       "projects"."only_allow_merge_if_all_discussions_are_resolved" AS t0_r37,
       "projects"."printing_merge_request_link_enabled" AS t0_r38,
       "projects"."auto_cancel_pending_pipelines" AS t0_r39,
       "projects"."import_jid" AS t0_r40,
       "projects"."cached_markdown_version" AS t0_r41,
       "projects"."delete_error" AS t0_r42,
       "projects"."last_repository_updated_at" AS t0_r43,
       "projects"."storage_version" AS t0_r44,
       "projects"."resolve_outdated_diff_discussions" AS t0_r45,
       "projects"."repository_read_only" AS t0_r46,
       "projects"."merge_requests_ff_only_enabled" AS t0_r47,
       "projects"."merge_requests_rebase_enabled" AS t0_r48,
       "projects"."jobs_cache_index" AS t0_r49,
       "projects"."pages_https_only" AS t0_r50,
       "projects"."remote_mirror_available_overridden" AS t0_r51,
       "projects"."pool_repository_id" AS t0_r52,
       "projects"."runners_token_encrypted" AS t0_r53,
       "projects"."bfg_object_map" AS t0_r54,
       "namespaces"."id" AS t1_r0,
       "namespaces"."name" AS t1_r1,
       "namespaces"."path" AS t1_r2,
       "namespaces"."owner_id" AS t1_r3,
       "namespaces"."created_at" AS t1_r4,
       "namespaces"."updated_at" AS t1_r5,
       "namespaces"."type" AS t1_r6,
       "namespaces"."description" AS t1_r7,
       "namespaces"."avatar" AS t1_r8,
       "namespaces"."share_with_group_lock" AS t1_r9,
       "namespaces"."visibility_level" AS t1_r10,
       "namespaces"."request_access_enabled" AS t1_r11,
       "namespaces"."description_html" AS t1_r12,
       "namespaces"."lfs_enabled" AS t1_r13,
       "namespaces"."parent_id" AS t1_r14,
       "namespaces"."require_two_factor_authentication" AS t1_r15,
       "namespaces"."two_factor_grace_period" AS t1_r16,
       "namespaces"."cached_markdown_version" AS t1_r17,
       "namespaces"."runners_token" AS t1_r18,
       "namespaces"."runners_token_encrypted" AS t1_r19,
       "routes"."id" AS t2_r0,
       "routes"."source_id" AS t2_r1,
       "routes"."source_type" AS t2_r2,
       "routes"."path" AS t2_r3,
       "routes"."created_at" AS t2_r4,
       "routes"."updated_at" AS t2_r5,
       "routes"."name" AS t2_r6,
       "routes_projects"."id" AS t3_r0,
       "routes_projects"."source_id" AS t3_r1,
       "routes_projects"."source_type" AS t3_r2,
       "routes_projects"."path" AS t3_r3,
       "routes_projects"."created_at" AS t3_r4,
       "routes_projects"."updated_at" AS t3_r5,
       "routes_projects"."name" AS t3_r6
FROM "projects"
LEFT OUTER JOIN "namespaces" ON "namespaces"."id" = "projects"."namespace_id"
LEFT OUTER JOIN "routes" ON "routes"."source_id" = "namespaces"."id"
AND "routes"."source_type" = $1
LEFT OUTER JOIN "routes" "routes_projects" ON "routes_projects"."source_id" = "projects"."id"
AND "routes_projects"."source_type" = $2
LEFT OUTER JOIN "project_repositories" ON "projects"."id" = "project_repositories"."project_id"
WHERE ("projects"."storage_version" IS NULL
       OR "projects"."storage_version" = 0)
  AND "project_repositories"."project_id" IS NULL
  AND ("projects"."id" BETWEEN $3 AND $4);
  -- [["source_type", "Namespace"],
  --  ["source_type", "Project"],
  --  ["id", 1],
  --  ["id", 4]]
```
2019-01-11 15:36:57 +01:00
Luke Bennett 5f110a6acf Port GitLab.com gold trial callout changes to CE
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8731
2019-01-03 10:39:36 -08:00
Kamil Trzciński c07bf1abf2 Merge branch '34758-extend-can-create-cluster-logic' into 'master'
Allow user to add cluster when there are ancestor clusters

See merge request gitlab-org/gitlab-ce!23569
2018-12-30 10:54:08 +00:00
Mayra Cabrera 01ed3a1511 Allow users to add cluster with ancestors
Include a new policy in Clusterables
(projects and groups), which checks if another cluster
can be added

clusterable_has_cluster? and multiple_clusters_available
private methods will be overriden in EE

Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/34758
2018-12-24 10:28:40 -06:00
Jasper Maes dc1eb2c5c3 Fix deprecation: Using positional arguments in integration tests 2018-12-22 14:42:41 +01:00
Jasper Maes bf73520079 convert specs in javascripts/ and support/ to new syntax 2018-12-21 10:10:26 +01:00
Jan Provaznik b1b7fa7802 Merge branch 'blackst0ne-convert-specs-rails5-style' into 'master'
[Rails5.1] Update functional specs to use new keyword format

Closes #54062

See merge request gitlab-org/gitlab-ce!23095
2018-12-19 07:11:12 +00:00
Douglas Barbosa Alexandre 4a132952db
Extract a shared example for legacy and hashed storage migrations tests 2018-12-18 21:35:14 -02:00
blackst0ne b44a2c801a Update specs to rails5 format
Updates specs to use new rails5 format.

The old format:
`get :show, { some: params }, { some: headers }`

The new format:
`get :show, params: { some: params }, headers: { some: headers }`
2018-12-19 10:04:31 +11:00
Heinrich Lee Yu 9d1090d49b Run CommonSystemNotesService on issuable create
Adds system notes for labels, milestone and due date on create
2018-12-18 08:36:56 +08:00
Nick Thomas 8d2e1b724b Merge branch '54786-mr-empty-file-display' into 'master'
Display empty files properly on MR diffs

Closes #54786

See merge request gitlab-org/gitlab-ce!23671
2018-12-15 12:21:54 +00:00
Olivier Crête a96cd7cb2b Add List-Id to notification emails 2018-12-13 11:15:48 +00:00
Kamil Trzciński 0165cfaa07 Re-define default only except policy 2018-12-13 10:39:55 +00:00
Sean Nichols 4d2448e03a Add tests and move empty file message into own component 2018-12-13 01:49:32 -05:00
Felipe Artur b80dca82f5 Do not save user preferences on read-only mode 2018-12-12 16:15:58 +00:00
Grzegorz Bizon 6b10ab0ea6 Merge branch 'jprovazn-fast-upload-delete' into 'master'
Use FastDestroy for deleting uploads

Closes #46069

See merge request gitlab-org/gitlab-ce!20977
2018-12-07 12:13:28 +00:00
Oswaldo Ferreira 26b94bcc7d Remove unused data from discussions endpoint
We don't need a series of attributes to render diff files on
discussions.json request. Therefore this MR removes lots of unnecessary
attributes from the request, mainly the highlighted diff lines, which
are pretty expensive.
2018-12-06 17:07:49 -08:00
Jan Provaznik 9ccf8d032f Enabled feature flag for fast deletions
Fast destroy is used only if the feature flag is enabled, otherwise
uploads are still deleted using carrier wave. It's disabled by default.
2018-12-06 22:00:19 +01:00
Jan Provaznik 239fdc78b1 Use FastDestroy for deleting uploads
It gathers list of file paths to delete before destroying
the parent object. Then after the parent_object is destroyed
these paths are scheduled for deletion asynchronously.

Carrierwave needed associated model for deleting upload file.
To avoid this requirement, simple Fog/File layer is used directly
for file deletion, this allows us to use just a simple list of paths.
2018-12-06 22:00:19 +01:00
Rémy Coutable 69b2a78826 Merge branch 'blob-count2' into 'master'
Support unlimited file search in web UI and API

See merge request gitlab-org/gitlab-ce!23553
2018-12-06 16:59:45 +00:00
James Lopez 64c11f104c Resolve "Can add an existing group member into a group project with new permissions but permissions are not overridden" 2018-12-06 13:15:29 +00:00
Jan Provaznik 58bfd73331 Optimized file search to work without limits
* removed 100 limit on file search results because we
  load all results anyway
* expensive processing (parsing match content, utf encoding)
  is done only for selected page in paginated output
2018-12-06 09:25:09 +01:00
Nick Thomas 61bc233ef0 Merge branch 'osw-fix-grouping-by-file-path' into 'master'
Avoid 500's when serializing legacy diff notes

Closes #54793

See merge request gitlab-org/gitlab-ce!23544
2018-12-05 13:40:24 +00:00
Kamil Trzciński 12a1da9402 Merge branch 'define-default-value-for-only-except-keys' into 'master'
Define the default value for only/except policies

See merge request gitlab-org/gitlab-ce!23531
2018-12-04 18:55:42 +00:00
Oswaldo Ferreira 89a676019c Avoid 500's when serializing legacy diff notes 2018-12-04 13:13:22 -02:00
Shinya Maeda ad957a3f42 Define the default value for only/except policies
Currently, if a job does not have only/except policies, the policy is considered as an unspecified state, and therefore the job is executed regardless of how it's executed and which branch/tags are targetted.
Ideally, this should be specified as only: ['branches', 'tags'], as it indicates that unspecified policy jobs are meant to run on any git references.
2018-12-05 00:11:48 +09:00
Grzegorz Bizon 0b8a2779e7 Merge branch 'master' into fix/gb/encrypt-runners-tokens
* master: (243 commits)

Conflicts:
	db/schema.rb
	lib/gitlab/import_export/import_export.yml
2018-11-28 13:14:04 +01:00
Stan Hu 6c83c2d8b9 Merge branch 'lock-trace-writes' into 'master'
Lock writes to trace stream

Closes #51502

See merge request gitlab-org/gitlab-ce!23332
2018-11-27 20:56:40 +00:00
Kamil Trzciński 31a1ce2132 Lock writes to trace stream 2018-11-27 17:55:20 +01:00
Chris Baumbauer 2937be7b0c Expose external_ip to knative cluster application 2018-11-26 12:46:00 -08:00
Jacopo c068ac67b3 Filter by `None`/`Any` for labels in issues/mrs API
By using the parameters `?labels=None|Any` the user can filter
issues/mrs from the API that has `none/any` label.

Affected endpoints are:

- /api/issues
- /api/projects/:id/issues
- /api/groups/:id/issues
- /api/merge_requests
- /api/projects/:id/merge_requests
- /api/groups/:id/merge_requests
2018-11-23 16:11:52 +01:00
Grzegorz Bizon 88e2b6ea9f Merge remote-tracking branch 'dev/master' into security-encrypt-runners-tokens
* dev/master: (302 commits)

Conflicts:
	db/schema.rb
	lib/gitlab/import_export/import_export.yml
2018-11-21 11:02:31 +01:00
Grzegorz Bizon 0a611caaf9 Improve specs for hiding runners tokens in traces 2018-11-20 15:46:53 +01:00
Dylan Griffith fe1469e12f Upgrade helm to 2.11.0 and upgrade on every install 2018-11-16 10:22:40 +00:00
Sean McGivern ca3e9b9759 Merge branch 'blackst0ne-add-discord-service' into 'master'
Add Discord integration

Closes #21635

See merge request gitlab-org/gitlab-ce!22684
2018-11-12 10:12:48 +00:00
Dylan Griffith da7836956e Improve Debugging Capabilities For Helm Application Installs 2018-11-09 15:03:24 +00:00
Nick Thomas 06e8cf5855 Merge branch 'revert-45b61a9e' into 'master'
Revert "Merge branch 'blackst0ne-update-push-new-merge-request-url' into 'master'"

See merge request gitlab-org/gitlab-ce!22875
2018-11-07 17:04:35 +00:00
Grzegorz Bizon 5dc0577b84 Merge branch 'triggermesh-phase1-knative' into 'master'
Allow to install Knative as cluster application

See merge request gitlab-org/gitlab-ce!22593
2018-11-07 15:00:38 +00:00
Sean McGivern fadaa3d181 Merge branch 'dm-api-merge-requests-index-merged-at' into 'master'
Expose {closed,merged}_{at,by} in merge requests API index

Closes #52031

See merge request gitlab-org/gitlab-ce!22806
2018-11-07 14:57:16 +00:00
Douwe Maan e0054a9ab1 Revert "Merge branch 'blackst0ne-update-push-new-merge-request-url' into 'master'"
This reverts merge request !22526
2018-11-07 13:32:20 +00:00
blackst0ne 079a75088e Refactor specs 2018-11-07 09:12:02 +11:00
Chris Baumbauer e5c408e445 Refactor cluster application tests to centralize helm CA cert verification 2018-11-06 11:52:15 -08:00