summaryrefslogtreecommitdiff
path: root/Gemfile.lock
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '34221-fix-missing-method-in-mmap2-gem' into 'master'Douwe Maan2017-06-271-1/+1
|\
| * Update mmap2 gem tha disables mmap_obj.gsub! as current implementation uses m...34221-fix-missing-method-in-mmap2-gemPawel Chojnacki2017-06-271-1/+1
* | Merge branch 'bugfix/ruby2.4-compat' into 'master'Douwe Maan2017-06-271-3/+3
|\ \
| * | ruby 2.4 compat: update to webmock 2.3.2http://jneen.net/2017-06-261-3/+3
* | | Merge branch 'update_bootsnap_1.1.1' into 'master'Robert Speicher2017-06-271-0/+4
|\ \ \ | |/ / |/| |
| * | Bump bootsnap to 1.1.1blackst0ne2017-06-271-0/+4
* | | Bump premailer-rails gem to 1.9.7 and its dependencies to prevent network ret...Stan Hu2017-06-261-5/+6
| |/ |/|
* | Use grpc 1.4.0Jacob Vosmaer2017-06-231-1/+1
* | Merge branch '31574-bootstrap-form-builder' into 'master'Phil Hughes2017-06-231-0/+2
|\ \ | |/ |/|
| * Add bootstrap_form gemNick Thomas2017-06-221-0/+2
* | Revert "Merge branch 'rs-bootsnap' into 'master'"rs-revert-bootsnapRobert Speicher2017-06-221-4/+0
|/
* Migrate Gitlab::Git::Blob.find to Gitalyfeature/migrate-blob-find-to-gitalyAhmad Sherif2017-06-211-2/+2
* Add rails-i18n for some common translations33344-add-rails-i18nLin Jen-Shin2017-06-201-0/+4
* Merge branch 'cs-update-rainbow' into 'master'Rémy Coutable2017-06-201-2/+3
|\
| * Update rainbow from 2.1.0 to 2.2.2.cs-update-rainbowConnor Shea2017-06-191-3/+4
* | Merge branch 'cs-update-paranoia' into 'master'Rémy Coutable2017-06-201-3/+3
|\ \
| * | Update paranoia from 2.2 to 2.3.1.cs-update-paranoiaConnor Shea2017-06-191-4/+4
| |/
* | Update carrierwave from 1.0.0 to 1.1.0.Connor Shea2017-06-191-3/+3
|/
* Merge branch '29010-perf-bar' into 'master'Robert Speicher2017-06-121-0/+42
|\
| * Don't use Pygment,rb, use Rouge instead, and put peek-pg in the :postgres groupRémy Coutable2017-06-091-3/+0
| * New performance bar that can be enabled with the `p b` shortcutRémy Coutable2017-06-091-0/+45
* | Merge branch 'sh-bump-oauth2-gem' into 'master'Robert Speicher2017-06-091-5/+5
|\ \
| * | Bump Faraday and dependent OAuth2 gem version to support no_proxy variableStan Hu2017-06-091-5/+5
| |/
* | Merge branch 'bugfix/upgrade-ruby-parser' into 'master'Douwe Maan2017-06-091-3/+3
|\ \ | |/ |/|
| * ruby 2.4 support: upgrade ruby_parser to 3.9bugfix/upgrade-ruby-parserhttp://jneen.net/2017-06-091-3/+3
* | Add Bootsnap to all environments to reduce application startup timers-bootsnapRobert Speicher2017-06-081-0/+4
|/
* update rouge to 2.1.0http://jneen.net/2017-06-071-1/+1
* Merge branch 'instrument-infra' into 'master'Grzegorz Bizon2017-06-071-0/+4
|\
| * Move Prometheus presentation logic to PrometheusTextPawel Chojnacki2017-06-021-5/+3
| * Correctly handle temporary folder for testing multiproces metricsPawel Chojnacki2017-06-021-1/+1
| * Bump prometheus client versionPawel Chojnacki2017-06-021-2/+2
| * Use the gem for the ruby prometheus client.Kevin Lyda2017-06-021-9/+3
| * Initial pass at prometheus monitoring.Kevin Lyda2017-06-021-0/+2
| * Add the prometheus gem.Kevin Lyda2017-06-021-0/+10
* | Merge branch 'fix/use-new-gitaly-commit-diff-rpc' into 'master'Robert Speicher2017-06-021-2/+2
|\ \ | |/ |/|
| * Use the new Gitaly CommitDiff RPCfix/use-new-gitaly-commit-diff-rpcAhmad Sherif2017-06-021-2/+2
* | Add fog-aliyun as backup storage provideryuanfeiz/gitlab-ce-aliyun-backup-providerYuanfei Zhu2017-06-011-0/+6
|/
* Add feature toggles through FlipperAlejandro Rodríguez2017-05-311-0/+6
* Merge branch 'task-list-2' into 'master'Filipa Lacerda2017-05-311-4/+2
|\
| * Upgrade to task_list v2Jared Deckard2017-05-231-4/+2
* | Revert "Merge branch 'grpc-1.3.4' into 'master'"Jacob Vosmaer (GitLab)2017-05-311-1/+1
* | Fix omniauth-google-oauth2 dependencies in Gemfile.lock32653-fix-gemfile-lockRémy Coutable2017-05-301-4/+3
* | Use grpc 1.3.4Jacob Vosmaer2017-05-231-1/+1
|/
* Add support for deltas_only under GitalyAhmad Sherif2017-05-131-2/+2
* Resolve "Update gem sidekiq-cron from 0.4.4 to 0.6.0 and rufus-scheduler from...Dosuken shinya2017-05-101-6/+8
* Re-enable Gitaly commit_raw_diff featureAhmad Sherif2017-05-071-3/+3
* Add ruby_parser gem for all environments.add-ruby-parser-dependencyRuben Davila2017-05-051-0/+1
* Merge branch 'master' into 28433-internationalise-cycle-analytics-pageRuben Davila2017-05-021-27/+28
|\
| * Update Carrierwave and fog-coreZeger-Jan van de Weg2017-05-011-12/+10
| * Use grpc 1.2.5Jacob Vosmaer2017-04-281-1/+1