Commit Graph

11501 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
Robert Speicher 43626526aa Merge branch '52442-initial-mysql-support-removal' into 'master'
Remove dead mysql code

Closes #63191

See merge request gitlab-org/gitlab-ce!29608
2019-07-23 21:44:53 +00:00
Stan Hu 5032df86ce Merge branch 'adjust-group-level-analytics-to-accept-multiple-project-ids' into 'master'
Adjust group level analytics to accept multiple projects ids

See merge request gitlab-org/gitlab-ce!30744
2019-07-23 21:00:39 +00:00
Nick Thomas 4aa76dddec
Remove dead MySQL code
None of this code can be reached any more, so it can all be removed
2019-07-23 16:53:03 +01:00
Robert Speicher d892e80bf0 Merge branch 'bvl-mark-remote-mirrors-as-failed-sooner' into 'master'
Mark mirrors as failed 1 hour after they started

See merge request gitlab-org/gitlab-ce!30999
2019-07-23 15:00:11 +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
Kamil Trzciński 995e5b5210 Merge branch 'sh-use-shared-state-cluster-pubsub' into 'master'
Use persistent Redis cluster for Workhorse pub/sub notifications

See merge request gitlab-org/gitlab-ce!30990
2019-07-23 14:15:09 +00:00
Nick Thomas c404c57fb8 Merge branch '63485-fix-pipeline-emails-to-use-group-setting' into 'master'
Make pipeline emails respect group email setting

Closes #63485

See merge request gitlab-org/gitlab-ce!30907
2019-07-23 14:09:28 +00:00
Bob Van Landuyt ab11eee1d6 Mark mirrors as failed 1 hour after they started
We call `Project#mark_stuck_remote_mirrors_as_failed!` from the
`Git::BaseHooksService`. So that gets called every time we push tags
or branches.

Before this would only mark started mirrors as failed if they had
been started 24 hours ago. A push would never take 24 hours,
especially not when we run it so often.

Lowering that threshold 1 hour should at least allow us to retry
broken mirrors more often on pushes.

The timeout for the initial push is set somewhat longer to accommodate
for pushing large repos. Both numbers are currently picked arbitrarily.
2019-07-23 16:04:49 +02:00
Nick Thomas 31335ea661 Merge branch 'bw-add-index-for-relative-position' into 'master'
Add index for issues on relative position, project, and state for manual sorting

See merge request gitlab-org/gitlab-ce!30542
2019-07-23 14:00:06 +00:00
Bob Van Landuyt 825e5c2c1b Merge branch 'if-64257-active_session_lookup_key_cleanup' into 'master'
Rake task to cleanup expired ActiveSession lookup keys

See merge request gitlab-org/gitlab-ce!30668
2019-07-23 12:39:26 +00:00
Sean McGivern b2e4a7957a Merge branch 'gsemet/gitlab-ce-gsemet-master-patch-33258' into 'master'
Multiple pipeline support for Build status

See merge request gitlab-org/gitlab-ce!30828
2019-07-23 11:57:30 +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
Matija Čupić 41b8dca877
Add specs for specifying pipeline behavior
Adds specs for testing the new behavior of specifying a pipeline when
POSTing a status.
2019-07-23 12:02:07 +02:00
Małgorzata Ksionek 5ce4236b66 Add code review remarks
Add cr remarks

Improve specs according to the review

Fix schema

Add cr remarks

Fix naming

Add cr remarks
2019-07-23 12:01:39 +02:00
Małgorzata Ksionek 1b102f5d11 Add basic project extraction
To allow project filtering

Prepare summary for accepting multiple groups

Modify deploys group summary class

Add filtering by project name in issues summary

Fix rubocop offences

Add changelog entry

Change name to id in project filtering

Fix rebase problem

Add project extraction
2019-07-23 12:01:39 +02:00
Grzegorz Bizon d9de7234fc Merge branch 'update-gitlab-runner-helm-chart-to-0-7-0' into 'master'
Update GitLab Runner Helm Chart to 0.7.0/12.1.0

See merge request gitlab-org/gitlab-ce!30950
2019-07-23 06:59:28 +00: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
Stan Hu 583c12acf4 Use persistent Redis cluster for Workhorse pub/sub notifications
Previously, in Omnibus, Workhorse expected to listen via the Redis
shared state cluster for the `workhorse:notifications` publish/subscribe
channel, but the Rails code was using the Sidekiq queue cluster for
this. To fix this inconsistency, we make the Rails code use the
persistent cluster, since we don't want Workhorse to be looking at
anything Sidekiq-related.
2019-07-22 10:23:07 -07:00
Brett Walker b0eafaaca1 Add index for issues on relative position, project
and state
2019-07-22 10:48:46 -05:00
Vladimir Shushlin 77e2e45364 Validate certificate chain only if it's changed
This validation prevents the domain from being saved from the UI
e.g. when user tries to enable Let's Encrypt integration
2019-07-22 15:38:08 +00:00
Sean McGivern e48851de62 Merge branch 'maintainers-can-create-subgroup' into 'master'
Add a group setting to allow Maintainers to create sub-groups

See merge request gitlab-org/gitlab-ce!29718
2019-07-22 15:17:23 +00:00
Imre Farkas 313f145b55
Rake task to cleanup expired ActiveSession lookup keys
In some cases ActiveSession.cleanup was not called after authentication,
so for some user ActiveSession lookup keys grew without ever cleaning
up. This Rake task manually iterates over the lookup keys and removes
ones without existing ActiveSession.
2019-07-22 17:15:57 +02:00
Jan Provaznik 972b5f4555 Removed project autocomplete pagination
This pagination is not used anywhere so there is no reason
to keep it. It seems the usage of offset_id was probably
removed in 90c60138db
2019-07-22 11:44:20 +00:00
Douwe Maan 65b16f9894 Merge branch '64697-markdown-issues-checkbox-inside-blockquote-status-won-t-be-saved' into 'master'
Markdown issues: Checkbox inside blockquote status won't be saved

See merge request gitlab-org/gitlab-ce!30952
2019-07-22 10:07:01 +00:00
Steve Abrams aba93fe2d5 OAuth2 support for GitLab personal access tokens
PATs are accepted using the OAuth2 compliant header
"Authorization: Bearer {token}" in order to allow for
OAuth requests while 2FA is enabled.
2019-07-22 08:50:25 +00:00
Heinrich Lee Yu 589d1797d8 Handle trailing slashes when generating Jira URLs
Applies to issues_url and new_issue_url
2019-07-22 13:35:52 +08:00
Nick Thomas a5a444906d Fix the project auto devops API
If `project_auto_devops.enabled` is nil for a project, when setting any
auto devops values via the API, we try to create a new row in the DB,
instead of re-using the existing one. This leads to the project_id
being set to nil, and the database `NOT NULL` constraint leading to a
500 response.

This commit resolves the issue by correctly detecting the presence of a
ProjectAutoDevops row and re-using it. Persistence is also moved away
from explicit `update!` calls and into relying on `autosave: true` on
the model.
2019-07-19 21:39:26 +00:00
Fabio Papa 039e5348d0 Make Group#subgroup_creation_level return Owner if it is nil in DB 2019-07-19 14:26:44 -07:00
Fabio Papa 7b7c149400 Apply changes recomended by merge request coach 2019-07-19 13:14:21 -07:00
Fabio Papa ef5f8bda2c Remove AR hook to set the default subgroup_creation_level 2019-07-19 13:06:50 -07:00
Fabio Papa f1fcd64fb7 Make maintainers the default setting for creating subgroups 2019-07-19 13:00:05 -07:00
Fabio Papa 6f3b2e07dc Make the group model return maintainer level when it is not set 2019-07-19 12:34:27 -07:00
Fabio Papa 27ebf9392a Remove AR hook to set the default subgroup_creation_level 2019-07-19 12:06:57 -07:00
Fabio Papa bcc970f6f5 Make maintainers the default setting for creating subgroups 2019-07-19 12:06:57 -07:00
Fabio Papa 832f668f29 Apply changes recomended by merge request coach 2019-07-19 12:06:56 -07:00
Fabio Papa 7980011e03 Remove AR hook to set the default subgroup_creation_level 2019-07-19 12:06:56 -07:00
Fabio Papa aa428bef4e Make maintainers the default setting for creating subgroups 2019-07-19 12:06:56 -07:00
Fabio Papa d4c53e1799 Apply changes recomended by merge request coach 2019-07-19 11:55:49 -07:00
Fabio Papa 42167779ea Remove AR hook to set the default subgroup_creation_level 2019-07-19 11:55:48 -07:00
Fabio Papa e962ffbc90 Make maintainers the default setting for creating subgroups 2019-07-19 11:55:47 -07:00
Fabio Papa 130261c5e9 Make the group model return maintainer level when it is not set 2019-07-19 11:55:46 -07: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
Steve Azzopardi 78b9586d1d
Update GitLab Runner Helm Chart to 0.7.0 2019-07-19 16:56:33 +02:00
Tiger 41fc4d1e44 Introduce predictable environment slugs
If an environment slug is predictable given only the environment
name, we can use the environment slug earlier in the CI variable
evaluation process as we don't have to wait for the environment
record itself to be persisted.
2019-07-19 11:33:07 +10:00
Eugenia Grieff 4b7cf4a54e CE port for milestones should not be set on epics issue promotion 2019-07-18 18:52:10 +00:00
Sean McGivern 0b859d2f4f Merge branch 'group-milestones-dashboard-blunceford' into 'master'
Fix bug in dashboard display of closed milestones

Closes #59381

See merge request gitlab-org/gitlab-ce!30820
2019-07-18 18:04:43 +00:00
Sean McGivern 0d1adc9f7f Merge branch 'adjust-cycle-analytics-to-group-level' into 'master'
Adjust cycle analytics to group level

See merge request gitlab-org/gitlab-ce!30391
2019-07-18 09:23:54 +00:00
Douglas Barbosa Alexandre 4e457ebf82 Merge branch 'remove_clusters_cte_feature_flag' into 'master'
Removes clusters_cte feature flag

Closes #64259

See merge request gitlab-org/gitlab-ce!30827
2019-07-17 14:44:23 +00:00
Vladimir Shushlin 6796dcf277 Fix wrong pages access level default
- Set access level in before_validation hook
- Add post migration for updating existing project_features
2019-07-17 12:56:58 +00:00