[Git][noosfero/noosfero][stable-2.0] Merge branch 'fix-warnings' into 'master'
Rodrigo Souto
gitlab at mg.gitlab.com
Wed Apr 11 14:02:34 BRT 2018
Rodrigo Souto pushed to branch stable-2.0 at Noosfero / noosfero
Commits:
495ab666 by Rodrigo Souto at 2018-04-11T17:02:22Z
Merge branch 'fix-warnings' into 'master'
gemfile: fix warnings
See merge request noosfero/noosfero!1431
(cherry picked from commit 8800ac9699cb772e89542500d449614a63ae249d)
314b750a gemfile: fix warnings
- - - - -
1 changed file:
- Gemfile
Changes:
=====================================
Gemfile
=====================================
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@ source "https://rubygems.org"
platform :ruby do
gem 'pg', '~> 0.17'
- gem 'rmagick', '~> 2.13'
+ gem 'rmagick', '~> 2.13', require: false
gem 'RedCloth', '~> 4.2'
gem 'unicorn', '~> 4.8'
end
@@ -37,8 +37,6 @@ gem 'activerecord-session_store', ('1.0.0.pre' if RUBY_VERSION >= '2.3.0')
gem 'recaptcha', require: 'recaptcha/rails'
gem 'honeypot-captcha'
gem 'font-awesome-sass'
-gem 'rspec'
-gem 'rspec-rails'
# API dependencies
gem 'grape'
@@ -78,6 +76,8 @@ group :test do
gem 'minitest'
gem 'minitest-reporters'
gem 'simplecov', :require => false
+ gem 'rspec'
+ gem 'rspec-rails'
end
group :cucumber, :test do
View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/495ab666e655d836ebcb02193afcf71a87ddf94f
---
View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/495ab666e655d836ebcb02193afcf71a87ddf94f
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20180411/828409f6/attachment-0001.html>
More information about the Noosfero-dev
mailing list