Age | Commit message (Collapse) | Author |
|
|
|
|
|
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
|
|
[ci skip]
|
|
Upgrade to Ruby 2.4.4
See merge request gitlab-org/gitlab-ce!19055
|
|
|
|
Resolve "A lot of constants redefinition warnings"
Closes #46481
See merge request gitlab-org/gitlab-ce!19286
|
|
into 'master'
Add a monkey patch of https://github.com/carrierwaveuploader/carrierwave/pull/2314
See merge request gitlab-org/gitlab-ce!19102
|
|
Which could extend from EE
|
|
* Replace `require` or `require_relative` with `require_dependency`
* Remove unneeded `autoload`
|
|
|
|
|
|
|
|
Replace grape-route-helpers with our own grape-path-helpers
Closes #45718
See merge request gitlab-org/gitlab-ce!19240
|
|
This gem (https://gitlab.com/gitlab-org/grape-path-helpers) makes a number of changes:
1. Brings in @mdelaossa's changes in https://github.com/reprah/grape-route-helpers/pull/21
2. Fixes some broken specs and code for Grape 1.0+
3. Optimizes the generation of paths by bringing in @dblessing's
HashWithIndifferentAccess changes in https://gitlab.com/gitlab-org/gitlab-ce/issues/45718#note_70123793
Closes #45718
|
|
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.
|
|
This endpoint lists projects shared with a group visible to the
current user.
The `filter` and `sort` params are supported like on the `children` endpoint.
|
|
Persist and use truncated note diffs instead requesting Gitaly in a N+1 manner on MR page
Closes #45190
See merge request gitlab-org/gitlab-ce!18991
|
|
|
|
|
|
|
|
|
|
|
|
|
|
https://github.com/carrierwaveuploader/carrierwave/pull/2314
|
|
Resolve "gitlab 10.8 assumes that installation is a git working copy."
Closes #46600
See merge request gitlab-org/gitlab-ce!19125
|
|
Disable the background Prometheus sampler in tests
See merge request gitlab-org/gitlab-ce!19130
|
|
We request Gitaly in a N+1 manner to build discussion diffs. Once the diffs are from different revisions, it's hard to make a single request to the service in order to build the whole response.
With this change we solve this problem and simplify a lot fetching this piece of info.
|
|
Add `Access-Control-Allow-Headers` to Webpack Dev Server config
Closes #46741
See merge request gitlab-org/gitlab-ce!19131
|
|
|
|
This sampler can interfere with tests and cause transient build failures,
such as https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/70241683.
|
|
without a .git directory
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
'45175-cache-json-instead-of-activerecord-objects-in-appearance-and-applicationsetting' into 'master'
Resolve "Cache JSON instead of ActiveRecord objects in `Appearance` and `ApplicationSetting`"
Closes #45175
See merge request gitlab-org/gitlab-ce!18754
|
|
Resolve "Prometheus integration fails on k8s 1.10"
Closes #46259
See merge request gitlab-org/gitlab-ce!19082
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
|
|
|
|
with version 1.10 of kubernetes API
|
|
Resolve "Upgrade vue-loader for bug fixes and a simpler webpack config"
Closes #45532
See merge request gitlab-org/gitlab-ce!19052
|
|
|
|
|
|
|
|
Also, don't use the provided Middleware, which isn't thread-safe, and
instantiate a new Flipper instance per thread instead.
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
|
|
Current logging tells us we've isolated the calls to about 5 call sites,
now we'd like to know what is calling these methods.
|
|
Remove method call to deprecated method
See merge request gitlab-org/gitlab-ce!18815
|
|
Given the settings initializer creates Gitaly Storage Settings objects
already, the calls to path can be moved to that initializer.
|
|
Fixes #43715
|
|
Upgrade to Webpack 4
Closes #43400
See merge request gitlab-org/gitlab-ce!17218
|
|
* master: (252 commits)
Upgrade underscore.js
Enable prometheus metrics by default
Add signature verification badge to compare view
Add Changelog
Update instalation from source guide
fix Web IDE file tree scroll issue
Enable quick support actions default
Backport of 4084-epics-username-autocomplete
Remove top margin on the terms page with performance bar
Backports every CE related change from ee-44542 to CE
Fix typo in changelog entry
fix missing space
Backport IdentityLinker#failed? from GroupSaml callback flow
Add ci_cd_settings delete_all dependency on project
AutoDevOps Docs fix invalid external link
Ignore knapsack and rspec_flaky
Ensure web hook 'blocked URL' errors are stored in as web hook logs and properly surfaced to the user
Partially revert ebcd5711c5ff937bf925002bf9a5b636b037684e to fix runner pages
Reuses `InternalRedirect` when possible
Enforces terms in the web application
...
|