Commit Graph

4741 Commits

Author SHA1 Message Date
Vitali Tatarintev 9329998332 Add experimental charts endpoint
That is not a working version of the code,
that's an endpoint prototype to test on localhost.

How to use:

```
http://localhost:3000/<PROJECT_NAMESPACE>/<PROJECT_ID>
/chart?url=<ENCODED_URL>
```

Where:
PROJECT_NAMESPACE and PROJECT_ID are valid project namespace,
and id on localhost. You can get them by calling
`Project.last` from Rails console.

ENCODED_URL is an Encoded URL to data provider.

To encode an URL you can use https://www.urlencoder.io

The endpoint responds with a JSON.
It's either `{ "error": "Error description" }`
or a valid JSON from data provider.
2019-09-12 08:54:40 +02:00
Olena Horal-Koretska 690f8841c0 Separate menu item BE 2019-09-09 13:27:34 +03:00
Dmitriy Zaporozhets ab2d5fdd6a Merge branch 'mk/fix-comment' into 'master'
Fix outdated comment

See merge request gitlab-org/gitlab-ce!32598
2019-09-04 12:24:58 +00:00
Valery Sizov 751adb7941 Add Notification secret into gitlab.yml.template 2019-09-03 23:08:19 +00:00
Michael Kozono fff8cb8112 Fix outdated comment 2019-09-03 16:15:47 +00:00
Takuya Noguchi e3f9cc432c Update jira-ruby to 1.7.1
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
2019-08-30 17:06:10 +09:00
Robert Speicher 7698d40550
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2019-08-29 17:17:37 -05:00
GitLab Release Tools Bot 090956259c Merge branch 'security-enable-image-proxy' into 'master'
Use image proxy to mitigate stealing ip addresses

Closes #2812

See merge request gitlab/gitlabhq!2926
2019-08-29 21:34:29 +00:00
GitLab Release Tools Bot 34c2b6adf9 Merge branch 'security-personal-snippets' into 'master'
Add direct upload support for personal snippets

See merge request gitlab/gitlabhq!3226
2019-08-29 21:34:22 +00:00
GitLab Release Tools Bot a5b2a37860 Merge branch 'security-59549-add-capcha-for-failed-logins' into 'master'
Require a captcha after unique failed logins from the same IP

See merge request gitlab/gitlabhq!3270
2019-08-29 21:34:12 +00:00
GitLab Release Tools Bot 15b88fe57f Merge branch 'security-ssrf-kubernetes-dns-12-3' into 'master'
DNS Rebind SSRF in Kubernetes Integration

See merge request gitlab/gitlabhq!3345
2019-08-29 21:33:42 +00:00
Sean McGivern dded24acac Merge branch 'rd-add-custom-endpoint-for-new-registrations' into 'master'
Add custom endpoint for new registrations

See merge request gitlab-org/gitlab-ce!32233
2019-08-29 17:50:58 +00:00
Patrick Bajao 95ffd22f07 Set default authorized_keys_file
This is the same as gitlab-shell's default. This is to ensure
that it's always set.

It needs to be the same as gitlab-shell's default because we
don't set a default value in omnibus-gitlab. If users don't
set the value of that config in their install and they upgraded,
we must ensure that it's still going to point to the same
authorized keys file.
2019-08-29 16:33:04 +08:00
Stan Hu b31b6764ac Merge branch 'performance-bar-warnings' into 'master'
Add warnings to performance bar response

See merge request gitlab-org/gitlab-ce!31054
2019-08-29 03:54:15 +00:00
Sean McGivern 9bfb012a56 Add top-level warnings key to performance bar response
This key is useful to reduce the amount of logic needed on the frontend:
if `has_warnings` is true, then the frontend knows that the request in
question has warnings for some metric.
2019-08-28 16:39:33 +01:00
Arun Kumar Mohan 7f15dacb55 Remove csslab 2019-08-28 05:01:15 -05:00
Winnie Hellmann 75353242e2 Replace prepend_entity with prepend_if_ee
(cherry picked from commit 897a9d308db46b620b738b98f2b0e5630ac7d2dd)
2019-08-27 15:11:15 +00:00
dodocat 6e2032f24e Update docs and comments about saml with allow_bypass_two_factor
allow_bypass_two_factor configration dose not work with saml provider
2019-08-27 03:46:32 +00:00
Aishwarya Subramanian 1a90baa13a
Modified route to nest under - 2019-08-27 03:46:03 +05:30
Aishwarya Subramanian cf4856337d
Added routes for trial registration api 2019-08-26 21:53:38 +05:30
Brett Walker ad05e48863 Add support for using a Camo proxy server
User images and videos will get proxied through
the Camo server in order to keep malicious
sites from collecting the IP address of users.
2019-08-23 23:44:53 -05:00
shampton c96adfcd6c Move visual review toolbar to NPM
Remove the visual review toolbar code
in favor of using the NPM package.
2019-08-23 12:57:21 -07:00
Andrew Newdigate 3956e7bb86 Add cache tracing and Redis tracing
This change adds Distributed Tracing support for two new types of events

1. Redis Calls
1. ActiveSupport (Rails) Caching Operations

The intention is to help application developers and infrastructure
SREs to understand the pressure that caching operations can have on
the application when running at scale.

The Redis and Caching spans can be viewed in the Jaeger UI by clicking
the "Trace" link in the performance bar when running on GDK.
2019-08-23 10:11:19 +00:00
Jan Provaznik 41d52bbfe9 Add direct upload support for personal snippets 2019-08-23 11:19:14 +02:00
Mayra Cabrera 8832aa9522 Merge branch 'sh-revert-redis-cache-store' into 'master'
Fix "ERR value is not an integer or out of range" errors

Closes #66449

See merge request gitlab-org/gitlab-ce!32126
2019-08-22 22:51:39 +00:00
Stan Hu 6bda359b5a Fix "ERR value is not an integer or out of range" errors
`ActiveSupport::Cache::RedisCacheStore` is not compatible with the
version of Rack Attack we are using (v4.4.1) per
https://github.com/kickstarter/rack-attack/issues/281. Users that had
rate limits enabled might see `Redis::CommandError: ERR value is not an
integer or out of range` because the `raw` parameter wasn't passed along
properly. As a result, the Rack Attack entry would be stored as an
`ActiveSupport::Cache::Entry` instead of a raw string holding an integer
value.

Let's partially revert the change in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/30966 to use the
original cache store until we can update to Rack Attack v5.2.3 that has
support for `ActiveSupport::Cache::RedisCacheStore` via
https://github.com/kickstarter/rack-attack/pull/350.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66449
2019-08-22 14:24:32 -07:00
Heinrich Lee Yu 92005fb70f Enable CSP in gitlab.yml.example
This enables CSP in dev and CI
2019-08-22 11:10:33 -07:00
Stan Hu 8308469fdd Merge branch 'patch-73' into 'master'
Fix typo in Content Security Policy example

See merge request gitlab-org/gitlab-ce!32103
2019-08-22 17:51:41 +00:00
J0WI 47c3abdfd0 Fix typo in Content Security Policy example 2019-08-22 14:18:10 +00:00
Alex Ives 3e2b45870a Issue #39099: Add links for latest pipelines 2019-08-22 08:49:40 -05:00
Sean McGivern 842b4d4ab5 Merge branch 'feat/smime-signed-notification-emails' into 'master'
feat: smime signed notification emails

See merge request gitlab-org/gitlab-ce!30644
2019-08-22 12:16:00 +00:00
Stan Hu c6999c175f Merge branch '328-other-ee' into 'master'
Port of EE "Elasticsearch versioned schema for other ActiveRecord models"

See merge request gitlab-org/gitlab-ce!31660
2019-08-21 19:40:07 +00:00
Stan Hu 9a0c1f64f5 Merge branch 'sidekiq-interrupt-running-jobs' into 'master'
Allow to interrupt running sidekiq jobs

See merge request gitlab-org/gitlab-ce!31818
2019-08-21 18:37:36 +00:00
Miguel Rincon f2619e21be This commit adds a new time series component
Adds a time series component for line and area charts.
Displays new charts in the dashboard.

- Use dynamic components for line/area swapping
- Add new line charts to dashboard in 2 panels
2019-08-21 13:43:01 +00:00
Kamil Trzciński 8d17c4dae6 Properly handle `sidekiq` skip
Transform `CancelledError` into `JobRetry::Skip`
2019-08-21 13:21:55 +02:00
Kamil Trzciński c2cbfc5c4a Rework `Sidekiq::JobsThreads` into `Monitor`
This makes:
- very shallow `Middleware::Monitor` to only request tracking
  of sidekiq jobs,
- `SidekiqStatus::Monitor` to be responsible to maintain persistent
  connection to receive messages,
- `SidekiqStatus::Monitor` to always use structured logging
  and instance variables
2019-08-21 12:05:30 +02:00
Kamil Trzciński 75e2302d01 Allow to interrupt running jobs
This adds a middleware to track all threads
for running jobs.

This makes sidekiq to watch for redis-delivered notifications.

This makes be able to send notification to interrupt
running sidekiq jobs.

This does not take into account any native code,
as `Thread.raise` generates exception once the control gets
back to Ruby.

The separate measure should be taken to interrupt gRPC, shellouts,
or anything else that escapes Ruby.
2019-08-21 18:50:46 +10:00
Mark Chao 55f9739c9c ES: sync with EE
Doc for multi-indices archtecture
2019-08-21 15:18:25 +08:00
Thong Kuah d1de6fd4d8 Column was renamed in 12.2 2019-08-21 14:25:38 +12:00
Thong Kuah e0826b0cb5 Override hostname when connecting via Kubeclient
Kubeclient uses rest-client. We hack into to access the net/http object
so that we can patch to connect to the resolved IP + set
hostname_override.

Add specs for discord. The discord integration also uses rest-client, so
since we patched rest-client, spec that the DNS rebinding protection
works
2019-08-21 10:49:22 +12:00
Luke Duncalfe 93a618f0e5 New wiki page redirects user to random slug
Previously we asked a user to enter a new slug before taking them to
the Create Page page.

As a UX improvement, we now take them to a randomly generated URI so
they can begin creating their new page.

https://gitlab.com/gitlab-org/gitlab-ce/issues/46299
2019-08-21 09:33:12 +12:00
Stan Hu e632ae8084 Standardize remote_ip and path keys for auth.log and api_json.log
Current `auth.log` uses `fullpath` and `ip`, while `api_json.log` uses
`remote_ip` and `path` for the same fields. Let's standardize these
namings to make it easier for people working with the data.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66167
2019-08-20 18:12:28 +00:00
Diego Louzán 0dcb9d21ef feat: SMIME signed notification emails
- Add mail interceptor the signs outgoing email with SMIME
- Add lib and helpers to work with SMIME data
- New configuration params for setting up SMIME key and cert files
2019-08-20 16:13:32 +02:00
Aishwarya Subramanian 092e03f09b Back porting Username suggestion API changes 2019-08-20 01:18:00 +00:00
Heinrich Lee Yu 6eb39e59ab [CE] Add hooks to sync dev info to Jira using Connect App 2019-08-19 19:12:36 +00:00
Rémy Coutable 4d4e88df01 Merge branch 'qa-backport-fix-remaining-prepend-lines' into 'master'
Update qa/Dockerfile to be built from the project root context

See merge request gitlab-org/gitlab-ce!31533
2019-08-19 13:50:15 +00:00
Aleksei Lipniagov dcfaf49550 Clean Sidekiq metrics from multiproc dir on start
After moving the multiproc dir cleanup into `config.ru`:`warmup`, we
stopped cleaning Sidekiq metrics dir which is not correct.
This MR intended to fix that. More details:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/31668
2019-08-19 12:52:07 +00:00
Yorick Peterse 6aa215aaea
Support X_if_ee methods for QA tests
For the QA tests to use the new injection methods, we must require the
initializer and ensure that the "constantize" method is available.
2019-08-19 09:43:37 +02:00
Grzegorz Bizon b1604f7d8f Merge branch '47003-user-onboarding-replace-current-email-confirmation-flow-with-a-soft-email-confirmation-flow' into 'master'
Soft email confirmation flow

Closes #47003

See merge request gitlab-org/gitlab-ce!31245
2019-08-16 12:31:16 +00:00
Thong Kuah f4ce990b0e Merge branch '24705-multi-selection-for-delete-on-registry-page' into 'master'
Resolve "Multi selection for delete on registry page"

Closes #24705

See merge request gitlab-org/gitlab-ce!30837
2019-08-15 23:57:38 +00:00