[Git][noosfero/noosfero][stretch] 5 commits: stretch-update: remove version requirements from debian control
Rodrigo Souto
gitlab at mg.gitlab.com
Tue Dec 5 12:34:15 BRST 2017
Rodrigo Souto pushed to branch stretch at Noosfero / noosfero
Commits:
a71a2152 by Rodrigo Souto at 2017-12-05T11:30:09-03:00
stretch-update: remove version requirements from debian control
- - - - -
afc54114 by Rodrigo Souto at 2017-12-05T11:30:31-03:00
stretch-update: update autolink
- - - - -
eb04fb06 by Rodrigo Souto at 2017-12-05T11:30:49-03:00
stretch-update: update gem versions
- - - - -
253c08a3 by Rodrigo Souto at 2017-12-05T11:32:05-03:00
stretch-update: update recaptcha config
- - - - -
42df8ad7 by Rodrigo Souto at 2017-12-05T11:33:39-03:00
stretch-update: update rmagick require
- - - - -
4 changed files:
- Gemfile
- config/initializers/recaptcha.rb
- debian/control
- plugins/html5_video/lib/video_processor/ffmpeg.rb
Changes:
=====================================
Gemfile
=====================================
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ platform :ruby do
gem 'pg', '~> 0.17'
gem 'rmagick', '~> 2.13'
gem 'RedCloth', '~> 4.2'
- gem 'unicorn', '~> 4.8'
+ gem 'unicorn', '~> 5.2'
end
platform :jruby do
@@ -13,13 +13,13 @@ platform :jruby do
end
gem 'rails', '~> 4.2.4'
-gem 'fast_gettext', '~> 0.9'
-gem 'acts-as-taggable-on', '~> 3.5'
-gem 'rails_autolink', '~> 1.1.5'
+gem 'fast_gettext', '~> 1.2'
+gem 'acts-as-taggable-on', '~> 4.0'
+gem 'rails_autolink', '~> 1.1.6'
gem 'ruby-feedparser', '~> 0.7'
gem 'daemons', '~> 1.1'
gem 'nokogiri', (if RUBY_VERSION >= '2.4.0' then '~> 1.7.0' else '~> 1.6.0' end)
-gem 'will_paginate', '~> 3.0.7'
+gem 'will_paginate', '~> 3.1'
gem 'pothoven-attachment_fu', '~> 3.2.16'
gem 'delayed_job'
gem 'delayed_job_active_record'
@@ -32,7 +32,7 @@ gem 'whenever', '~> 0.9.4', :require => false
gem 'eita-jrails', '~> 0.10.0', require: 'jrails'
gem 'diffy', '~> 3.0'
gem 'slim'
-gem 'activerecord-session_store', ('1.0.0.pre' if RUBY_VERSION >= '2.3.0')
+gem 'activerecord-session_store', '1.0.0'
gem 'recaptcha', require: 'recaptcha/rails'
gem 'honeypot-captcha'
gem 'font-awesome-sass'
@@ -41,7 +41,7 @@ gem 'rspec-rails', '~> 3.2'
# API dependencies
gem 'grape', '~> 0.12'
-gem 'grape-entity', '~>0.4.8'
+gem 'grape-entity', '~> 0.6.0'
gem 'grape_logging'
gem 'rack-cors'
gem 'rack-contrib'
@@ -78,8 +78,8 @@ end
group :cucumber, :test do
gem 'capybara', '~> 2.2'
gem 'launchy'
- gem 'cucumber', '~> 1.3'
- gem 'cucumber-rails', '~> 1.4.2', require: false
+ gem 'cucumber', '~> 2.4'
+ gem 'cucumber-rails', '~> 1.4.3', require: false
gem 'database_cleaner', '~> 1.3'
# Selenium WebDriver 3+ depends on geckodriver
gem 'selenium-webdriver', '>= 2.53', '< 3.0'
=====================================
config/initializers/recaptcha.rb
=====================================
--- a/config/initializers/recaptcha.rb
+++ b/config/initializers/recaptcha.rb
@@ -1,4 +1,4 @@
Recaptcha.configure do |config|
- config.site_key = '6LcK7CYUAAAAABl-eMkoFIv3VvOOIPwiXeinFmUi'
- config.secret_key = '6LcK7CYUAAAAAN-oooxubQRkDEf_EKqygh4Hs3CB'
+ config.public_key = '6LcK7CYUAAAAABl-eMkoFIv3VvOOIPwiXeinFmUi'
+ config.private_key = '6LcK7CYUAAAAAN-oooxubQRkDEf_EKqygh4Hs3CB'
end
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -4,10 +4,10 @@ Priority: extra
Maintainer: Noosfero developers <noosfero-dev at listas.softwarelivre.org>
Uploaders: Antonio Terceiro <terceiro at colivre.coop.br>
Build-Depends: cucumber,
- debhelper (>= 7.0.50~),
+ debhelper,
imagemagick,
po4a,
- rails (>= 2:4.2),
+ rails,
rake,
ruby-capybara,
ruby-cucumber-rails,
@@ -15,12 +15,12 @@ Build-Depends: cucumber,
ruby-diffy,
ruby-gettext,
ruby-launchy-shim,
- ruby-liquid (>= 3.0.3),
+ ruby-liquid,
ruby-minitest,
ruby-minitest-reporters,
ruby-mocha,
ruby-selenium-webdriver,
- ruby-will-paginate (>> 3.0.5-1),
+ ruby-will-paginate,
tango-icon-theme,
xvfb
Standards-Version: 3.8.4
@@ -31,46 +31,46 @@ Vcs-Browser: http://git.colivre.coop.br/?p=noosfero.git
Package: noosfero
Architecture: all
Depends: adduser,
- bundler (>= 1.10),
+ bundler,
dbconfig-common,
debconf,
exim4 | mail-transport-agent,
git,
iso-codes,
memcached,
- rails (>= 2:4.2),
+ rails,
rake,
- ruby (>= 1:1.9.3),
+ ruby,
ruby-actionpack-action-caching,
ruby-actionpack-page-caching,
ruby-activerecord-session-store,
- ruby-acts-as-taggable-on (>= 3.5),
+ ruby-acts-as-taggable-on,
ruby-api-pagination,
ruby-daemons,
ruby-dalli,
ruby-delayed-job,
ruby-delayed-job-active-record,
ruby-diffy,
- ruby-eita-jrails (>= 0.9.3-5~),
- ruby-eventmachine (>= 0.12.10-4~),
+ ruby-eita-jrails,
+ ruby-eventmachine,
ruby-exception-notification,
ruby-fast-gettext,
ruby-feedparser,
- ruby-feedparser (>= 0.7-3~),
+ ruby-feedparser,
ruby-font-awesome-sass,
ruby-gettext,
ruby-grape,
- ruby-grape-entity (>= 0.4.8),
+ ruby-grape-entity,
ruby-grape-logging,
ruby-honeypot-captcha,
- ruby-liquid (>= 3.0.3),
+ ruby-liquid,
ruby-minitest,
ruby-nokogiri,
ruby-pg,
ruby-pothoven-attachment-fu,
ruby-progressbar,
ruby-protected-attributes,
- ruby-rack (>= 1.4.5-2~),
+ ruby-rack,
ruby-rack-contrib,
ruby-rack-cors,
ruby-rails-autolink,
@@ -79,20 +79,20 @@ Depends: adduser,
ruby-redcloth,
ruby-rest-client,
ruby-rmagick,
- ruby-rspec (>= 3),
- ruby-rspec-rails (>= 3),
+ ruby-rspec,
+ ruby-rspec-rails,
ruby-sass-rails,
ruby-simplecov,
ruby-simplecov-html,
ruby-docile,
ruby-spring,
- ruby-tzinfo (>= 1.1.0-2~),
+ ruby-tzinfo,
ruby-uglifier,
ruby-whenever,
- ruby-will-paginate (>> 3.0.5-1),
+ ruby-will-paginate,
ruby-slim,
tango-icon-theme,
- unicorn (>= 4.8),
+ unicorn,
postgresql,
postgresql-client,
postgresql-contrib,
=====================================
plugins/html5_video/lib/video_processor/ffmpeg.rb
=====================================
--- a/plugins/html5_video/lib/video_processor/ffmpeg.rb
+++ b/plugins/html5_video/lib/video_processor/ffmpeg.rb
@@ -1,4 +1,4 @@
-require 'RMagick'
+require 'rmagick'
# Works for ffmpeg version 2.8.6-1~bpo8 shiped by Debian Jessie Backports
# https://packages.debian.org/jessie-backports/ffmpeg
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/7ad825bdbb4f0dd13f5e9a3dee2ef02157567177...42df8ad7535d3d5babb2f38d71b6fb747d46a5d7
---
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/7ad825bdbb4f0dd13f5e9a3dee2ef02157567177...42df8ad7535d3d5babb2f38d71b6fb747d46a5d7
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/20171205/3b1d0541/attachment-0001.html>
More information about the Noosfero-dev
mailing list