| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| |
|
|
|
|
|
|
|
| |
* similar to rails 5 it assures that index length is set for blob
columns also in rails 4
* it also ignores multiple definitions of indexes for mysql, for some
tables we define multiple indexes on the same set of columns, but with
different parameters (opclasses, where), these are not supported by
mysql adapter so the second definition of index is skipped
|
| | |
|
| |\
| |
| |
| |
| |
| |
| | |
Remove asset_sync gem and related code
Closes omnibus-gitlab#3872
See merge request gitlab-org/gitlab-ce!22610
|
| | |
| |
| |
| |
| | |
Reverting https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15734 .
We are not using asset sync currently.
|
| | | |
|
| | | |
|
| |\ \ |
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fix "rails g migration" not always using migration templates
Closes #52651
See merge request gitlab-org/gitlab-ce!22592
|
| | | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Normally, this is what's supposed to happen when you invoke `rails g
generate migration`:
1. `Rails.application.load_generators` is called here:
https://github.com/rails/rails/blob/v4.2.10/railties/lib/rails/commands/commands_tasks.rb#L129
2. This loads the local `generator_templates` path in
https://github.com/rails/rails/blob/v4.2.10/railties/lib/rails/generators.rb#L69.
However, when metrics are enabled, the application is eager loaded here
in the initializer. This short-circuits the `load_generators` and loads
`ActiveRecord::Generators::MigrationGenerator` automatically, so the
custom path is never loaded properly.
With this change, we skip the initializing of metrics and eager loading
if generators are in use.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52651
|
| |\ \ \
| |/ /
|/| |
| | |
| | | |
[master] Security kubeclient ssrf
See merge request gitlab/gitlabhq!2575
|
| | |/
| |
| |
| |
| |
| | |
This should prevent any malicious server from responding with a location
that will redirect us and expose internal services, as kubeclient's
rest-client will no longer follow redirects.
|
| |\ \ |
|
| | | | |
|
| | |/
| |
| |
| |
| |
| | |
This allows us (and others) to test drive Puma without it affecting all
users. Puma can be enabled by setting the environment variable
"EXPERIMENTAL_PUMA" to a non empty value.
|
| |\ \
| |/
|/|
| |
| | |
[master] Prevent SSRF attacks in HipChat integration
See merge request gitlab/gitlabhq!2530
|
| | |
| |
| |
| |
| |
| |
| | |
This change monkey patches the HipChat client to use the GitLab HTTParty
connection adapter, which can block access to certain hosts.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51142
|
| | | |
|
| |\ \
| | |
| | |
| | |
| | | |
Add reliable sidekiq fetcher
See merge request gitlab-org/gitlab-ce!21715
|
| | | | |
|
| | |/
|/|
| |
| |
| |
| |
| |
| | |
Cleanup code, and refactor tests that still use Rugged. After this, there should
be no Rugged code that access the instance's repositories on non-test
environments. There is still some rugged code for other tasks like the
repository import task, but since it doesn't access any repository storage path
it can stay.
|
| |\ \
| | |
| | |
| | |
| | | |
Fix undefined format_options method in SchemaDumper for MySQL db
See merge request gitlab-org/gitlab-ce!21907
|
| | | |
| | |
| | |
| | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| | |/
|/|
| |
| |
| |
| |
| |
| | |
If a user logs in with a bad CSRF token, the Warden before_logout
hook will be called with no valid user. This would lead to odd
Error 500 messages with a backtrace.
Addresses part of #50857
|
| |/
|
|
| |
We remove this feature as it never worked properly
|
| |\
| |
| | |
See merge request gitlab-org/gitlab-ce!21689
|
| | |
| |
| |
| |
| |
| | |
If doing a schema load, the post_migrations should also be marked as up,
even if SKIP_POST_DEPLOYMENT_MIGRATIONS was set, otherwise future
migration runs will be broken.
|
| | | |
|
| |\ \
| | |
| | |
| | |
| | | |
CE: Properly implement prepending for Concern
See merge request gitlab-org/gitlab-ce!21444
|
| | | | |
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Remove peek-sidekiq
Closes #51407
See merge request gitlab-org/gitlab-ce!21693
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The reason for removing this gem is that it's not being maintained
anymore. It uses `alias_method_chain` which is deprecated in rails 5
(and removed in 5.1), the issue is pending upstream (including
a fix) - https://github.com/suranyami/peek-sidekiq/issues/3 for a while.
Peek-sidekiq is used in performance bar for displaying sidekiq
statistics.
|
| |/ / / |
|
| |/ /
| |
| |
| | |
Fixes rails 5 deprecation warnings in `config/` files
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Fix closing issue default pattern
Closes #51085
See merge request gitlab-org/gitlab-ce!21531
|
| | |/
| |
| |
| |
| |
| | |
* (Suf)fix #51085 :-)
Signed-off-by: Samuele Kaplun <kaplun@protonmail.com>
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Fix attachments not displaying inline with Google Cloud Storage
Closes #49957
See merge request gitlab-org/gitlab-ce!21265
|
| | |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
There were several issues:
1. With Google Cloud Storage, we can't override the Content-Type with
Response-Content-Type once it is set. Setting the value to
`application/octet-stream` doesn't buy us anything. GCS defaults to
`application/octet-stream`, and AWS uses `binary/octet-stream`. Just remove
this `Content-Type` when we upload new files.
2. CarrierWave and fog-google need to support query parameters:
https://github.com/fog/fog-google/pull/409/files, https://github.com/carrierwaveuploader/carrierwave/pull/2332/files.
CarrierWave has been monkey-patched until an official release.
3. Workhorse also needs to remove the Content-Type header in the request
(https://gitlab.com/gitlab-org/gitlab-workhorse/blob/ef80978ff89e628c8eeb66556720e30587d3deb6/internal/objectstore/object.go#L66),
or we'll get a 403 error when uploading due to signed URLs not matching the headers.
Upgrading to Workhorse 6.1.0 for https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/297
will make Workhorse use the headers that are used by Rails.
Closes #49957
|
| |/
|
|
|
| |
This will help production gain more visibility which browsers may be
having issues.
|
| | |
|
| |\
| |
| |
| |
| | |
Rails 5: include opclasses in rails 5 schema dump
See merge request gitlab-org/gitlab-ce!21416
|
| | | |
|
| | | |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Bump unauthenticated session time from 1 hour to 2 hours
Closes #50393
See merge request gitlab-org/gitlab-ce!21453
|
| | |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Users who have their system clocks configured inconsistently due to Daylight
Savings may see a GitLab session cookie that immediately expires, resulting in
a 422 error. To avoid these errors, we can bump the unauthenticated session
time from 1 hour to 2 hours so they have time to login and get the default 7-day
session.
Closes #50393
|
| |/
|
|
|
|
|
|
|
|
|
|
|
| |
GitLab already has its own session store, so this extra Sidekiq session is
unnecessary. In addition, the GitLab session store properly sets the Secure
flag, unlike the default Rack session.
CSRF protection in the Sidekiq /admin page continues to work with the existing
GitLab session.
See https://github.com/mperham/sidekiq/pull/3183 for more details.
Part of #49120
|
| |
|
|
|
|
|
| |
This is needed to support query parameters in `Fog::Storage::Google`.
See https://github.com/fog/fog-google/pull/409.
Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/49957
|
| |\
| |
| |
| |
| | |
Rails5: Enable verbose query logs
See merge request gitlab-org/gitlab-ce!21231
|
| | | |
|
| |/ |
|
