| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
| |
Use data_source_exists? where possible instead of table_exists? in order to be Rails5 compatible
|
| | |
|
| |\
| |
| |
| |
| |
| |
| | |
Resolve "Rename the `Master` role to `Maintainer`"
Closes #42751
See merge request gitlab-org/gitlab-ce!19080
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| |/ |
|
| | |
|
| |\
| |
| |
| |
| |
| | |
'backstage/gb/use-persisted-stages-to-improve-pipelines-table'
# Conflicts:
# db/schema.rb
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | | |
Resolve "Missing Accept button for terms of service"
Closes #46585
See merge request gitlab-org/gitlab-ce!19156
|
| | | |
| | |
| | |
| | |
| | | |
We show a blue flash banner if the user already accepted, and show a
button allowing them to continue to the application.
|
| | |\ \
| | | |
| | | |
| | | |
| | | | |
Rephrase Merge Request Maintainer Edit
See merge request gitlab-org/gitlab-ce!19061
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
branch"
"Maintainer" will be freed to be used for #42751
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
Optimise runner update cached info
See merge request gitlab-org/gitlab-ce!19187
|
| | | | |/
| | |/| |
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Fix an N+1 in avatar URLs
Closes #43114
See merge request gitlab-org/gitlab-ce!18488
|
| | | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This is tricky: the query was being run in
`ObjectStorage::Extension::RecordsUploads#retrieve_from_store!`, but we can't
just add batch loading there, because the `#upload=` method there would use the
result immediately, making the batch only have one item.
Instead, we can pre-emptively add an item to the batch whenever an avatarable
object is initialized, and then reuse that batch item in
`#retrieve_from_store!`. However, this also has problems:
1. There is a lot of logic in `Avatarable#retrieve_upload_from_batch`.
2. Some of that logic constructs a 'fake' model for the batch key. This should
be fine, because of ActiveRecord's override of `#==`, but it relies on that
staying the same.
|
| |\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | | |
'backstage/gb/use-persisted-stages-to-improve-pipelines-table'
# Conflicts:
# db/schema.rb
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Add background migrations to archive legacy job traces
Closes #46642
See merge request gitlab-org/gitlab-ce!19194
|
| | | | | | |
|
| | | | | | |
|
| | | |/ /
| |/| | |
|
| |\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | | |
'backstage/gb/use-persisted-stages-to-improve-pipelines-table'
Conflicts:
app/models/ci/pipeline.rb
|
| | | | | |
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Fix attr_encryption key settings
Closes #47166
See merge request gitlab-org/gitlab-ce!19341
|
| | | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
attr_encrypted does different things with `key` depending on what mode you are using:
1. In `:per_attribute_iv_and_salt` mode, it generates a hash with the salt:
https://github.com/attr-encrypted/encryptor/blob/c3a62c4a9e74686dd95e0548f9dc2a361fdc95d1/lib/encryptor.rb#L77.
There is no need to truncate the key to 32 bytes here.
2. In `:per_attribute_iv` mode, it sets the key directly to the password, so
truncation to 32 bytes is necessary.
Closes #47166
|
| | |\ \ \
| | |/ / |
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | | |
Upgrade to Ruby 2.4.4
See merge request gitlab-org/gitlab-ce!19055
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Fixes that make this work:
* A change in Ruby (https://github.com/ruby/ruby/commit/ce635262f53b760284d56bb1027baebaaec175d1)
requires passing in the exact required length for OpenSSL keys and IVs.
* Ensure the secrets.yml is generated before any prepended modules are
loaded. This is done by renaming the `secret_token.rb` initializer to
`01_secret_token.rb`, which is a bit ugly but involves the least impact on
other files.
|
| | | | | | |
|
| | | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
ReactiveCaching#clear_reactive_cache! should not keep the cache alive
See merge request gitlab-org/gitlab-ce!19311
|
| | | | | | | |
|
| | | |\ \ \ \
| | | |/ / /
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
'46913-appearance-uploader-fields-and-description-html-are-missing-in-cached-version' into 'master'
Resolve "Appearance uploader fields and description HTML are missing in cached version"
Closes #46913
See merge request gitlab-org/gitlab-ce!19203
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Caching the attributes as JSON and manually instantiating the record
ended-up very complex since the edge-cases such as upload fields,
serialized fields, and fields with custom accessors had to be handled.
To ensure 3 points out of 4 are checked from https://gitlab.com/gitlab-org/gitlab-ce/issues/45175
we now include the Rails version in the cache key.
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| | | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
'master'
Improve validations for Ci::Runner#runner_type
See merge request gitlab-org/gitlab-ce!18901
|
| | | | | | | | |
|
| | | | | | | | |
|
| | | | | | | | |
|
| | | | | | | | |
|
| | | | | | | | |
|
| | | | | | | | |
|
| | | | | | | | |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
runner
|
| | | | | | | | |
|
| | | | | | | | |
|
