summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dz-bump-version-sorter' into 'master'Stan Hu2019-02-221-1/+1
|\ | | | | | | | | Bump version_sorter to version 2.2.4 See merge request gitlab-org/gitlab-ce!25487
| * Bump version_sorter to version 2.2.4Dmitriy Zaporozhets2019-02-221-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Upgrade Webmock to 3.5.1Stan Hu2019-02-161-1/+1
| | | | | | | | Webmock 3.5.0 brings Ruby 2.6 support.
* | Update Unicorn and associated gemsStan Hu2019-02-141-1/+1
|/ | | | | | | Unicorn 5.3.1 fixes a GC issue that causes a crash, and Unicorn 5.4.1 quiets some warnings for Ruby 2.6. More details: https://github.com/defunkt/unicorn/releases
* Update sshkey to v2.0.0Nick Thomas2019-02-111-1/+1
| | | | | | | This release fixes a bug in handling certain ed25519 keys. For more details, see this GitHub issue: https://github.com/bensie/sshkey/issues/34
* Remove HipChat integration from GitLabNick Thomas2019-02-081-3/+0
|
* Merge branch 'sh-log-project-name-with-gitaly' into 'master'Rémy Coutable2019-02-061-1/+1
|\ | | | | | | | | | | | | Send project name with Gitaly repository requests Closes gitaly#1394 See merge request gitlab-org/gitlab-ce!23373
| * Rename gl_project_name -> gl_project_pathsh-log-project-name-with-gitalyStan Hu2019-02-051-1/+1
| | | | | | | | Upgrade gitaly-proto to 1.10.0 to have this field.
* | Merge branch 'chore/update-js-regex' into 'master'Stan Hu2019-02-061-1/+1
|\ \ | |/ |/| | | | | update js_regex 2.2.1 -> 3.1 See merge request gitlab-org/gitlab-ce!24433
| * update js_regex versionRoger Rüttimann2019-01-141-1/+1
| |
* | Remove Redcarpet markdown engineJan Provaznik2019-02-041-1/+0
| | | | | | | | | | This engine was replaced with CommonMarker in 11.4, it was deprecated since then.
* | Merge branch ↵Sean McGivern2019-02-041-1/+1
|\ \ | | | | | | | | | | | | | | | | | | '19745-forms-with-task-lists-can-be-overwritten-when-editing-simultaneously' into 'master' Forms with task lists can be overwritten when editing simultaneously See merge request gitlab-org/gitlab-ce!23938
| * | Bump up tasklist package to v2.2.0Fatih Acet2019-01-301-1/+1
| | | | | | | | | | | | v2.1.0 was published wrongly by the package author.
| * | Use original tasklist package with new versionFatih Acet2019-01-301-1/+1
| | |
| * | Temporarily use tasklist from fatihacet’s forkFatih Acet2019-01-301-1/+1
| | |
* | | Fix requiring the rubyzip GemYorick Peterse2019-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | In commit 6fa5fd8515e0f2d5a6341134560021f353d84362 the `require: false` was removed to ensure the Gem was loaded at run time. Unfortunately, the `require` necessary for the rubyzip Gem is "zip" and not "rubyzip". As a result, Bundler would not require the Gem. This meant that we would still run into constant errors when referring to `Zip::File`.
* | | Fix uninitialized constant with GitLab Pages deployStan Hu2019-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pages:deploy step was failing with the following error: ``` unitialized constant SafeZip::Extract::Zip ``` Since license_finder already pulls in rubyzip, we can make it a required gem. We also use the scope operator to make the reference to Zip::File explicit.
* | | Extract GitLab Pages using RubyZipKamil Trzciński2019-01-311-0/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | RubyZip allows us to perform strong validation of expanded paths where we do extract file. We introduce the following additional checks to extract routines: 1. None of path components can be symlinked, 2. We drop privileges support for directories, 3. Symlink source needs to point within the target directory, like `public/`, 4. The symlink source needs to exist ahead of time.
* | Use http_max_redirects opt to replace monkeypatchThong Kuah2019-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | http_max_redirects was introduced in 4.2.2, so upgrade kubeclient. The monkey-patch was global so we will have to check that all instances of Kubeclient::Client are handled. Spec all methods of KubeClient This should provide better confidence that we are indeed disallowing redirection in all cases
* | Merge branch '26375-markdown-footnotes-not-working' into 'master'Lin Jen-Shin2019-01-171-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Markdown footnotes not working Closes #26375 See merge request gitlab-org/gitlab-ce!24168
| * | Update to nokogiri 1.10.1Brett Walker2019-01-171-1/+1
| | |
| * | Update nokogiri to 1.10.0Brett Walker2019-01-081-2/+2
| | | | | | | | | | | | and truncato to 0.7.11
* | | Conditionally initialize the global opentracing tracerAndrew Newdigate2019-01-171-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change will instantiate an OpenTracing tracer and configure it as the global tracer when the GITLAB_TRACING environment variable is configured. GITLAB_TRACING takes a "connection string"-like value, encapsulating the driver (eg jaeger, etc) and options for the driver. Since each service, whether it's written in Ruby or Golang, uses the same connection-string, it should be very easy to configure all services in a cluster, or even a single development machine to be setup to use tracing. Note that this change does not include instrumentation or propagation changes as this is a way of breaking a previous larger change into components. The instrumentation and propagation changes will follow in separate changes.
* | | Update sidekiq-cron 0.6.0 -> 1.0Pirate Praveen2019-01-161-2/+2
| |/ |/|
* | Fix ambiguous brackets in task listsJared Deckard2019-01-111-1/+1
|/
* Merge branch 'update-pg' into 'master'Rémy Coutable2019-01-081-1/+1
|\ | | | | | | | | Update pg 0.18.4 -> 1.0 See merge request gitlab-org/gitlab-ce!17829
| * Update pg to ~> 1.1Pirate Praveen2018-12-271-1/+1
| |
* | Merge branch 'sh-bump-mini-test' into 'master'Lin Jen-Shin2019-01-031-1/+1
|\ \ | | | | | | | | | | | | Bump minitest to 5.11.3 to match Gitaly version See merge request gitlab-org/gitlab-ce!24070
| * | Bump minitest to 5.11.3 to match Gitaly versionsh-bump-mini-testStan Hu2018-12-301-1/+1
| |/ | | | | | | This prevents us from shipping duplicate versions of this gem.
* | Update gems in Gemfile and qa/Gemfile to be consistentStan Hu2019-01-021-4/+4
| | | | | | | | | | | | | | This will allow developers to run `bundle install` on both directories and avoid additional calls to RubyGems for local development. Also sets up the possibility of improved caching as mentioned in https://gitlab.com/gitlab-org/gitlab-ce/issues/55843.
* | Merge branch 'blackst0ne-bump-rails-cve-2018-16476' into 'master'Grzegorz Bizon2019-01-021-1/+1
|\ \ | | | | | | | | | | | | Bump Ruby on Rails to 5.0.7.1 See merge request gitlab-org/gitlab-ce!23396
| * | Bump Ruby on Rails to 5.0.7.1blackst0ne-bump-rails-cve-2018-16476blackst0ne2018-12-211-1/+1
| | | | | | | | | | | | Fix the CVE-2018-16476 vulnerability.
* | | Merge branch 'sh-bump-omniauth-google-gem' into 'master'Sean McGivern2019-01-011-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Omniauth and JWT gems to switch away from Google+ API Closes #55668 See merge request gitlab-org/gitlab-ce!24068
| * | | Upgrade Omniauth and JWT gems to switch away from Google+ APIStan Hu2018-12-281-2/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * omniauth-google-oauth2: Google will be deprecating its support for the Google+ API, which currently omniauth-google-oauth2 uses to retrieve user info. The bump in omniauth-google-oauth2 requires an upgrade to ruby-jwt v2+ to support the verification of multiple issue providers (https://github.com/zquestz/omniauth-google-oauth2/pull/345). * jwt: This has the most number of changes that need to be reviewed: https://github.com/jwt/ruby-jwt/blob/master/CHANGELOG.md * oauth2: Needed to support ruby-jwt v2+: https://github.com/oauth-xx/oauth2/blob/master/CHANGELOG.md * omniauth-azure-oauth2 needs a version bump to support ruby-jwt v2+. * omniauth: This version bump only involves backstage improvements: https://github.com/omniauth/omniauth/releases Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55668
* | | Merge branch 'rails52-dbcleaner' into 'master'Stan Hu2018-12-311-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Bump database_cleaner version Closes #55539 See merge request gitlab-org/gitlab-ce!23985
| * | Bump database_cleaner versionJan Provaznik2018-12-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | should fix issue with: undefined method `schema_migrations_table_name' for ActiveRecord::Migrator:Class https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/135978879
* | | Bump CarrierWave to 1.3.0 and remove monkey patchesStan Hu2018-12-241-4/+1
|/ / | | | | | | | | Full list of changes: https://github.com/carrierwaveuploader/carrierwave/blob/master/CHANGELOG.md
* | Update minimum version of nokogiriPirate Praveen2018-12-211-1/+1
| | | | | | | | Fixes: ActionView::Template::Error (undefined method `add_class' for #<Nokogiri::XML::Element:0x0055dbff5252e8>
* | Fix sidekiq-reliable-fetch versionValery Sizov2018-12-191-1/+1
| |
* | Merge branch 'zj-pool-destruction' into 'master'Kamil Trzciński2018-12-191-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Leave object pools when destroying projects Closes gitaly#1415 See merge request gitlab-org/gitlab-ce!23869
| * | Leave object pools when destroying projectsZeger-Jan van de Weg2018-12-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge branch 'deprecated-alias-method-chain' into 'master'Rémy Coutable2018-12-181-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Fix deprecation: alias_method_chain is deprecated. Please, use Module#prepend instead See merge request gitlab-org/gitlab-ce!23887
| * | | Fix deprecation: alias_method_chain is deprecated. Please, use ↵Jasper Maes2018-12-171-1/+1
| |/ / | | | | | | | | | Module#prepend instead
* | | Merge branch 'sh-carrierwave-patch-google-acl' into 'master'Sean McGivern2018-12-181-2/+3
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Fix object storage not working properly with Google S3 compatibility Closes #53846 See merge request gitlab-org/gitlab-ce!23858
| * | Fix object storage not working properly with Google S3 compatibilityStan Hu2018-12-171-2/+3
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Even in AWS S3 compatibility mode, Google now appears to reject requests that includes this header with this error: ``` Requests cannot specify both x-amz and x-goog headers ``` This has been submitted upstream via https://github.com/carrierwaveuploader/carrierwave/pull/2356. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53846.
* | Bump gitlab-reliable-fetcher gemValery Sizov2018-12-171-1/+1
|/
* Remove rails 4 support in CI, Gemfiles, bin/ and config/Jasper Maes2018-12-141-27/+9
|
* Specify sass ~> 3.5 in GemfilePirate Praveen2018-12-121-0/+1
|
* Merge branch 'fix-gemfile-rails-security-update' into 'master'Robert Speicher2018-12-061-1/+1
|\ | | | | | | | | Security update of gem rails to version 4.2.11 See merge request gitlab-org/gitlab-ce!23520
| * Security update of rails to version 4.2.11.Matthias Fechner2018-12-031-1/+1
| |
View Lorry Controller Status