f9fd9b1def
Merge branch 'zj-pool-destruction' into 'master'
...
Leave object pools when destroying projects
Closes gitaly#1415
See merge request gitlab-org/gitlab-ce!23869
2018-12-19 13:03:54 +00:00
752e9c18a1
Leave object pools when destroying projects
...
This action doesn't lean on reduplication, so a short call can me made
to the Gitaly server to have the object pool remove its remote to the
project pending deletion.
https://gitlab.com/gitlab-org/gitaly/blob/f6cd55357/internal/git/objectpool/link.go#L58
When an object pool doesn't have members, this would invalidate the need
for a pool. So when a project leaves the pool, the pool will be
destroyed on the background.
Fixes: https://gitlab.com/gitlab-org/gitaly/issues/1415
2018-12-19 13:21:56 +01:00
3146bb5c0b
Merge branch 'deprecated-alias-method-chain' into 'master'
...
Fix deprecation: alias_method_chain is deprecated. Please, use Module#prepend instead
See merge request gitlab-org/gitlab-ce!23887
2018-12-18 10:10:01 +00:00
aaa51fe9ea
Bump gitlab-reliable-fetcher gem
2018-12-17 20:48:46 +02:00
7e5c36fbad
Fix deprecation: alias_method_chain is deprecated. Please, use Module#prepend instead
2018-12-17 19:24:57 +01:00
060eccc70d
Specify sass ~> 3.5 in Gemfile
2018-12-12 13:32:46 +01:00
dc2666cfa6
Bump sentry-raven gem to 2.7.4
...
Contains only minor fixes from 2.7.2:
https://github.com/getsentry/raven-ruby/releases
2018-12-10 08:46:00 -08:00
cf8b8ff99b
Add feature flag for workhorse content type calculation
2018-12-06 21:22:39 +00:00
79b44c16cc
Update gitaly-proto to v1.3.0
2018-12-06 18:57:59 +00:00
d47cd9be8f
Upgrade rspec-parameterized to 0.4.1
...
rspec-parameterized 0.4.0 fails spectacularly with Ruby 2.5.3 with the
following error:
```
RuntimeError:
No such frame, gone beyond end of stack!
```
This happens because of a Ruby bug in
https://bugs.ruby-lang.org/issues/15105 . The binding_of_caller gem
induces this failure. This upgrade switches to the binding_of_ninja gem,
which does not have the same problem.
2018-12-05 16:51:48 -08:00
af5d7dea7f
Update batch-loader dependency
2018-12-04 13:00:16 +01:00
60c595c9e1
Bump gpgme gem version from 2.0.13 to 2.0.18
2018-12-03 05:59:52 +00:00
3cf07b6e02
Manually edited the Gemfile.lock to make the gitlab-ce pipeline happy.
2018-11-30 07:21:01 +01:00
7c0718cd79
Merge branch '51083-fix-move-api' into 'master'
...
Commits API: Preserve file content in move operations if unspecified
Closes #52974 et #51083
See merge request gitlab-org/gitlab-ce!23387
2018-11-29 11:36:16 +00:00
dc962788fa
Add monkey patch to unicorn to fix eof? problem
...
Rack with Unicorn is unable to handle chunked requests due to private `eof?` method.
This exposes `eof?` not changing `rack` behavior.
Issue: https://gitlab.com/gitlab-org/gitlab-ee/issues/8539
2018-11-28 08:34:32 -08:00
a54352406a
Update Gitaly and gitaly-proto
2018-11-27 15:42:51 +00:00
921d6b1a13
Merge branch 'upgrade_kubeclient_400' into 'master'
...
Upgrade kubeclient to 4.0.0
See merge request gitlab-org/gitlab-ce!23261
2018-11-27 11:18:36 +00:00
d3f033d69c
Merge branch 'bvl-use-shell-writeref' into 'master'
...
Don't use rugged write-ref anymore
See merge request gitlab-org/gitlab-ce!23286
2018-11-27 08:56:26 +00:00
685218c423
Upgrade kubeclient to 4.0.0
...
Bumps kubeclient and its dependencies from 3.1.0 to 4.0.0.
2018-11-27 10:52:10 +13:00
5e9921d547
Update gitaly and gitaly-proto
2018-11-26 16:44:26 +01:00
48d29f1417
Upgrade better_errors gem to 2.5.0
...
This gem is only used for development, and the latest version has been
tested with Rails 5/Ruby 2.5.
Changes: https://github.com/BetterErrors/better_errors/releases
2018-11-22 15:18:04 -08:00
5b42ebbf24
Upgrade escape_utils to 1.2.1
...
This matches the version shipped in gitaly-ruby.
The main changes between 1.1.1 and 1.2.1 are CI-related
improvements:
https://github.com/brianmario/escape_utils/compare/1.1.1...1.2.1
2018-11-20 10:09:19 -08:00
8a581d531b
Merge branch 'sh-bump-gems-security' into 'master'
...
Bump nokogiri, loofah, and rack gems for security updates
See merge request gitlab-org/gitlab-ce!23204
2018-11-19 23:29:15 +00:00
eded081522
Bump nokogiri, loofah, and rack gems for security updates
...
loofah: CVE-2018-16468:
https://github.com/flavorjones/loofah/issues/154
nokogiri: CVE-2018-14404 and CVE-2018-14567
https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md
rack: CVE-2018-16471
e5d58031b7https://github.com/svenfuchs/i18n/releases
concurrent-ruby: https://github.com/ruby-concurrency/concurrent-ruby/blob/master/CHANGELOG.md
2018-11-19 20:21:18 -02:00
1ecf096207
Bump ruby_parser to 3.11.0 for Ruby 2.5 compatibility
...
See https://github.com/seattlerb/ruby_parser/blob/master/History.rdoc
2018-11-19 20:11:21 -02:00
07d10976d2
Merge branch '54093-the-default_value_for-gem-doesn-t-handle-actioncontroller-parameters-correctly' into 'master'
...
Replace the `default_value_for` gem with the `gitlab-default_value_with` gem which handles `ActionController::Parameters` correctly
Closes #54093
See merge request gitlab-org/gitlab-ce!23114
2018-11-19 10:02:21 +00:00
7548c4d5af
Merge branch '54004-update-asana-to-0.8.1' into 'master'
...
Update asana to 0.8.1
Closes #54004
See merge request gitlab-org/gitlab-ce!23039
2018-11-19 09:58:59 +00:00
96fb16743d
Merge branch 'sh-use-nakayoshi-fork' into 'master'
...
Improve memory performance by reducing dirty pages before fork
See merge request gitlab-org/gitlab-ce!23169
2018-11-19 08:33:54 +00:00
8759096456
Update asana to 0.8.1
...
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
2018-11-19 17:30:25 +09:00
d892df9adc
Merge branch '54010-update-asciidoctor-to-1.5.8' into 'master'
...
Update asciidoctor to 1.5.8
Closes #54010
See merge request gitlab-org/gitlab-ce!23047
2018-11-19 07:42:51 +00:00
d991ea6ddd
Improve memory performance by reducing dirty pages after fork()
...
The nakayoshi_fork gem works around the lack of a Ruby compacting
garbage collecting by calling GC.start a few times to "promote" the age
of young objects to the maximum age 3. This reduces the number of dirty
pages and consequently improves copy-on-write behavior with unicorn
and other forking Web application servers.
2018-11-18 00:46:27 -08:00
47dd7d0bbe
Use gitlab-default_value_with Rails 5
...
This forks live at https://github.com/gitlabhq/default_value_for/tree/69-fix-action_controller-parameters-handling
and fixes an issue where default_value_for wouldn't handle
`ActionController::Parameters` correctly with Rails 5.
This fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/54093 .
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-11-15 16:44:22 +01:00
b27db6cf0a
Use the new parallel keyword in .gitlab-ci.yml
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-11-15 14:34:41 +01:00
4166ce773b
Update asciidoctor to 1.5.8
...
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
2018-11-15 00:33:48 +09:00
af3a73ef9c
Merge branch 'switch-rails' into 'master'
...
Switch to Rails 5
Closes #14286 and #48991
See merge request gitlab-org/gitlab-ce!21492
2018-11-14 14:01:14 +00:00
bf05a738a8
Bump `binding_of_caller` gem version to 0.8.0
2018-11-14 12:22:51 +00:00
f6d368c748
Minor gem fixes
2018-11-14 12:41:16 +01:00
547dc7ac60
Switch to Rails 5 by default
...
* updates Gemfile
* uses Rails 5 unless explicitly disabled
2018-11-14 12:38:30 +01:00
474b502afe
Merge branch '53289-update-haml_lint-to-0-28-0' into 'master'
...
Update haml_lint to 0.28.0
Closes #53289
See merge request gitlab-org/gitlab-ce!22660
2018-11-13 08:41:25 +00:00
1818570c17
Merge branch '53291-update-ffaker-to-2-10-0' into 'master'
...
Update ffaker to 2.10.0
Closes #53291
See merge request gitlab-org/gitlab-ce!22661
2018-11-13 08:39:20 +00:00
a407bba81a
Merge branch 'sh-bump-redis-store' into 'master'
...
Bump redis-store to 1.6.0
See merge request gitlab-org/gitlab-ce!22963
2018-11-12 15:40:22 +00:00
1116de5eeb
Merge branch 'sh-bump-mime-types' into 'master'
...
Bump mime-types to 3.2.2
See merge request gitlab-org/gitlab-ce!22957
2018-11-12 15:40:10 +00:00
76235ee065
Merge branch 'sh-bump-sidekiq' into 'master'
...
Bump Sidekiq and other related gems
See merge request gitlab-org/gitlab-ce!22956
2018-11-12 11:17:51 +00:00
ca3e9b9759
Merge branch 'blackst0ne-add-discord-service' into 'master'
...
Add Discord integration
Closes #21635
See merge request gitlab-org/gitlab-ce!22684
2018-11-12 10:12:48 +00:00
1e1f99f2b1
Update gitlab-markup gem to avoid binary name collision
...
See https://gitlab.com/gitlab-org/gitlab-ce/issues/53082
2018-11-11 18:58:17 -03:00
e01b1907bb
Bump redis-store to 1.6.0
...
This version supports SSL/TLS via the redis:// URL scheme:
https://github.com/redis-store/redis-store/blob/master/CHANGELOG.md
Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/47702
2018-11-10 23:17:34 -08:00
9fa3086d09
Bump mime-types to 3.2.2
...
Full list of changes:
https://github.com/mime-types/ruby-mime-types/blob/master/History.md
This matches the version shipped in gitaly-ruby.
2018-11-09 22:05:58 -08:00
135c191360
Bump Sidekiq and other related gems
...
* Sidekiq changes:
https://github.com/mperham/sidekiq/blob/master/Changes.md
* Rack 1.6.1 fixes CVE-2014-9490:
https://github.com/rack/rack/blob/master/CHANGELOG.md
* rack-protection 2.0.4 only fixes a minor message:
https://github.com/sinatra/sinatra/commits/master/rack-protection
2018-11-09 21:57:34 -08:00
6d8810a64f
Merge branch 'fj-41213-api-update-submodule-commit' into 'master'
...
Add endpoint to update a git submodule reference
Closes #41213
See merge request gitlab-org/gitlab-ce!20949
2018-11-07 15:11:30 +00:00
1183183403
Merge branch 'remove-asset-sync' into 'master'
...
Remove asset_sync gem and related code
Closes omnibus-gitlab#3872
See merge request gitlab-org/gitlab-ce!22610
2018-11-07 14:10:23 +00:00
28cbb2acfe
Add submodule update API endpoint
...
This new endpoint allow users to update a submodule's reference.
The MR involves adding a new operation RPC operation in gitaly-proto
(see gitlab-org/gitaly-proto!233 ) and change Gitaly to use this
new version (see gitlab-org/gitaly!936 ).
See gitlab-org/gitlab-ce!20949
2018-11-07 14:03:30 +01:00
0ba3d1411f
Update Gemfile
2018-11-05 13:55:56 +11:00
846d84602f
Add Discord integration
2018-10-30 22:23:20 +11:00
be46fb7e64
Merge branch '53270-remove-mousetrap-rails' into 'master'
...
Remove mousetrap-rails gem
Closes #53270
See merge request gitlab-org/gitlab-ce!22647
2018-10-29 21:53:29 +00:00
18db027d4b
Update ffaker to 2.10.0
...
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
2018-10-29 23:22:58 +09:00
c94efdaccf
Update haml_lint to 0.28.0
...
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
2018-10-29 22:56:58 +09:00
7fb30b4cc4
Upgrade whitequark/parser to 2.5.3.0
...
This squelches the following warning:
warning: parser/current is loading parser/ruby24, which recognizes
warning: 2.4.4-compliant syntax, but you are running 2.4.5.
warning: please see https://github.com/whitequark/parser#compatibility-with-ruby-mri .
2018-10-28 23:58:21 -07:00
c4909d2edf
Remove mousetrap-rails gem
...
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
2018-10-28 19:57:59 +09:00
679c0048a8
Merge branch 'an-multithreading' into 'master'
...
Puma in GDK and rack server lifecycle event abstractions
Closes #52762
See merge request gitlab-org/gitlab-ce!22372
2018-10-25 22:29:00 +00:00
1c7c140016
Remove asset_sync gem and related code
...
Reverting https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15734 .
We are not using asset sync currently.
2018-10-25 23:35:38 +05:30
1065f8ce7a
Add experimental support for Puma
...
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.
2018-10-25 17:50:15 +01:00
4453adb59b
Upgrade parser gem to 2.5.1.2
2018-10-24 16:33:19 -07:00
436d5b023b
Bump google-protobuf to 3.6.1
...
It looks like gRPC may have worked around
https://github.com/google/protobuf/issues/4210 via
https://github.com/grpc/grpc/pull/14634 .
This is needed to support Ruby 2.5
(https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22555 ).
2018-10-24 01:53:12 -07:00
1696a3e8c3
Merge branch '44361-remove-gitlab-grit' into 'master'
...
Remove gitlab-grit as a transitive dependency of GitLab
Closes #44361
See merge request gitlab-org/gitlab-ce!22373
2018-10-17 13:17:20 +00:00
99127e6a15
Merge branch 'grpc-update-1-15' into 'master'
...
Use grpc v1.15.x
See merge request gitlab-org/gitlab-ce!22350
2018-10-16 12:54:37 +00:00
c7be9f5cac
Remove a dependency on gitlab-gollum-lib
...
Removing this dependency also allows us to remove a transitive
dependency on gitlab_grit - which is the whole point of this exercise.
I don't think we can EOL gitlab_grit until it's removed as a dependency
from gitaly-ruby, but this at least gets it out of gitlab-ce.
2018-10-16 12:53:30 +01:00
04aaf71932
Inline the gitlab-flowdock-git-hooks gem
...
This allows us to avoid one transitive dependency on gitlab-grit. The
aim is to remove all transitive dependencies.
2018-10-16 11:54:55 +01:00
6d57cf9dd2
Use grpc v1.15.x
2018-10-15 15:28:47 -03:00
399056ed78
Remove dependencies on Linguist
...
This saves about 128 MB of baseline RAM usage per Unicorn and
Sidekiq process (!).
Linguist wasn't detecting languages anymore from CE/EE since
9ae8b57467
2018-10-12 17:17:30 -07:00
73ce1ebc6f
Bump rugged to 0.27.5 for security fixes
...
See: https://github.com/libgit2/libgit2/releases
2018-10-08 15:58:22 -07:00
1973d0c183
Merge branch 'add_reliable_fetcher' into 'master'
...
Add reliable sidekiq fetcher
See merge request gitlab-org/gitlab-ce!21715
2018-10-04 16:58:25 +00:00
8a8ae2f57f
Merge branch 'update-dev-test-gems' into 'master'
...
Update Development related gems
See merge request gitlab-org/gitlab-ce!22066
2018-10-03 18:46:33 +00:00
e631c252fa
Update Development related gems
...
Upgrade to latest version the following gems:
* Spring
* Bootsnap
* Thin
* webpack-rails
* pry-rails
2018-10-03 13:15:48 -03:00
34687cf05d
Add reliable fetcher for Sidekiq
2018-10-03 18:10:46 +03:00
a5cfacc281
Merge branch 'remove-rugged' into 'master'
...
Remove Gitlab::Git::Repository#rugged
See merge request gitlab-org/gitlab-ce!22039
2018-10-03 09:06:32 +00:00
a99bf447a2
Remove Gitlab::Git::Repository#rugged and Gollum code
...
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.
2018-10-02 16:34:28 -03:00
2bb8c1caa5
Merge branch 'rouge-3.3.0' into 'master'
...
Update to Rouge 3.3.0 including frozen string literals for improved memory usage
See merge request gitlab-org/gitlab-ce!22035
2018-10-02 01:40:53 +00:00
21a5e70bf4
Update to Rouge 3.3.0 including frozen string literals for improved memory usage
2018-10-01 17:39:43 -05:00
df73116f75
Merge branch '37433-solve-n-1-in-refs-controller-logs-tree' into 'master'
...
Adds list_last_commits_for_tree as the method call for the Gitaly ListLastCommitsForTree RPC
Closes #37433
See merge request gitlab-org/gitlab-ce!21921
2018-10-01 13:13:40 +00:00
a583f137dd
Removes N+1 gitaly rpc call to fetch the last commit for path
...
Implements list_last_commits_for_tree to communicate with the
ListLastCommitsForTree Gitaly RPC
Bumps the Gitaly server version
Bumps the Gitaly-Proto gem version
2018-10-01 13:29:47 +01:00
bfa26f4ffc
Update Gemfile.lock
2018-09-28 16:19:49 -05:00
cb1e4a8abb
Merge branch 'master' into 'remove-dropzonejs-rails'
...
# Conflicts:
# Gemfile.lock
2018-09-28 18:33:41 +00:00
5481651215
Merge branch '51299-update-grape' into 'master'
...
Update grape to 1.1.0 to address a XSS vulnerability
Closes #51299
See merge request gitlab-org/gitlab-ce!21639
2018-09-26 21:09:02 +00:00
2daa8d387b
Remove background job throttling feature
...
We remove this feature as it never worked properly
2018-09-24 18:41:14 +03:00
99612476e5
Merge branch 'remove-sidekiq' into 'master'
...
Remove peek-sidekiq
Closes #51407
See merge request gitlab-org/gitlab-ce!21693
2018-09-14 16:06:10 +00:00
9930ab6ab8
Remove peek-sidekiq
...
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.
2018-09-12 10:13:19 +02:00
0b9365b6ef
Updated commonmarker gem to 0.17.13
2018-09-11 12:41:12 -05:00
f693ef61d3
Update grape to 1.1.0 to address a XSS vulnerability
...
See
https://github.com/ruby-grape/grape/blob/master/CHANGELOG.md#110-842018 .
This fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/51299 .
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-09-10 12:04:03 +02:00
c45daaf770
Bump Sidekiq 5.1.3 to 5.2.1
...
The most significant change in this version is that the default
concurrency has been lowered from 25 to 10 (https://github.com/mperham/sidekiq/issues/3892 ).
This doesn't affect omnibus-gitlab because the concurrency is controlled via a
setting that defaults to 25 anyway and is passed in via the `-c` command-line
parameter.
However, source installations (including the GDK) will have to either specify
the concurrency in `sidekiq.yml` or use the `-c` option.
Full list of changes: https://github.com/mperham/sidekiq/blob/master/Changes.md
2018-09-09 09:19:37 -07:00
044fe6b3c9
Merge branch '51180-update-ffi-to-1.9.25' into 'master'
...
Update ffi to 1.9.25
Closes #51180
See merge request gitlab-org/gitlab-ce!21561
2018-09-07 17:45:38 +00:00
932b2af844
Use gitaly-proto 0.117.0
2018-09-06 16:01:47 -03:00
50a39e563e
Update ffi to 1.9.25
2018-09-06 21:19:17 +09:00
abc2caaa28
Merge branch 'sh-fix-attachments-inline' into 'master'
...
Fix attachments not displaying inline with Google Cloud Storage
Closes #49957
See merge request gitlab-org/gitlab-ce!21265
2018-09-06 11:30:15 +00:00
262b974123
Fix attachments not displaying inline with Google Cloud Storage
...
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
(ef80978ff8/internal/objectstore/object.go (L66)https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/297
will make Workhorse use the headers that are used by Rails.
Closes #49957
2018-09-05 17:01:54 -07:00
0f083ee9ff
Bump browser gem to v2.5.3
...
Full list of changes: https://github.com/fnando/browser/blob/master/CHANGELOG.md
2018-09-05 14:49:02 -07:00
265b491354
Merge branch '50930-update-rubyzip-to-1-2-2' into 'master'
...
Update rubyzip gem to 1.2.2 (CVE-2018-1000544)
Closes #50930
See merge request gitlab-org/gitlab-ce!21460
2018-09-04 18:03:08 +00:00
3a4d3dff51
Merge branch 'junit-results' into 'master'
...
Enable JUnit results for rspec
See merge request gitlab-org/gitlab-ce!21449
2018-09-04 13:33:50 +00:00
3a35a03ff8
Stop using Flay
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-09-03 15:31:53 +02:00
789fae50fb
Enable JUnit results for rspec
2018-09-03 14:59:55 +02:00
4df16d8d5a
Update rubyzip to 1.2.2 (CVE-2018-1000544)
2018-09-03 15:32:57 +09:00
9b7753ed85
Upgrade LicenseFinder Gem to v5.4.0
2018-08-30 15:38:52 +00:00
93b9bfd93a
Allow whitelisting for "external collaborator by default" setting
2018-08-30 12:53:06 +00:00
9372f870d1
Bump fog-google to 1.7.1 and google-api-client to 0.23.0
...
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
2018-08-21 14:15:18 -07:00
4d7d4a0c16
Remove Gemnasium service
2018-08-20 18:09:57 +00:00
4b87d80499
Fix merge requests not showing any diff files for big patches
2018-08-17 13:22:38 -03:00
84af372fc3
Update Rouge to 3.2.1. Includes a critical fix for the Perl Lexer
2018-08-16 15:15:09 -05:00
2e8fe26b9b
Fix `bin/secpick` rainbow gem error, and security branch prefixing
2018-08-15 07:27:59 +00:00
89ec4a3e44
Bump rugged to 0.27.4 for security fixes
...
See https://github.com/libgit2/libgit2/releases for more details.
2018-08-13 12:08:21 -07:00
71b62cf140
Bump pry to 0.11.3; pry-byebug to 3.4.3
2018-08-09 15:27:10 -05:00
5c748a0bd9
Backport some changes from gitlab-org/gitlab-ee!6767
2018-08-07 06:13:48 -05:00
8fb4b243c2
Update Rouge to 3.2.0
2018-08-02 15:13:58 -05:00
bfffbc7fd1
Bump prometheus-client-mmap to 0.9.4
...
Fixes failing builds with gcc on Archlinux and Ruby 2.4.4.
See https://gitlab.com/gitlab-org/prometheus-client-mmap/merge_requests/26
for more details.
2018-07-28 21:16:58 -07:00
c495f8c1d8
Merge branch 'sh-bump-haml-5.0.4' into 'master'
...
Bump haml gem to 5.0.4
See merge request gitlab-org/gitlab-ce!20847
2018-07-26 10:06:08 +00:00
016f3bd05d
Bump haml gem to 5.0.4
...
As pointed out in #49625 , this version is needed to support Ruby 2.5.
See https://github.com/haml/haml/blob/master/CHANGELOG.md for more details.
2018-07-25 14:17:15 -07:00
d8e759802e
Merge branch 'sh-include-rbtrace' into 'master'
...
Add rbtrace to Gemfile
See merge request gitlab-org/gitlab-ce!20831
2018-07-25 15:39:16 +00:00
b755673fb6
Add rbtrace to Gemfile
...
This will be enabled if ENABLE_RBTRACE environment variable is defined.
This will allow us to debug all sorts of issues in production:
https://github.com/tmm1/rbtrace
2018-07-25 04:41:40 -07:00
4063141223
Merge branch 'sh-bump-html-pipeline-2.8.4' into 'master'
...
Bump html-pipeline to 2.8.4
See merge request gitlab-org/gitlab-ce!20828
2018-07-25 08:08:38 +00:00
e2ce29b1b4
Bump html-pipeline to 2.8.4
...
In 2.8.3, it was possible to modify a constant without knowing it, which
led to a major performance regression (https://gitlab.com/gitlab-org/gitlab-ce/issues/49409 ).
Now attempting to modify the HTML::Pipeline::SanitizationFilter.WHITELIST will result in
"can't modify frozen Hash".
See https://github.com/jch/html-pipeline/pull/299 .
2018-07-24 18:22:52 -07:00
c8ff6b7c73
Use limit parameter to retrieve Wikis from Gitaly
...
Without this parameter, every load of a Wiki page will load all the Wiki pages
in the repository for the sidebar. This is a significant performance penalty
that can significant slow the display of all Wiki pages.
Relates to #40101
2018-07-24 15:36:31 -07:00
dc5e3c0bf2
Bump nokogiri to 1.8.4 and sanitize to 4.6.6 for performance
...
sanitize 4.6.6 has this optimization that will benefit Markdown rendering: https://github.com/rgrove/sanitize/pull/183
nokogiri 1.4.4 has this memory leak fix: https://github.com/sparklemotion/nokogiri/pull/1771
2018-07-23 22:05:39 -07:00
82a8903979
Merge branch 'hangouts_chat_integration' into 'master'
...
Hangouts chat integration
See merge request gitlab-org/gitlab-ce!20290
2018-07-23 09:20:16 +00:00
31a349e0db
Add bootsnap to development/test bundle and enable it if available
...
This will enable bootsnap whenver the gem is available.
2018-07-20 14:16:01 +02:00
68b1e5a97c
Incorporate Gitaly's RefService.FindAllRemoteBranches RPC
2018-07-18 16:48:47 -04:00
cb77d939c9
Add Hangouts Chat service implementation
2018-07-14 20:45:53 +09:00
a412826b5d
Upgrade grape-path-helpers to 1.0.6
2018-07-12 23:47:34 +02:00
2a4039cf66
Merge branch 'update-rubocop'
2018-07-09 17:23:30 +01:00
5cd7b8033a
Use latest gitlab-styles
2018-07-09 21:13:08 +08:00
9286f5b934
Use stable gitlab-styles and eliminate offenses
2018-07-09 21:13:08 +08:00
612f5e63b3
Update rubocop to get rid of a warning in other MR
2018-07-09 21:12:31 +08:00
4a3dae2717
Update hamlit to fix ruby 2.5 incompatibilities, fixes #42045
...
Also update the hook logs to escape the contents properly, as the :plain
filter does not do html escaping.
2018-07-08 15:42:30 -04:00
ff112ce641
Add Repository#set_config and #delete_config
2018-07-06 12:06:54 +02:00
78981fe035
Update OmniAuth Shibboleth gem to latest to gain support
...
for handling multi-valued SAML assertions. Add documentation
of label argument for omniauth provider to override text
in login button.
2018-07-04 20:39:30 -05:00
95f63bca5a
Merge branch 'bump-carrierwave-to-1-2-3' into 'master'
...
Bump Carrierwave gem to 1.2.3 (which contains the monkey patch for memory consumption)
Closes #46182
See merge request gitlab-org/gitlab-ce!20287
2018-07-04 09:34:58 +00:00
4854cfef98
Merge branch 'pravi/gitlab-ce-update-html-pipeline' into 'master'
...
update html-pipeline 2.7.1 -> 2.8
Closes #48571
See merge request gitlab-org/gitlab-ce!20348
2018-07-04 08:09:34 +00:00
02a911be1a
Bump carrierwave gem version to 1.2.3
2018-07-04 13:16:39 +09:00
912fe2c58f
update to support latest bcrypt. resolves #48149
2018-07-01 08:13:41 +00:00
99e816bc80
update html-pipeline 2.7.1 -> 2.8
2018-06-30 14:05:36 +02:00
904b6dd083
Don't hash user ID in OIDC subject claim
2018-06-28 15:31:47 +02:00
65840591cd
Gitaly metrics check for read/writeability
...
Prior to this change, health checks checked for writeability of the NFS
shards. Given we're moving away from that, this patch extends the checks
for Gitaly to check for read and writeability.
Potentially some dashboards will break, as over time these metrics will
no longer appear as Prometheus doesn't get the data anymore.
Observability in the circuit breaker will be reduced, but its not
expected to be turned on and the circuit breaker is being removed soon
too.
Closes https://gitlab.com/gitlab-org/gitaly/issues/1218
2018-06-27 08:56:19 +02:00
6dd181da16
Merge remote-tracking branch 'dev/master'
2018-06-25 18:19:29 +02:00
70c02bf3bc
Merge branch 'security-fj-bumping-sanitize-gem' into 'master'
...
[master] Update sanitize gem to 4.6.5 to fix HTML injection vulnerability
See merge request gitlab/gitlabhq!2399
2018-06-25 16:13:53 +00:00
fce42cbc8a
Bump sprockets to 3.7.2 to address CVE-2018-3760
2018-06-22 11:10:15 -05:00
c9eb56d511
Merge branch 'remove-allocations-gem' into 'master'
...
Remove remaining traces of the Allocations Gem
See merge request gitlab-org/gitlab-ce!20029
2018-06-20 16:33:22 +00:00
d527b46802
Remove remaining traces of the Allocations Gem
...
In MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15834 we
removed use of the data produced by the Allocations Gem. However, we
never removed the code that just enables tracking of allocations. In
this commit we remove all remaining traces of this Gem.
2018-06-20 15:11:10 +02:00
1b76f1dceb
Merge branch 'sh-bump-rugged-0.27.2' into 'master'
...
Bump rugged to 0.27.2
See merge request gitlab-org/gitlab-ce!20026
2018-06-20 12:42:53 +00:00
bf947956e3
Bump rugged to 0.27.2
...
Release notes: https://github.com/libgit2/libgit2/releases/tag/v0.27.2
2018-06-20 03:22:42 -07:00
69de7b42cf
Migrate repo backup to gitaly
2018-06-15 18:27:25 +02:00
bc2cf82f68
Update gitlab-gollum-lib to 4.2.7.5 and sanitize to 4.6.5
2018-06-15 15:57:51 +02:00
ab93f7cc79
Bumping gitlab-gollum-lib and gitlab-gollum-rugged_adapter
2018-06-12 12:31:10 +00:00
7d3bbeeb31
Merge branch 'rs-update-rspec' into 'master'
...
Update rspec to 3.7
See merge request gitlab-org/gitlab-ce!19449
2018-06-11 09:59:25 +00:00
001cb7ea04
Merge branch 'upgrade-gitlab-markup' into 'master'
...
Upgrade gitlab-markup to fix render issue with reStructuredText
See merge request gitlab-org/gitlab-ce!19596
2018-06-11 08:01:51 +00:00
c68bbdc820
Bump grape-path-helpers to 1.0.5
2018-06-08 23:44:05 +00:00
6e14ea42b8
Upgrade gitlab-markup to fix render issue with reStructuredText
2018-06-08 19:46:44 +02:00
6c963dcb39
Merge branch 'rails5-fix-47370' into 'master'
...
Use same gem versions for rails5 as for rails4 where possible
Closes #47370 , #46232 , #47367 , and #47373
See merge request gitlab-org/gitlab-ce!19498
2018-06-08 15:08:45 +00:00
f068479e63
Merge branch 'use-restore-custom-hooks-gitaly' into 'master'
...
Use RestoreCustomHooks RPC in restore rake task
See merge request gitlab-org/gitlab-ce!19370
2018-06-08 11:49:13 +00:00
290ca339ad
Merge branch 'feature/customizable-favicon' into 'master'
...
Customizable favicon
Closes #15661
See merge request gitlab-org/gitlab-ce!14497
2018-06-07 16:54:41 +00:00
0b4312c676
Update rspec to 3.7
2018-06-07 09:54:41 -05:00
59a8c79f05
Use RestoreCustomHooks RPC in restore rake task
2018-06-07 14:26:20 +02:00
d18002efed
Use same gem versions for rails5 as for rails4 where possible
2018-06-07 12:53:54 +02:00
29cfa7bf6c
Merge branch 'sh-bump-grape-path-helpers' into 'master'
...
Bump grape-path-helpers to solve a bug in GrapePathHelpers::NamedRouteMatcher
See merge request gitlab-org/gitlab-ce!19506
2018-06-07 08:28:17 +00:00
10fd34ba03
Merge branch 'update-net-ssh' into 'master'
...
update net-ssh 4 -> 5, remove rbnacl, rbnacl-libsodium (not needed)
See merge request gitlab-org/gitlab-ce!19412
2018-06-07 07:45:26 +00:00
dde7b97d0b
Bump grape-path-helpers to solve a bug in GrapePathHelpers::NamedRouteMatcher
...
If you include this helper with a class that also implements `method_missing`,
this would result in AbstractController::DoubleRenderError.
See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19487#note_79096902 .
2018-06-06 15:08:41 -07:00
af9cc234f2
Merge branch 'bvl-graphql-start-34754' into 'master'
...
GraphQL setup: Basic Project and Merge request endpoint
Closes #34754
See merge request gitlab-org/gitlab-ce!19008
2018-06-06 10:03:34 +00:00
9b65d4bb41
Initial setup GraphQL using graphql-ruby 1.8
...
- All definitions have been replaced by classes:
http://graphql-ruby.org/schema/class_based_api.html
- Authorization & Presentation have been refactored to work in the
class based system
- Loaders have been replaced by resolvers
- Times are now coersed as ISO 8601
2018-06-06 10:58:54 +02:00
82762c53de
Bump grape-path-helpers to 1.0.2 to get updated Rake task naming
...
Add development documentation on how to generate a list of routes
2018-06-06 01:20:27 -07:00
2af2140cee
update net-ssh 4 -> 5, remove rbnacl, rbnacl-libsodium (not needed)
2018-06-06 07:36:04 +02:00
287c34ca1f
Convert from GraphQL::Batch to BatchLoader
2018-06-05 20:47:42 +02:00
9c6c17cbcd
Add a minimal GraphQL API
2018-06-05 20:47:42 +02:00
c8a4d202c9
favicon uploader generating ci status favicons
2018-06-05 16:20:06 +02:00
3571b97eff
Merge branch 'update-doorkeeper' into 'master'
...
Update Doorkeeper OpenID for Kubernetes support
Closes #44485
See merge request gitlab-org/gitlab-ce!19293
2018-06-04 16:32:57 +00:00
e30168ddb7
Merge branch '46845-update-email_spec-to-2-2-0' into 'master'
...
Update email_spec to 2.2.0
Closes #46845
See merge request gitlab-org/gitlab-ce!19164
2018-06-04 15:48:27 +00:00
b0ec776632
Bump octokit to 4.9
2018-06-04 12:23:18 +10:00
0b648a4920
Update selenium-webdriver to 3.12.0
2018-06-04 00:18:52 +09:00
e87031e4b1
Update email_spec to 2.2.0
2018-06-03 22:14:40 +09:00
c4ec11d721
Bump omniauth-gitlab to 1.0.3
...
This version of the gem uses API v4 by default:
fd13de9f25
2018-06-01 09:13:50 -07:00
b6caf937cc
Update Doorkeeper OpenID for Kubernetes support
2018-05-31 22:10:56 +02:00
20dfe25c15
Export assigned issues in iCalendar feed
2018-05-31 14:01:04 +00:00
d0d551b072
Merge branch 'dz-awesome-print-version-unlock' into 'master'
...
Remove version lock on awesome_print dependency
See merge request gitlab-org/gitlab-ce!19232
2018-05-30 14:53:21 +00:00
2c977029fe
Merge branch 'sh-use-grape-path-helpers' into 'master'
...
Replace grape-route-helpers with our own grape-path-helpers
Closes #45718
See merge request gitlab-org/gitlab-ce!19240
2018-05-30 14:09:38 +00:00
bdd595c40d
Merge branch 'bump-kubeclient-version-3-1-0' into 'master'
...
Bumps kubeclient gem version to 3.1.0
See merge request gitlab-org/gitlab-ce!19199
2018-05-30 12:41:49 +00:00
990af4fb5d
Replace grape-route-helpers with our own grape-path-helpers
...
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
2018-05-30 03:15:03 -07:00
4f68a45c8b
Remove version lock on awesome_print dependency
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2018-05-30 10:16:58 +03:00
e869387ca2
Merge branch '46844-update-awesome_print-to-1-8-0' into 'master'
...
Update awesome_print to 1.8.0
Closes #46844
See merge request gitlab-org/gitlab-ce!19163
2018-05-30 07:12:34 +00:00
b0fd5ca57b
Bump rugged to 0.27.1 for security fixes
2018-05-29 14:35:41 -07:00
0d32ec447f
Merge branch '46849-update-rdoc-to-6-0-4' into 'master'
...
Update rdoc to 6.0.4
Closes #46849
See merge request gitlab-org/gitlab-ce!19167
2018-05-29 15:06:19 +00:00
2a0debdf26
Update awesome_print to 1.8.0
2018-05-29 23:48:29 +09:00
5d49286188
Bumps kubeclient gem version to 3.1.0
2018-05-29 11:45:19 +01:00
b529d04b69
Use Gitaly's DeleteAllRepositories RPC during backup restore
2018-05-28 09:58:14 +00:00
5f5fc69dde
Merge branch '46846-update-redis-namespace-to-1-6-0' into 'master'
...
Update redis-namespace to 1.6.0
Closes #46846
See merge request gitlab-org/gitlab-ce!19166
2018-05-28 09:53:09 +00:00
1637faacba
Update unicode-display_width from 1.3.0 to 1.3.2
2018-05-27 17:45:12 +02:00
2476801b0c
Update rdoc to 6.0.4
2018-05-27 01:34:05 +09:00
6123e1db83
Update redis-namespace to 1.6.0
2018-05-26 23:36:53 +09:00
74894a3877
Merge branch 'bootstrap4' into 'master'
...
Upgrade to Bootstrap 4
Closes #45185 and #46710
See merge request gitlab-org/gitlab-ce!18232
2018-05-25 21:05:53 +00:00
c2ad6c8f5f
Bumped omniauth-authentiq to 0.3.3
2018-05-24 21:08:16 +03:00
6dd13180cc
Merge branch 'master' into bootstrap4
2018-05-22 17:20:57 -05:00
b4849eb9ec
Update gemfile.lock
2018-05-22 10:29:17 -05:00
6cd1f4b87b
Bump prometheus-client-mmap to 0.9.3 to fix nil exception error
...
See https://gitlab.com/gitlab-org/prometheus-client-mmap/issues/24
2018-05-22 06:55:33 -07:00
7e78eacd2a
Merge branch 'ce-5928-geo-rake-task-to-force-housekeeping-on-next-sync' into 'master'
...
Backport from EE: Adding Progressbar explicitly and spec extensions for it
See merge request gitlab-org/gitlab-ce!18885
2018-05-21 15:01:21 +00:00
a78b1b27b8
Merge branch 'blackst0ne-remove-spinach' into 'master'
...
Remove Spinach
Closes #23036
See merge request gitlab-org/gitlab-ce!18869
2018-05-15 09:43:55 +00:00
ca9bce4aa1
Merge branch 'update-sidekiq' into 'master'
...
update sidekiq 5.0 -> 5.1
See merge request gitlab-org/gitlab-ce!18765
2018-05-14 13:39:27 +00:00
82a5d7f573
Clean up Gemfile
2018-05-14 18:53:57 +11:00
0afcfd31bd
Merge branch 'update-gon' into 'master'
...
Update gon ~> 6.1.0 to ~> 6.2
See merge request gitlab-org/gitlab-ce!18764
2018-05-10 15:50:13 +00:00
b7e9c968c2
Merge branch 'sh-reset-prometheus-metrics-tests' into 'master'
...
Support resetting of Prometheus metrics between test runs
Closes #39968
See merge request gitlab-org/gitlab-ce!18836
2018-05-10 12:31:36 +00:00
7fd0f5fc9d
Adding progressbar explicitly and spec extensions for it
2018-05-10 13:53:11 +02:00
204af2e101
Support resetting of Prometheus metrics between test runs
...
Adding the :prometheus tag to an rspec test will clear out
memory-mapped files and reset the registry.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/39968
2018-05-09 14:33:42 -07:00
ee563bcb5b
Merge branch 'jivl-delete-d3-rails-gem' into 'master'
...
Removed the d3_rails gem
See merge request gitlab-org/gitlab-ce!18860
2018-05-09 17:30:25 +00:00
275188439f
Removed the d3_rails gem
2018-05-09 11:41:40 -05:00
09747ecd33
Merge branch 'update-asset-sync' into 'master'
...
Update asset_sync ~> 2.2.0 to ~> 2.4
See merge request gitlab-org/gitlab-ce!18762
2018-05-08 18:31:35 +00:00
40655a48f1
Bump Gitaly Proto to v0.99
2018-05-07 14:10:04 +02:00
fd809f5e06
update sidekiq 5.0 -> 5.1
2018-05-05 12:14:11 +02:00
3fe6ddbe1a
Update gon ~> 6.1.0 to ~> 6.2
2018-05-05 11:02:40 +02:00
c47b8a50c6
Update asset_sync ~> 2.2.0 to ~> 2.4
2018-05-05 07:10:59 +02:00
31fa96960f
Merge branch 'pravi/gitlab-ce-update-grape-entity' into 'master'
...
Update grape-entity 0.6.0 -> 0.7.1
See merge request gitlab-org/gitlab-ce!18720
2018-05-04 03:47:17 +00:00
829441dcbc
Update grape-entity 0.6.0 -> 0.7.1
2018-05-03 18:16:26 +02:00
351a793693
update omniauth-github ~> 1.1.1 to ~> 1.3
2018-05-03 14:49:26 +02:00
e72f2b0294
update devise 4.2 -> 4.4
2018-05-03 12:40:05 +02:00
9b33e3d36f
Display and revoke active sessions
2018-05-02 08:08:16 +00:00
1bfaf10295
Use grpc 1.11.0
2018-04-30 11:35:44 +02:00
fa7b98d508
Merge branch 'add-jwt-strategy-to-gitlab-suite' into 'master'
...
Ports omniauth-jwt gem onto GitLab OmniAuth Strategies suite
See merge request gitlab-org/gitlab-ce!18580
2018-04-30 08:52:55 +00:00
699ecad78c
Ports omniauth-jwt gem onto GitLab OmniAuth Strategies suite
2018-04-26 10:13:29 +01:00
c1b416e19f
remove peek performance_bar
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-04-26 09:03:30 +02:00
b0f7ab7f07
Merge branch 'sh-bump-lograge' into 'master'
...
Bump lograge to 0.10.0 and remove monkey patch
See merge request gitlab-org/gitlab-ce!18551
2018-04-24 09:28:33 +00:00
69246ec8d2
Bump lograge to 0.10.0 and remove monkey patch
...
lograge 0.10.0 contains the `Location` query string fix in
https://github.com/roidrage/lograge/pull/241 among other minor changes:
https://github.com/roidrage/lograge/blob/master/CHANGELOG.md
2018-04-23 13:00:02 -07:00
a103cbbe01
Update doorkeeper for:
...
https://gitlab.com/gitlab-org/gitlab-ce/issues/45433
and
https://github.com/doorkeeper-gem/doorkeeper/issues/1065
2018-04-23 16:04:10 +00:00
409ba61a59
Upgrading gitlab-gollum-lib and rouge
2018-04-19 10:52:02 +02:00
aa2bb20756
Merge branch 'revert-goldiloader' into 'master'
...
Revert the addition of goldiloader
See merge request gitlab-org/gitlab-ce!18458
2018-04-18 19:02:04 +00:00
e8a27a67fa
Fix Custom hooks are not triggered by UI wiki edit
2018-04-18 17:50:56 +00:00
6f292eaa69
Revert the addition of goldiloader
...
This reverts the addition of the "goldiloader" Gem and all use of it.
While this Gem is very promising it's causing a variety of problems on
GitLab.com due to it eager-loading too much data in places where we
don't expect/can handle this. At least for the time being this means we
have to go back to manually fixing N+1 query problems, but at least
those should not cause a negative impact on availability.
2018-04-18 15:51:39 +02:00
f150f262a9
Revert "Merge branch 'fix-size-and-position-for-fork-icon' into 'master'"
...
This reverts merge request !18399
2018-04-18 09:41:49 +00:00
5a34d3bd16
Fix size and position for fork icon
2018-04-18 00:05:50 +03:00
73431ad0d1
Merge branch 'fix/gb/fix-empty-secret-variables' into 'master'
...
Fix a case with empty secret CI/CD variables
Closes #31929
See merge request gitlab-org/gitlab-ce!18400
2018-04-17 13:33:14 +00:00
671a204ccc
Merge branch '45397-update-faraday_middleware-to-0.12.2' into 'master'
...
Update faraday_middleware to 0.12.2
Closes #45397
See merge request gitlab-org/gitlab-ce!18397
2018-04-16 16:20:36 +00:00
ad98190155
Fix a case with empty secret CI/CD variables
2018-04-16 15:51:20 +02:00
4d3c75ab74
Update faraday_middlewar to 0.12.2
2018-04-16 21:49:35 +09:00
0089a452a6
Bump parser gem to 2.5.1.0 to remove warning in rspec
2018-04-14 15:56:55 -07:00
ef48664047
Replacing gollum libs for custom gitlab ones
2018-04-13 13:17:52 +00:00
20fdbbe86a
Use Goldiloader for handling N+1 queries
...
Goldiloader (https://github.com/salsify/goldiloader ) can eager load
associations automatically. This removes the need for adding "includes"
calls in a variety of different places. This also comes with the added
benefit of not having to eager load data if it's not used.
2018-04-09 11:58:06 +01:00
585b7acc5b
Bump `parser` gem to 2.5.0.5
...
1. Synchronize used version of `parser` gem for both versions of rails: 4 and 5.
2. Fix broken CI pipelines for rails5 branches.
The 2.5.0.4 version is removed from rubygems, so it's skipped.
https://github.com/whitequark/parser/issues/478
2018-04-07 12:03:42 +11:00
a18eea8c32
Automatically cleanup stale worktrees and lock files upon a push
...
git 2.16 will fail badly if there are stale worktrees.
Closes #44115
2018-04-06 08:17:07 -07:00
8ecc50ba28
Merge branch '44878-update-brakeman-3.6.1-to-4.2.1' into 'master'
...
Update brakeman to 4.2.1
Closes #44878
See merge request gitlab-org/gitlab-ce!18122
2018-04-02 16:30:34 +00:00
b463b41566
Bump html-pipeline to 2.7.1
2018-04-02 22:26:24 +11:00
4c36a0cb17
Update brakeman 3.6.1 to 4.2.1
2018-04-01 23:46:22 +09:00
174bea2d05
Merge branch 'zj-update-charlock_holmes' into 'master'
...
Update charlock_holmes to 0.76
See merge request gitlab-org/gitlab-ce!18103
2018-03-30 11:12:42 +00:00
a951b96be2
Update charlock_holmes to 0.76
...
Didn't compile against newer icu4c versions and was fixed upstream in
https://github.com/brianmario/charlock_holmes/pull/129 , which was
releaed in the versions its now locked to.
2018-03-30 12:32:26 +02:00
9c13b99788
Bump Rugged to 0.27.0
...
Release notes: https://github.com/libgit2/libgit2/releases/tag/v0.27.0
This version solves a significant performance issue with generating
large diffs: https://github.com/libgit2/libgit2/issues/4460
2018-03-28 13:41:45 -07:00
93313099c7
Bumps omniauth google oauth2 gem version
2018-03-28 17:31:37 +01:00
c23945a3fd
Merge branch 'zj-remote-repo-exists' into 'master'
...
Test if remote repository exists before cloning
Closes #43929 and gitaly#1084
See merge request gitlab-org/gitlab-ce!18017
2018-03-28 13:25:25 +00:00
63923301be
Merge branch '44712-update-asciidoctor-from-1.5.3-to-1.5.6.2' into 'master'
...
Update asciidoctor to 1.5.6.2 and asciidoctor-plantuml to 0.0.8
Closes #44712
See merge request gitlab-org/gitlab-ce!18022
2018-03-28 08:17:43 +00:00
949d1b37e7
Merge branch 'ac/lfs-direct-upload-ee-to-ce' into 'master'
...
LFS direct upload port to CE
Closes #44548
See merge request gitlab-org/gitlab-ce!17752
2018-03-28 07:57:29 +00:00
a03105f89b
Update asciidoctor-plantuml to 0.0.8
2018-03-28 00:54:49 +09:00
Kamil Trzciński
Zeger-Jan van de Weg
Rémy Coutable
Valery Sizov
Jasper Maes
Pirate Praveen
Stan Hu
Francisco Javier López
Nick Thomas
Douwe Maan
Abulhair Saparov
Matthias Fechner
Douwe Maan
Thong Kuah
Bob Van Landuyt
Douglas Barbosa Alexandre
Sean McGivern
Takuya Noguchi
Sean McGivern
Shinya Maeda
Jan Provaznik
Alejandro Rodríguez
Marin Jankovski
blackst0ne
Mike Greiling
Robert Speicher
Balasankar "Balu" C
Andrew Newdigate
Gabriel Mazetto
Drew Blessing
Tiago Botelho
Brett Walker
Winnie Hellmann
Roger Rüttimann
Gilbert Roulot
Drew Blessing
Michael Kozono
Robert Speicher
Rubén Dávila
Kukovskii Vladimir
Lin Jen-Shin
Matthew Dawson
Jacob Vosmaer
Tom Downes
Muhammad Nuzaihan
Markus Koller
Alessio Caiazza
Yorick Peterse
Ahmad Hassan
Grzegorz Bizon
Alexis Reigel
Ash McKenzie
Maxime Guyot
Imre Farkas
Dmitriy Zaporozhets
Lukas Eipert
Alexandros Keramidas
Clement Ho
Jose
George Tsiolis
Grzegorz Bizon