Commit Graph

394 Commits

Author SHA1 Message Date
Reuben Pereira e5bdcfbc9b [ADD] outbound requests whitelist
Signed-off-by: Istvan szalai <istvan.szalai@savoirfairelinux.com>
2019-07-24 17:59:38 +00:00
Kamil Trzciński 4435cdde49 Merge branch 'safe-archiving-for-traces' into 'master'
Extra logging for new live trace architecture

See merge request gitlab-org/gitlab-ce!30892
2019-07-23 14:17:05 +00:00
Shinya Maeda c2e0e689f3 Validate the existence of archived traces before removing live trace
Often live traces are removed even though the archived trace
doesn't exist. This commit checkes the existence strictly.
2019-07-23 17:26:08 +07:00
Heinrich Lee Yu 40d6d5e2d0 Make pipeline emails respect group email setting
When a user's notification email is set for a group, we
should use that for pipeline emails
2019-07-23 13:00:53 +08:00
Brett Walker b1694896ff Properly identify task lists inside a blockquote
Updated the task list regex to understand blockquote
characters that can come before the task item marker
2019-07-19 12:40:16 -05:00
Peter Leitzen 7b87ed1499 Cleanup usages of `JSON.parse` in specs
Prefer `json_response` where applicable.
2019-07-16 08:03:49 +00:00
Grzegorz Bizon 1def071991 Merge branch '55623-group-cluster-apis' into 'master'
Resolve "API support for group-level clusters"

Closes #55623

See merge request gitlab-org/gitlab-ce!30213
2019-07-12 08:36:24 +00:00
Douwe Maan 92fac45953 Merge branch 'banzai-avoid-redis-if-db-cache' into 'master'
Banzai - avoid redis if attr is in DB cache

See merge request gitlab-org/gitlab-ce!30334
2019-07-11 08:28:24 +00:00
Dylan Griffith dacd0ee18b Refactor: model errors for multi cluster validation
The current approach requires catching exceptions to handle these errors
and callers are already handling model validations so it seems more
appropriate.  Also it seemed to convoluted to add this logic directly to
the model since the model needs to check too many possible associations
to determine whether or not there are more than one cluster since the
model doesn't know what it's being created on. Additionally we only
wanted to validate during create to avoid the risk of existing models
becoming invalid by many different edge cases.
2019-07-11 17:22:58 +10:00
Mario de la Ossa e5705f5c54
Banzai - avoid redis if attr is in DB cache
When cache_collection_render runs we end up reading and writing
things to redis even if we already have the rendered field cached
in the DB. This commit avoids using redis at all whenever we have
the field already rendered in the DB cache.
2019-07-10 21:35:43 -06:00
Luke Duncalfe a00a23ca82 GraphQL mutations for managing Notes
https://gitlab.com/gitlab-org/gitlab-ce/issues/62826
2019-07-10 12:13:47 +12:00
Sean McGivern fa4c409d78 Merge branch 'issue/55953' into 'master'
rename `discussion` to `thread`

Closes #55953

See merge request gitlab-org/gitlab-ce!29553
2019-07-03 12:20:09 +00:00
Marin Jankovski c20c9e2940
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2019-07-03 11:55:56 +02:00
Sean McGivern b94daa35a4 Merge branch 'master' into michel.engelen/gitlab-ce-issue/55953 2019-07-03 10:28:13 +01:00
Dmitriy Zaporozhets ca28f7f1e2 Merge branch '63690-issue-trackers-title' into 'master'
Use title and description fields for issue trackers

Closes #63690

See merge request gitlab-org/gitlab-ce!30096
2019-07-02 16:11:40 +00:00
Mayra Cabrera dfdfa913ba Includes logic to persist namespace statistics
- Add two new ActiveRecord models:
  - RootNamespaceStoragestatistics will persist root namespace statistics
  - NamespaceAggregationSchedule will save information when a new update
to the namespace statistics needs to be scheduled
- Inject into UpdateProjectStatistics concern a new callback that will
call an async job to insert a new row onto NamespaceAggregationSchedule
table
- When a new row is inserted a new job is scheduled. This job will
update call an specific service to update the statistics and after that
it will delete thee aggregated scheduled row
- The RefresherServices makes heavy use of arel to build composable
queries to update Namespace::RootStorageStatistics attributes.
- Add an extra worker to traverse pending rows on
NAmespace::AggregationSchedule table and schedule a worker for each one
of this rows.
- Add an extra worker to traverse pending rows on
NAmespace::AggregationSchedule table and schedule a worker for each one
of this rows
2019-07-02 14:44:39 +00:00
Jarka Košanová ddbbf453c7 Use title and description fields for issue trackers
- instead of using properties
- backward compatibility has to be kept for now
2019-07-02 15:00:27 +02:00
Michel Engelen 6edb13f2bd updated tests for !29553 2019-07-02 14:29:54 +02:00
Marin Jankovski f66169b35c Merge branch 'security-59581-related-merge-requests-count' into 'master'
Expose merge requests count based on user access

See merge request gitlab/gitlabhq!3157
2019-07-02 06:19:58 +00:00
Kamil Trzciński 5ee5b280b0 Merge branch 'set-higher-ttl-for-trace-write' into 'master'
Set higher TTL to write lock for traces

See merge request gitlab-org/gitlab-ce!30064
2019-06-28 10:39:08 +00:00
Eugenia Grieff f0f3246a2b Do not change updated_at on an issue when reordering on an issue board 2019-06-28 09:47:54 +00:00
Shinya Maeda 9753a7d288 Set higher TTL to write lock for traces
Set higher TTL is safer option when it comes to long running archive
2019-06-28 10:25:57 +07:00
Luke Duncalfe 4b9b2a43d0 GraphQL mutations for add, remove and toggle emoji
Adding new `AddAwardEmoji`, `RemoveAwardEmoji` and `ToggleAwardEmoji`
GraphQL mutations.

Adding new `#authorized_find_with_pre_checks!` and (unused, but for
completeness `#authorized_find_with_post_checks!`) authorization
methods. These allow us to perform an authorized find, and run our own
additional checks before or after the authorization runs.

https://gitlab.com/gitlab-org/gitlab-ce/issues/62826
2019-06-28 12:03:33 +12:00
Roger Meier 946ffc67b7 refactor: remove Sentry from application settings 2019-06-25 21:17:19 +02:00
Kamil Trzciński e11feff929 Revert "Merge branch..."
This reverts merge request !29832
2019-06-24 17:29:54 +00:00
Sean McGivern e6532ca203 Fix notes email with group-level notification email
A Noteable doesn't have a group directly, unless it's an epic - we need
to look for the project's group to find the right email address.
2019-06-24 09:20:10 +00:00
Sean McGivern f318a14366 Merge branch '58065-uniform-html-txt-email' into 'master'
Make HTML and text emails for new issues uniform and add the mail to mailer previews

Closes #58065

See merge request gitlab-org/gitlab-ce!29886
2019-06-21 14:39:49 +00:00
Stan Hu 868da1d6c8 Merge branch '63406-selecting-a-line-in-ci-job-trace-using-triple-click-selects-the-previous-line-also' into 'master'
Fix copying a single line from Firefox

Closes #63406

See merge request gitlab-org/gitlab-ce!29832
2019-06-21 13:11:56 +00:00
Frank van Rest df4c1a75de Uniform html and text emails
Uniform new_issue_email html and text emails
Uniform note_email html and text emails
Uniform new_merge_request_email html and text emails
2019-06-21 13:48:43 +03:00
Luke Duncalfe dcf811ba14 CE backport for changes in EE MR 14017
This backports to CE changes to allow the EE model
DesignManagement::Repository to override the #attributes_at method to
provide its own git attributes.

The #attributes_at method was freely available, as it's never called by
anything in the app. It looks like the code that called it got
refactored out of existence in ca66a04f. It was still being called in a
spec
85b29c1c2f/spec/services/files/create_service_spec.rb (L40)
which I've left because with the change in Lfs::FileTransformer in fact
is now again the perfect test!

See EE MR
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14017

And these comment threads
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13894#note_178002089
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13894#note_178049984
2019-06-19 17:51:57 +00:00
Adam Hegyi e76f12f7e7 Merge branch 'master' into '63406-selecting-a-line-in-ci-job-trace-using-triple-click-selects-the-previous-line-also'
# Conflicts:
#   spec/lib/gitlab/ci/ansi2html_spec.rb
2019-06-19 13:39:52 +00:00
Adam Hegyi 86c08225eb Fix copying a single line from Firefox
This change ensures that all open <span> tags are closed before adding a
<br> tag.
2019-06-19 09:16:53 +02:00
Manoj MJ 53b17f0301 Add documentation and tests
This commit adds
 - feature specs
  - to test the ability of a user with "developer" permission
    to delete tags in repositories.
 - documentation
2019-06-19 07:08:56 +00:00
Felipe Artur 61bca6222c Move some quick actions feature specs to unit tests
Move some feature specs for issues/merge requests quick actions
to unit tests. They are taking too long to run on the pipelines.
2019-06-18 14:26:48 +00:00
Alexandru Croitor 09163e423a Expose merge requests count based on user access
Count issues related merge requests based on user access level. And
issue can have related MRs from projects where user does not have
access so the number of related merge requests should be adjusted
based on user's ability to access the related MRs.

https://gitlab.com/gitlab-org/gitlab-ce/issues/59581
2019-06-18 12:46:46 +03:00
Sean McGivern 2634cad695 Merge branch 'generate-spans-for-sections' into 'master'
Add collapsible sections to job log

See merge request gitlab-org/gitlab-ce!28642
2019-06-17 17:03:41 +00:00
Fabio Pitino 6ab9a9df6f Fix integration specs for tracing 2019-06-14 16:48:33 +01:00
Bob Van Landuyt b6ff5f1e14 Expose comments on Noteables in GraphQL
This exposes `Note`s on Issues & MergeRequests using a
`Types::Notes::NoteableType` in GraphQL.

Exposing notes on a new type can be done by implementing the
`NoteableType` interface on the type. The presented object should
be a `Noteable`.
2019-06-14 12:36:27 +02:00
Heinrich Lee Yu 96ed5a8bd7 Upgrade to Capybara 3
Fix whitespace in specs because normalize_ws is slightly
different from Capybara 2 behavior
2019-06-12 18:40:18 +08:00
Kamil Trzciński 6050b348d7 Merge branch 'dz-cleanup-deprecated-code' into 'master'
Remove some deprecated code

See merge request gitlab-org/gitlab-ce!29222
2019-06-11 08:18:04 +00:00
Dmitriy Zaporozhets 15ba85ab8e
Remove some deprecated code
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2019-06-07 14:32:31 +03:00
Luke Duncalfe c7dcbc03bb CE backport for changes in EE MR 13389
This backports to ce a refactor of the shared example 'a controller that
can serve LFS files'.

The ee MR that contains the original refactor is
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13389

The reason for the refactor was mostly the removal of the outer context
as it didn't need to be there, and prevented let(:lfs_oid) from being
overwritten.

The shared example was also renamed to be more descriptive.
2019-06-06 14:22:41 +12:00
Mayra Cabrera 4bf3f54607 Cleans up UpdateProjectStatistics concern
- Renames attributes from stat to project_statistiscs_name and attribute
to statistic_attribute
- Reordes methods on UpdateProjectStatistics concern
- Removes unused module from Ci::Build
2019-06-03 15:06:03 +00:00
Wei-Meng Lee ddb0344a8f Apply reviewer suggestions 2019-05-31 20:49:27 +08:00
Wei-Meng Lee 1a402d888c Send notifications to group-specific email address
- Select notification email by walking up group/subgroup path
- Add settings UI to set group email notification address
- Add tests
2019-05-31 20:49:27 +08:00
Rémy Coutable 6145ddf515
Revert "Merge branch 'revert-04c3c6dd' into 'master'"
This reverts commit 744f1f2e70, reversing
changes made to c4d930e5f5.
2019-05-22 21:47:32 +02:00
Kamil Trzciński 4f20c9de6f Revert "Merge branch 'reorganize-tests-jobs-by-level' into 'master'"
This reverts merge request !27514
2019-05-22 11:45:46 +00:00
Kamil Trzciński 04c3c6dd5a Merge branch 'reorganize-tests-jobs-by-level' into 'master'
Reorganize test jobs by level

See merge request gitlab-org/gitlab-ce!27514
2019-05-22 10:21:38 +00:00
Stan Hu 4edfa5102e Merge branch 'dz-scope-project-routes' into 'master'
Move some project routes under /-/ scope

See merge request gitlab-org/gitlab-ce!28435
2019-05-22 00:06:47 +00:00
Dmitriy Zaporozhets 6d3f5a3341
Add legacy routes for modified project path
For settings, branches and tags

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2019-05-21 11:35:29 +03:00