summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sh-log-project-name-with-gitaly' into 'master'Rémy Coutable2019-02-061-1/+1
|\
| * Rename gl_project_name -> gl_project_pathsh-log-project-name-with-gitalyStan Hu2019-02-051-1/+1
* | Merge branch 'chore/update-js-regex' into 'master'Stan Hu2019-02-061-1/+1
|\ \ | |/ |/|
| * update js_regex versionRoger Rüttimann2019-01-141-1/+1
* | Remove Redcarpet markdown engineJan Provaznik2019-02-041-1/+0
* | Merge branch '19745-forms-with-task-lists-can-be-overwritten-when-editing-sim...Sean McGivern2019-02-041-1/+1
|\ \
| * | Bump up tasklist package to v2.2.0Fatih Acet2019-01-301-1/+1
| * | 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
* | | Fix uninitialized constant with GitLab Pages deployStan Hu2019-01-311-1/+1
* | | Extract GitLab Pages using RubyZipKamil Trzciński2019-01-311-0/+1
|/ /
* | Use http_max_redirects opt to replace monkeypatchThong Kuah2019-01-251-1/+1
* | Merge branch '26375-markdown-footnotes-not-working' into 'master'Lin Jen-Shin2019-01-171-2/+2
|\ \
| * | Update to nokogiri 1.10.1Brett Walker2019-01-171-1/+1
| * | Update nokogiri to 1.10.0Brett Walker2019-01-081-2/+2
* | | Conditionally initialize the global opentracing tracerAndrew Newdigate2019-01-171-0/+6
* | | 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 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 versionsh-bump-mini-testStan Hu2018-12-301-1/+1
| |/
* | Update gems in Gemfile and qa/Gemfile to be consistentStan Hu2019-01-021-4/+4
* | Merge branch 'blackst0ne-bump-rails-cve-2018-16476' into 'master'Grzegorz Bizon2019-01-021-1/+1
|\ \
| * | Bump Ruby on Rails to 5.0.7.1blackst0ne-bump-rails-cve-2018-16476blackst0ne2018-12-211-1/+1
* | | 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+ APIStan Hu2018-12-281-2/+2
| | |/ | |/|
* | | Merge branch 'rails52-dbcleaner' into 'master'Stan Hu2018-12-311-1/+1
|\ \ \ | |/ / |/| |
| * | Bump database_cleaner versionJan Provaznik2018-12-211-1/+1
* | | Bump CarrierWave to 1.3.0 and remove monkey patchesStan Hu2018-12-241-4/+1
|/ /
* | Update minimum version of nokogiriPirate Praveen2018-12-211-1/+1
* | 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 projectsZeger-Jan van de Weg2018-12-191-1/+1
* | | 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...Jasper Maes2018-12-171-1/+1
| |/ /
* | | Merge branch 'sh-carrierwave-patch-google-acl' into 'master'Sean McGivern2018-12-181-2/+3
|\ \ \ | |_|/ |/| |
| * | Fix object storage not working properly with Google S3 compatibilityStan Hu2018-12-171-2/+3
| |/
* | 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 rails to version 4.2.11.Matthias Fechner2018-12-031-1/+1
* | Add feature flag for workhorse content type calculationFrancisco Javier López2018-12-061-0/+3
* | Update gitaly-proto to v1.3.0Nick Thomas2018-12-061-1/+1
* | Update batch-loader dependencyDouwe Maan2018-12-041-1/+1
|/
* Bump gpgme gem version from 2.0.13 to 2.0.18Abulhair Saparov2018-12-031-1/+1
* Currently a dependency for grape `~> 1.1` is defined but gitlab does not work...Matthias Fechner2018-11-291-1/+1
* Merge branch '51083-fix-move-api' into 'master'Rémy Coutable2018-11-291-1/+1
|\