summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rc/bump-peek-performance_bar' into 'master'Sean McGivern2017-07-191-1/+1
|\
| * Bump peek-performance_bar to 1.3.0 and get rid of a monkey-patchrc/bump-peek-performance_barRémy Coutable2017-07-181-1/+1
* | Add structured logging for Rails processessh-structured-loggingStan Hu2017-07-181-0/+3
|/
* Merge branch '34831-remove-coffee-rails-gem' into 'master'Jacob Schatz2017-07-171-1/+0
|\
| * Remove coffee-rails gemTakuya Noguchi2017-07-081-1/+0
* | Bump fog-core to 1.44.3 and fog providers' plugins to latestTakuya Noguchi2017-07-161-1/+1
* | Update the mysql2 gem to v0.4.5Nick Thomas2017-07-141-1/+1
* | Merge branch '34858-bump-scss-lint-to-0-54-0' into 'master'Rémy Coutable2017-07-121-1/+1
|\ \
| * | Bump scss-lint to 0.54.0Takuya Noguchi2017-07-081-1/+1
* | | Merge branch '34867-remove-net-ssh-gem' into 'master'Rémy Coutable2017-07-111-1/+0
|\ \ \
| * | | Remove net-ssh gemTakuya Noguchi2017-07-091-1/+0
| |/ /
* | | Revert "Merge branch '34902-bump-knapsack-to-1-14-0' into 'master'"Rémy Coutable2017-07-111-1/+1
* | | Merge branch '34902-bump-knapsack-to-1-14-0' into 'master'Rémy Coutable2017-07-111-1/+1
|\ \ \
| * | | Bump knapsack to 1.14.0Takuya Noguchi2017-07-111-1/+1
| |/ /
* | | Revert "Merge branch 'update_bootsnap_1.1.1' into 'master'"Marin Jankovski2017-07-101-1/+0
|/ /
* | Add gitaly_git_blob_raw featureJacob Vosmaer2017-07-071-1/+1
* | Merge branch 'feature/migrate-commit-count-to-gitaly' into 'master'Robert Speicher2017-07-071-1/+1
|\ \ | |/ |/|
| * Migrate Gitlab::Git::Repository#commit_count to Gitalyfeature/migrate-commit-count-to-gitalyAhmad Sherif2017-07-071-1/+1
* | Merge branch 'update-raven-253' into 'master'Sean McGivern2017-07-051-1/+1
|\ \ | |/ |/|
| * Update sentry-raven from 2.4.0 to 2.5.3update-raven-253Gabriel Mazetto2017-07-031-1/+1
* | Instrument Unicorn with Ruby exporterPaweł Chojnacki2017-07-041-0/+1
|/
* Merge branch 'bugfix/ruby2.4-compat' into 'master'Douwe Maan2017-06-271-1/+1
|\
| * ruby 2.4 compat: update to webmock 2.3.2http://jneen.net/2017-06-261-1/+1
* | Merge branch 'update_bootsnap_1.1.1' into 'master'Robert Speicher2017-06-271-0/+1
|\ \ | |/ |/|
| * Bump bootsnap to 1.1.1blackst0ne2017-06-271-0/+1
* | Bump premailer-rails gem to 1.9.7 and its dependencies to prevent network ret...Stan Hu2017-06-261-1/+1
* | Merge branch '31574-bootstrap-form-builder' into 'master'Phil Hughes2017-06-231-0/+1
|\ \ | |/ |/|
| * Add bootstrap_form gemNick Thomas2017-06-221-0/+1
* | Revert "Merge branch 'rs-bootsnap' into 'master'"rs-revert-bootsnapRobert Speicher2017-06-221-1/+0
|/
* Migrate Gitlab::Git::Blob.find to Gitalyfeature/migrate-blob-find-to-gitalyAhmad Sherif2017-06-211-1/+1
* Add rails-i18n for some common translations33344-add-rails-i18nLin Jen-Shin2017-06-201-0/+1
* Merge branch 'cs-update-rainbow' into 'master'Rémy Coutable2017-06-201-1/+1
|\
| * Update rainbow from 2.1.0 to 2.2.2.cs-update-rainbowConnor Shea2017-06-191-1/+1
* | Merge branch 'cs-update-paranoia' into 'master'Rémy Coutable2017-06-201-1/+1
|\ \
| * | Update paranoia from 2.2 to 2.3.1.cs-update-paranoiaConnor Shea2017-06-191-1/+1
| |/
* | Update carrierwave from 1.0.0 to 1.1.0.Connor Shea2017-06-191-1/+1
|/
* Merge branch '29010-perf-bar' into 'master'Robert Speicher2017-06-121-0/+11
|\
| * Don't use Pygment,rb, use Rouge instead, and put peek-pg in the :postgres groupRémy Coutable2017-06-091-2/+1
| * New performance bar that can be enabled with the `p b` shortcutRémy Coutable2017-06-091-0/+12
* | Merge branch 'sh-bump-oauth2-gem' into 'master'Robert Speicher2017-06-091-2/+2
|\ \
| * | Bump Faraday and dependent OAuth2 gem version to support no_proxy variableStan Hu2017-06-091-2/+2
| |/
* | Merge branch 'bugfix/upgrade-ruby-parser' into 'master'Douwe Maan2017-06-091-1/+1
|\ \ | |/ |/|
| * ruby 2.4 support: upgrade ruby_parser to 3.9bugfix/upgrade-ruby-parserhttp://jneen.net/2017-06-091-1/+1
* | Add Bootsnap to all environments to reduce application startup timers-bootsnapRobert Speicher2017-06-081-0/+1
|/
* Merge branch 'instrument-infra' into 'master'Grzegorz Bizon2017-06-071-0/+3
|\
| * Move Prometheus presentation logic to PrometheusTextPawel Chojnacki2017-06-021-2/+1
| * Correctly handle temporary folder for testing multiproces metricsPawel Chojnacki2017-06-021-2/+2
| * Add Prometheus metrics configurationPawel Chojnacki2017-06-021-0/+4
* | Merge branch 'fix/use-new-gitaly-commit-diff-rpc' into 'master'Robert Speicher2017-06-021-1/+1
|\ \ | |/ |/|
| * Use the new Gitaly CommitDiff RPCfix/use-new-gitaly-commit-diff-rpcAhmad Sherif2017-06-021-1/+1