summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Collapse)AuthorAgeFilesLines
* 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.0 Closes #34858 See merge request !12733
| * 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 gem Closes #34867 See merge request !12736
| * | 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
| | | | | | This reverts merge request !12753
* | Merge branch '34902-bump-knapsack-to-1-14-0' into 'master'Rémy Coutable2017-07-111-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Bump knapsack to 1.14.0 Closes #34902 See merge request !12753
| * | 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
|/ | | | | This reverts commit 83ec509ce43c56da601335de5b9ea4422c785560, reversing changes made to 57f0677ad854b7b17bd57e1e3b0ef542ce322b56.
* 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 Gitaly Closes gitaly#355 See merge request !12688
| * Migrate Gitlab::Git::Repository#commit_count to Gitalyfeature/migrate-commit-count-to-gitalyAhmad Sherif2017-07-071-1/+1
| | | | | | | | Closes gitaly#355
* | Merge branch 'update-raven-253' into 'master'Sean McGivern2017-07-051-1/+1
|\ \ | |/ |/| | | | | Update sentry-raven from 2.4.0 to 2.5.3 See merge request !12605
| * Update sentry-raven from 2.4.0 to 2.5.3update-raven-253Gabriel Mazetto2017-07-031-1/+1
| | | | | | | | 2.5.x branch have updated performance and additional fixes
* | 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.2 See merge request !12471
| * 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.1 Closes #34084 See merge request !12425
| * Bump bootsnap to 1.1.1blackst0ne2017-06-271-0/+1
| |
* | Bump premailer-rails gem to 1.9.7 and its dependencies to prevent network ↵Stan Hu2017-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | retrieval of assets Since asset compilation was disabled in GitLab 9.3, the premailer-rails gem would fall back to fetching assets via HTTP(s) since the Sidekiq working directory was not the Rails root. In some instances, SSL verification would fail, preventing e-mails from being sent. premailer-rails 1.9.7 has a fix (https://github.com/fphilipe/premailer-rails/pull/195) that uses an absolute directory to load assets from the filesystem so that the assets can be fetched locally instead of over the network. Closes #34231
* | Merge branch '31574-bootstrap-form-builder' into 'master'Phil Hughes2017-06-231-0/+1
|\ \ | |/ |/| | | | | Add bootstrap_form gem See merge request !10985
| * Add bootstrap_form gemNick Thomas2017-06-221-0/+1
| |
* | Revert "Merge branch 'rs-bootsnap' into 'master'"rs-revert-bootsnapRobert Speicher2017-06-221-1/+0
|/ | | | | This reverts commit 95138a9c16a2d1905354d0f46381b3822b37863d, reversing changes made to 66aad16d1aaa426237e52ef19385385566f194dc.
* 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. See merge request !12289
| * Update rainbow from 2.1.0 to 2.2.2.cs-update-rainbowConnor Shea2017-06-191-1/+1
| | | | | | | | | | | | Changelog: https://github.com/sickill/rainbow/blob/master/Changelog.md#222-2017-04-21 Adds support for Ruby 2.4.
* | Merge branch 'cs-update-paranoia' into 'master'Rémy Coutable2017-06-201-1/+1
|\ \ | | | | | | | | | | | | Update paranoia from 2.2 to 2.3.1. See merge request !12288
| * | Update paranoia from 2.2 to 2.3.1.cs-update-paranoiaConnor Shea2017-06-191-1/+1
| |/ | | | | | | | | | | https://github.com/rubysherpas/paranoia/blob/core/CHANGELOG.md#230-2017-04-14 Adds support for Rails 5.1.
* | Update carrierwave from 1.0.0 to 1.1.0.Connor Shea2017-06-191-1/+1
|/ | | | | | Changelog: https://github.com/carrierwaveuploader/carrierwave/blob/f2f8569b1013f601fe7be4b3a616359acd27240d/CHANGELOG.md#110---2017-04-30 Adds support for Rails 5.1
* Merge branch '29010-perf-bar' into 'master'Robert Speicher2017-06-121-0/+11
|\ | | | | | | | | | | | | Add an optional performance bar to view performance metrics for the current page Closes #29010 See merge request !11439
| * Don't use Pygment,rb, use Rouge instead, and put peek-pg in the :postgres groupRémy Coutable2017-06-091-2/+1
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * New performance bar that can be enabled with the `p b` shortcutRémy Coutable2017-06-091-0/+12
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | 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 variable Closes omnibus-gitlab#1714 See merge request !12074
| * | Bump Faraday and dependent OAuth2 gem version to support no_proxy variableStan Hu2017-06-091-2/+2
| |/ | | | | | | Closes gitlab-org/omnibus-gitlab#1714
* | Merge branch 'bugfix/upgrade-ruby-parser' into 'master'Douwe Maan2017-06-091-1/+1
|\ \ | |/ |/| | | | | Bugfix/upgrade ruby parser See merge request !11861
| * 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
|\ | | | | | | | | Add Prometheus metrics endpoint and basic infrastructure to meter code See merge request !11553
| * Move Prometheus presentation logic to PrometheusTextPawel Chojnacki2017-06-021-2/+1
| | | | | | | | | | | | | | | | + Use NullMetrics to mock metrics when unused + Use method_missing in NullMetrics mocking + Update prometheus gem to version that correctly uses transitive dependencies + Ensure correct folders are used in Multiprocess prometheus client tests. + rename Sessions controller's metric
| * Correctly handle temporary folder for testing multiproces metricsPawel Chojnacki2017-06-021-2/+2
| |
| * Add Prometheus metrics configurationPawel Chojnacki2017-06-021-0/+4
| | | | | | | | + Cleanup Gemfile
* | Merge branch 'fix/use-new-gitaly-commit-diff-rpc' into 'master'Robert Speicher2017-06-021-1/+1
|\ \ | |/ |/| | | | | Use the new Gitaly CommitDiff RPC See merge request !11826
| * Use the new Gitaly CommitDiff RPCfix/use-new-gitaly-commit-diff-rpcAhmad Sherif2017-06-021-1/+1
| |
* | Add fog-aliyun as backup storage provideryuanfeiz/gitlab-ce-aliyun-backup-providerYuanfei Zhu2017-06-011-0/+1
|/
* Add feature toggles through FlipperAlejandro Rodríguez2017-05-311-0/+4
|
* Upgrade to task_list v2Jared Deckard2017-05-231-1/+1
|
* Add support for deltas_only under GitalyAhmad Sherif2017-05-131-1/+1
| | | | Closes gitaly#199
* Resolve "Update gem sidekiq-cron from 0.4.4 to 0.6.0 and rufus-scheduler ↵Dosuken shinya2017-05-101-2/+2
| | | | from 3.1.10 to 3.4.0"
* Re-enable Gitaly commit_raw_diff featureAhmad Sherif2017-05-071-1/+1
|
* Add ruby_parser gem for all environments.add-ruby-parser-dependencyRuben Davila2017-05-051-0/+1
| | | | | | It was only available for test and development environments and we need it to run the `rake gettext:pack` command in omnibus which doesn't have the test/dev gems installed.