maxmustermann/gitlab
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
259043 commits 8724 branches 2008 tags 2 GiB
Commit graph

3198 commits

Author SHA1 Message Date
Rémy Coutable b5cc3c933c Update gitlab-dangerfiles to 2.5.0 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2021-11-08 22:58:35 +00:00
Stan Hu 1dd2194d41 Merge branch 'ajk-declarative-policy-1.1.0' into 'master' 
Update declarative_policy to v1.1.0

See merge request gitlab-org/gitlab!73831
 2021-11-08 22:39:47 +00:00
GitLab Dependency Bot 4d615fa36b Update dependency letter_opener_web to v2 2021-11-08 15:09:50 +00:00
Stan Hu bff6c91416 Merge branch '345094-sync-gemfile-lock-in-jh' into 'master' 
Sync `jh/Gemfile.lock` with `Gemfile.lock` + Upgrade Rugged

See merge request gitlab-org/gitlab!73915
 2021-11-08 05:43:10 +00:00
Stan Hu 5def0d1caf Update Rugged to v1.2.0 
Gitaly updated Rugged to v1.2.0 in
https://gitlab.com/gitlab-org/gitaly/-/merge_requests/3966, so to save
some space and installation time let's use the same version.

Changelog: changed
 2021-11-08 12:30:24 +08:00
alexkalderimis 4b07bd7a3e Update declarative_policy to v1.1.0 2021-11-06 12:45:13 +00:00
Eduardo Bonet 882869672f Updating ipynbdiff to 0.3.7 2021-11-04 16:16:46 +01:00
Ash McKenzie d0ae8ff210
Update bootsnap to 1.9.1 and require: false 2021-11-03 15:14:11 +11:00
Rémy Coutable fc4448bb7c
Update gitlab-dangerfiles to 2.4.0 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2021-11-02 12:03:26 +01:00
Nikola Milojevic bb00e42d3d Merge branch '341825-integrate-rb-ipynbdiff-into-gitlab' into 'master' 
Resolve "Integrate rb-ipynbdiff into Gitlab"

See merge request gitlab-org/gitlab!71477
 2021-11-01 16:50:21 +00:00
Matthias Kaeppler c3fb1812a4 Update gitlab-styles to 0.6.4 
This will bring in the Style/OpenStructUse cop.
All existing offense are silenced for now.
 2021-10-29 15:21:43 +02:00
Terri Chu bd00d404a5 Merge branch 'update-gitlab-dangerfiles' into 'master' 
Update gitlab-dangerfiles to 2.3.2

See merge request gitlab-org/gitlab!73242
 2021-10-28 20:00:46 +00:00
Eduardo Bonet 46a0f612b0 Adding Special diff rendering for .ipynb notebooks 
Changes are wrapped by feature flag jupyter_clean_diff.

On the commit folder, when detecting a ipynb file, creates a new diff
of those files after converting them to markdown, using the [ipynbdiff
gem](https://gitlab.com/gitlab-org/incubation-engineering/mlops/rb-ipynbdiff)

There are performance and architectural concerns on whether the rails
app is the right place for this type of diffing, but since we currently
don't have a good solution we are discussing possible alternatives for
the future here: https://gitlab.com/gitlab-org/gitlab/-/issues/342143.

Changelog: added
MR: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71477
Epic: https://gitlab.com/groups/gitlab-org/-/epics/6589
 2021-10-28 17:04:55 +02:00
Peter Leitzen 880383fd67 Merge branch 'systemd' into 'master' 
Add native systemd units

See merge request gitlab-org/gitlab!53847
 2021-10-28 15:00:54 +00:00
Rémy Coutable 8779d659ec
Update gitlab-dangerfiles to 2.3.2 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2021-10-28 09:21:34 +02:00
Stan Hu 325a6c03ab Revert "Merge branch '343695-upgrade-sidekiq-cron' into 'master'" 
This reverts merge request !73093
 2021-10-27 20:32:40 +00:00
Heinrich Lee Yu b0d99d03db
Upgrade sidekiq-cron gem 
Upgrades sidekiq-cron and adds an explicit require for
sidekiq/job_logger and sidekiq/job_retry. Previously, these were loaded
by sidekiq-cron's launcher which is now refactored to only load the
Sidekiq classes when needed.
 2021-10-27 16:32:58 +08:00
Stan Hu 1993feb5e1
Optimize JIRA ref lookup 
In a project with JIRA activated, `ProcessCommitWorker` attempts to add
a comment to a JIRA issue if that issue is mentioned in a
commit. However, the JIRA integration would attempt to retrieve all tags
and branches and pick the first matching ref given a commit OID.

The problem with that approach is that after each push, the list of all
branches and tags are expired and could take a while to gather. Since
multiple `ProcessCommitWorker` jobs can be running at the same time,
this can lead to high I/O on Gitaly nodes since multiple
`ProcessCommitWorker` jobs can run at the same time.

We observe that we don't really need to build the entire ref list; we
can just ask Gitaly for a single matching ref for the given OID with the
newly-created `FindRefsByOID` RPC introduced in
https://gitlab.com/gitlab-org/gitaly/-/merge_requests/3947.

Relates to https://gitlab.com/gitlab-org/gitlab/-/issues/343035

Changelog: performance
 2021-10-25 11:03:02 -07:00
Katrin Leinweber cd8dd8e4a9 Update gitlab-dangerfiles to 2.3.1 
See https://gitlab.com/gitlab-org/gitlab-dangerfiles/-/releases/v2.3.1

Changelog: other
 2021-10-25 09:50:22 +00:00
Joerg Behrmann 608842986b Add sd_notify gem to allow puma to notify systemd about readiness 
This adds an optional gem sd_notify, which, when available, allows puma
to notify systemd about having finished its startup. This allows puma to
be Type=notify instead of Type=simple in its service file.
 2021-10-22 20:42:49 +02:00
Igor Drozdov b334f0d33a Merge branch 'sh-require-azurerm' into 'master' 
Ensure Azure-related gems are loaded

See merge request gitlab-org/gitlab!72433
 2021-10-19 19:53:40 +00:00
Stan Hu b221a58d23
Ensure Azure-related gems are loaded 
We attempted to load the gitlab-fog-azure-rm only if it was really
needed for object storage, but there are a number of cases where we
don't dynamically load these gems when we need them. To avoid the
complexity of this dynamic allocation, we now require the gem, just as
we do with other object storage providers. Unfortunately this adds 5 MB
to the RAM usage of the process according to derailed_benchmarks, but
this fairly typical for a gem for object storage.

Relates to https://gitlab.com/gitlab-org/gitlab/-/issues/334853

Changelog: fixed
 2021-10-19 09:05:13 -07:00
Gabriel Mazetto 7319b4a9ed Add development dependency sprite-factory 2021-10-14 02:52:47 +02:00
Gabriel Mazetto aa87fcd003 Switch from Gemojione to TanukiEmoji 2021-10-14 02:52:37 +02:00
Ash McKenzie 1171c574ba Bump letter_opener_web to v1.4.1 2021-10-11 02:23:10 +00:00
Peter Leitzen 57af068ba1
Upgrade to test-prof 1.0.7 2021-10-07 11:06:37 +02:00
Dmitry Gruzd 34ebc10808 Update Rails to v6.1.4.1 
This MR updates Rails from 6.1.3.2 to 6.1.4.1

Changes:
rails: https://my.diffend.io/gems/rails/6.1.3.2/6.1.4.1
actionpack: https://my.diffend.io/gems/actionpack/6.1.3.2/6.1.4.1
activerecord: https://my.diffend.io/gems/activerecord/6.1.3.2/6.1.4.1
activestorage: https://my.diffend.io/gems/activestorage/6.1.3.2/6.1.4.1

Release notes:
https://github.com/rails/rails/releases
 2021-10-05 10:38:57 +03:00
Reuben Pereira 283dde3e51 Merge branch '329430-upgrade-sidekiq-6' into 'master' 
Upgrade to Sidekiq 6

See merge request gitlab-org/gitlab!69655
 2021-10-04 10:36:12 +00:00
Mehmet Emin INAC a9e7eeb021
Upgrade pry-shell to 0.5.0 2021-09-28 14:13:11 +02:00
Heinrich Lee Yu a72cb81851
Upgrade to Sidekiq 6 
Upgrade to the latest version of Sidekiq
 2021-09-23 18:12:27 +08:00
Stan Hu e586b6e3a5
Fix Content-Disposition header not working in Azure Blob storage 
Prior to this commit, files downloaded in Azure Blob Storage would not
have a Content-Disposition header sent, which would cause files to be
saved with an unfriendly
filename. https://gitlab.com/gitlab-org/gitlab-fog-azure-rm/-/merge_requests/25
added support for retrieving this response header by requesting this in
the Azure shared access signature (SAS) token. We now patch CarrierWave
to send these custom options to the File object.

We drop the dynamic parameter check in the CarrierWave patch since we
have a fog-google version that supports the options. Plus, this dynamic
parameter doesn't work with mocks since the mocks don't copy the exactly
method signature.

Relates to https://gitlab.com/gitlab-org/gitlab/-/issues/341061

Changelog: fixed
 2021-09-21 15:16:34 -07:00
Stan Hu d833c957fa Merge branch 'dblessing_bump_rouge' into 'master' 
Update Rouge syntax highlighting gem to 3.26.1

See merge request gitlab-org/gitlab!70738
 2021-09-21 20:21:19 +00:00
Drew Blessing 879628c826
Update Rouge syntax highlighting gem 
Changelog: changed
 2021-09-21 09:57:11 -05:00
Dmitriy Zaporozhets (DZ) 00c48b8e6e Merge branch '24423-footnotes-with-w-in-the-anchor-don-t-render-as-footnotes' into 'master' 
Footnotes with "w" in the anchor don't render as footnotes!

See merge request gitlab-org/gitlab!70612
 2021-09-20 16:51:50 +00:00
Vitali Tatarintev 55fe4b1a55 Merge branch 'update-gitaly-version-to-14-3-0-pre-rc2' into 'master' 
Bump up the gitaly version to the latest

See merge request gitlab-org/gitlab!70669
 2021-09-20 16:24:58 +00:00
Brett Walker 57c5bad16c Update to commonmarker gem 0.23.2 
which fixes several issues, including a `w` being in
a footnote, and exposing the XML interface

Changelog: fixed
 2021-09-20 11:01:23 -05:00
Vitali Tatarintev 1aa7aa2a7b Merge branch 'upgrade_grape_entity_gem' into 'master' 
Upgrade grape-entity gem

See merge request gitlab-org/gitlab!70403
 2021-09-20 10:19:24 +00:00
David Kim 4593aa3a10 Update gitaly version to 14.3.0.pre.rc2 2021-09-20 16:48:02 +09:30
Andy Soiron 0b21973463 Merge branch '340567-corrective-action-ban-include-actionview-helpers-urlhelper' into 'master' 
Upgrade gitlab-styles to 6.3.0

See merge request gitlab-org/gitlab!70188
 2021-09-17 18:09:27 +00:00
Vladimir Shushlin 6e7ff91045 Upgrade gitlab-styles to 6.3.0 
This adds Rails/IncludeUrlHelper

See https://gitlab.com/gitlab-org/gitlab/-/issues/340567
 2021-09-17 15:59:22 +03:00
Mehmet Emin INAC 20ea20d4e8
Upgrade grape-entity gem 
Upgrading the gem from `0.9.0` to `0.10.0` which contains just one
change to address our patch.
 2021-09-15 15:10:51 +02:00
Matthias Kaeppler 6369298764 Update json gem to v2.5.1 
In preparation for the Ruby 3 upgrade, we should update
json to match the minimum gem version as specified by
the default gem:

https://stdgems.org/json/#gem-version

Which for Ruby 3.0 is 2.5.1.

This will otherwise lead to errors, since rubygems
will encounter conflicting gemspecs during require.

See https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/6286
 2021-09-15 14:09:03 +02:00
David Fernandez dff0f9dacc Merge branch 'sh-upgrade-fog-3.12.0' into 'master' 
Upgrade fog-aws to v3.12.0

See merge request gitlab-org/gitlab!68969
 2021-09-15 08:15:38 +00:00
Stan Hu 9b8ffd2b22 Upgrade fog-aws to v3.12.0 
This upgrade properly supports regional STS endpoints as well as the
ability to set the minimum and maximum multipart chunk size.

Diff:
https://github.com/fog/fog-aws/compare/v3.9.0..v3.12.0

Changelog: fixed
 2021-09-13 19:45:11 +00:00
Pavel Shutsin 93d46378ec Introduce max saml message size setting 
Can be used to increase max SAML message size

Changelog: added
EE: true
 2021-09-09 00:19:02 +02:00
Heinrich Lee Yu d1f6652778
Upgrade gems to support Redis 4.2 
This prepares us for upgrading the redis-rb gem to 4.2+ which is
required for Sidekiq 6
 2021-09-08 14:07:55 +08:00
Bob Van Landuyt c1fa6238a7 Update Prometheus client to 0.15.0 
This includes a bugfix for label ordering: if metrics were reported
with a different label ordering than they were initialized with, they
would not get stored in the file and thus not reported when scraped.

Diff in
https://my.diffend.io/gems/prometheus-client-mmap/0.14.0/0.15.0

Merge request with the changes
https://gitlab.com/gitlab-org/prometheus-client-mmap/-/merge_requests/60
 2021-09-02 14:06:16 +02:00
GitLab Bot 75ef20e20d Automatic merge of gitlab-org/gitlab master 2021-08-31 11:07:03 +00:00
Andy Soiron aec6ac9fd3 Merge branch 'pks-new-blobs-list-blobs' into 'master' 
Implement `#new_blobs` via `#list_blobs`

See merge request gitlab-org/gitlab!68935
 2021-08-31 10:43:33 +00:00
GitLab Bot 8fb4febb16 Automatic merge of gitlab-org/gitlab master 2021-08-30 22:07:10 +00:00