| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| |\
| |
| |
| |
| | |
Prepare 10.8 RC3 release
See merge request gitlab-org/gitlab-ce!18772
|
| |/
|
|
|
|
|
| |
Only run session related Warden hooks for user scope
Closes gitlab-ee#5857
See merge request gitlab-org/gitlab-ce!18771
|
| | |
|
| |\
| |
| |
| |
| | |
Prepare 10.8 RC2 release
See merge request gitlab-org/gitlab-ce!18744
|
| |/
|
|
|
|
|
|
|
|
| |
'46049-import-export-import-is-broken-due-to-the-addition-of-a-ci-table' into 'master'
Resolve "Import/Export (import) is broken due to the addition of a CI table"
Closes #46049
See merge request gitlab-org/gitlab-ce!18745
|
| | |
|
| |
|
|
|
|
|
|
|
| |
'45970-broken-master-in-spec-features-issues-user_uses_slash_commands_spec-rb' into 'master'
Resolve "Broken master in spec/features/issues/user_uses_slash_commands_spec.rb"
Closes #45970
See merge request gitlab-org/gitlab-ce!18687
|
| |\
| |
| |
| |
| | |
[Rails5] Fix spec/services/applications/create_service_spec.rb
See merge request gitlab-org/gitlab-ce!18665
|
| |/ |
|
| |\
| |
| |
| |
| | |
[Rails5] Fix spec/models/notification_setting_spec.rb
See merge request gitlab-org/gitlab-ce!18664
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
In Rails 5 assigning a value which is not explicitly `true` or `false` to a boolean column transforms it to `true`.
In Rails 4 it transforms the value to `false` with the deprecation warning:
```
DEPRECATION WARNING: You attempted to assign a value which is not explicitly `true` or `false` ("nil") to a boolean column. Currently this value casts to `false`. This will change to match Ruby's semantics, and will cast to `true` in Rails 5. If you would like to maintain the current behavior, you should explicitly handle the values you would like cast to `false`.
```
This commit fixes the spec that expects to receive Rails 4 behavior.
|
| |\ \
| | |
| | |
| | |
| | | |
[Rails5] Fix enum question mark methods
See merge request gitlab-org/gitlab-ce!18662
|
| |/ / |
|
| |\ \
| | |
| | |
| | |
| | | |
Display and revoke active sessions
See merge request gitlab-org/gitlab-ce!17867
|
| |/ / |
|
| |\ \
| | |
| | |
| | |
| | | |
[Rails5] Fix `undefined method 'downcase'` errors in requests specs
See merge request gitlab-org/gitlab-ce!18645
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
In Rails 5.0 headers are no longer inherited from Hash.
This commit fixes errors in requests specs like:
```
1) API::V3::Builds GET /projects/:id/builds/:build_id/artifacts job with artifacts when artifacts are stored locally authorized user returns specific job artifacts
Failure/Error: expect(response.headers).to include(download_headers)
NoMethodError:
undefined method `downcase' for #<Hash:0x000055e8bccc23b0>
# ./spec/requests/api/v3/builds_spec.rb:235:in `block (6 levels) in <top (required)>'
```
|
| |\ \ \
| | | |
| | | |
| | | |
| | | | |
[Rails5] Add `touch_later` to `Commit` model
See merge request gitlab-org/gitlab-ce!18642
|
| | |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This commit fixes errors like:
```
1) API::Todos GET /todos when unauthenticated returns authentication error
Failure/Error: @raw.__send__(method, *args, &block) # rubocop:disable GitlabSecurity/PublicSend
NoMethodError:
undefined method `touch_later' for #<Gitlab::Git::Commit:0x00005573f5196270>
# ./app/models/commit.rb:259:in `method_missing'
# ./spec/requests/api/todos_spec.rb:12:in `block (2 levels) in <top (required)>'
```
|
| |\ \ \
| | | |
| | | |
| | | |
| | | | |
[Rails5] Fix Arel::UpdateManager
See merge request gitlab-org/gitlab-ce!18641
|
| | |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
In Arel 7.0.0 (Arel 7.1.4 is used in Rails 5.0) the `engine` parameter
of `Arel::UpdateManager#initializer` was removed.
This commit makes the gitlab database helpers work both in rails 4 and
rails 5.
Fixes errors like this one:
```
1) Gitlab::Database::MigrationHelpers#update_column_in_batches when running outside of a transaction updates all the rows in a table
Failure/Error:
update_arel = Arel::UpdateManager.new(ActiveRecord::Base)
.table(table)
.set([[table[column], value]])
.where(table[:id].gteq(start_id))
ArgumentError:
wrong number of arguments (given 1, expected 0)
# ./lib/gitlab/database/migration_helpers.rb:317:in `new'
# ./lib/gitlab/database/migration_helpers.rb:317:in `block in update_column_in_batches'
# ./lib/gitlab/database/migration_helpers.rb:307:in `loop'
# ./lib/gitlab/database/migration_helpers.rb:307:in `update_column_in_batches'
# ./spec/lib/gitlab/database/migration_helpers_spec.rb:367:in `block (4 levels) in <top (required)>'
```
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
'master'
[Rails5] Fix `TZInfo::InvalidTimezoneIdentifier` exception
See merge request gitlab-org/gitlab-ce!18640
|
| | |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
In Rails 4.2.10 the `ActiveSupport::TimeZone.find_tzinfo(timezone_name)`
method calls `TZInfo::TimezoneProxy.new(timezone_name)` which returns
`timezone_name` if it is invalid.
But in Rails 5.0 the `ActiveSupport::TimeZone.find_tzinfo(timezone_name)`
method now calls the `TZInfo::Timezone.new(timezone_name)` method which
throws the `TZInfo::InvalidTimezoneIdentifier: Invalid identifier`
exception if `timezone_name` is invalid.
This commit adds the rescue block to return timezone name if the
exception is raised.
Also this change fixes the error:
```
1) Ci::PipelineSchedule validations does not allow invalid cron patters
Failure/Error: ActiveSupport::TimeZone.find_tzinfo(timezone).name
TZInfo::InvalidTimezoneIdentifier:
Invalid identifier
# ./lib/gitlab/ci/cron_parser.rb:28:in `timezone_name'
# ./lib/gitlab/ci/cron_parser.rb:9:in `initialize'
# ./app/validators/cron_validator.rb:6:in `new'
# ./app/validators/cron_validator.rb:6:in `validate_each'
# ./spec/models/ci/pipeline_schedule_spec.rb:26:in `block (3 levels) in <top (required)>'
```
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
'blackst0ne-rails5-use-safe-params-instead-of-params-in-url-for-helpers' into 'master'
[Rails5] Use `safe_params` instead of `params` in `url_for` helpers
See merge request gitlab-org/gitlab-ce!18637
|
| | |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This commits replaces `params` with `safe_params` in `url_for` helpers
to resolve security issues [1] and failing specs with the
```
ArgumentError:
Attempting to generate a URL from non-sanitized request parameters!
An attacker can inject malicious data into the generated URL, such as
changing the host. Whitelist and sanitize passed parameters to be secure.
```
error.
[1]: https://gitlab.com/gitlab-org/gitlab-ce/issues/45168
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into 'master'
[Rails5] Update `ApplicationController#log_exception` to fix `undefined method 'clean'` error
See merge request gitlab-org/gitlab-ce!18636
|
| | |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
method 'clean'` error
This commit fixes the error:
```
1) Projects::TodosController Merge Requests POST create when not authorized for merge_request doesn't create todo
Failure/Error: application_trace = ActionDispatch::ExceptionWrapper.new(env, exception).application_trace
NoMethodError:
undefined method `clean' for #<Hash:0x000055be5bda35d0>
Did you mean? clear
# ./app/controllers/application_controller.rb:113:in `log_exception'
# ./app/controllers/application_controller.rb:40:in `block in <class:ApplicationController>'
# ./spec/controllers/projects/todos_controller_spec.rb:80:in `go'
# ./spec/controllers/projects/todos_controller_spec.rb:138:in `block (6 levels) in <top (required)>'
# ./spec/controllers/projects/todos_controller_spec.rb:138:in `block (5 levels) in <top (required)>'
# ------------------
# --- Caused by: ---
# ActiveRecord::RecordNotFound:
# Couldn't find MergeRequest
# ./app/finders/concerns/finder_methods.rb:19:in `raise_not_found_unless_authorized'
Finished in 7.53 seconds (files took 12.8 seconds to load)
1 example, 1 failure
```
Also see https://github.com/rails/rails/commit/6d85804bc6aeecce5669fb4b0d7b33c069deff3a
|
| |\ \ \
| | | |
| | | |
| | | |
| | | | |
Fix file_store for artifacts and lfs when saving
See merge request gitlab-org/gitlab-ce!18624
|
| | | | | |
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
[Rails5] Fix `params` for DeleteUserWorker
See merge request gitlab-org/gitlab-ce!18635
|
| | | | | | |
|
| | | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This commit fixes the error:
```
1) Admin::UsersController DELETE #user with projects deletes the user and their contributions when hard delete is specified
Failure/Error: Users::DestroyService.new(current_user).execute(delete_user, options.symbolize_keys)
NoMethodError:
undefined method `symbolize_keys' for "{\"hard_delete\"=>\"true\"}":String
# ./app/workers/delete_user_worker.rb:8:in `perform'
# ./lib/gitlab/sidekiq_status/server_middleware.rb:5:in `call'
# ./config/initializers/forbid_sidekiq_in_transactions.rb:35:in `block (2 levels) in <module:NoEnqueueingFromTransactions>'
# ./app/models/user.rb:913:in `delete_async'
# ./app/controllers/admin/users_controller.rb:148:in `destroy'
# ./lib/gitlab/i18n.rb:50:in `with_locale'
# ./lib/gitlab/i18n.rb:56:in `with_user_locale'
# ./app/controllers/application_controller.rb:327:in `set_locale'
# ./spec/controllers/admin/users_controller_spec.rb:28:in `block (3 levels) in <top (required)>'
Finished in 6.81 seconds (files took 13.9 seconds to load)
1 example, 1 failure
```
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Enable LFS setting UI for Masters and Owners
Closes #33320
See merge request gitlab-org/gitlab-ce!18562
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
LFS can be enabled and disabled per project using the API by Masters
and Owners, but the UI is only available to Admins. The interface and
API should be consistent.
LFS can also be enabled and disabled per group using the API by Owners,
but the UI is only available to Admins. This interface should also be
consistent.
Additionally removes an unneeded check if 2FA interface, since the
interface is only available to Owners.
Closes #33320
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Migrate pipeline stages indices
Closes #43009
See merge request gitlab-org/gitlab-ce!18420
|
| | | | | | | |
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | | |
* master: (106 commits)
|
| | | | | | | | |
|
| | | | | | | | |
|
| | |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | | |
# Conflicts:
# db/schema.rb
|
| | | | | | | | | |
|
| | | | | | | | | |
|
| | | | | | | | | |
|
| | | | | | | | | |
|
| | | | | | | | | |
|
| | | | | | | | | |
|
| | | | | | | | | |
|
| | | | | | | | | |
|
| | | | | | | | | |
|
