Download as
Browse Code »

Commit 01937f3d09ffc1d60878d36abea8d9e0294b55d5

Authored by Antonio Terceiro
1 parent 4b28211e
Exists in master and in 20 other branches add_member_task_reject_details, admin_visible_profile, community_notifications, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, organization_ratings_improvements, profile_api_improvements, ratings_minor_fixes, send_email_to_admins, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

rails4: relax some dependency constraints 

Require versions that are present in Debian 8 as most as possible.
Showing 2 changed files with 17 additions and 21 deletions   Show diff stats
1 source "https://rubygems.org" 1 source "https://rubygems.org"
2 gem 'rails', '~> 4.2.4' 2 gem 'rails', '~> 4.2.4'
3 -gem 'fast_gettext', '~> 0.6.8'  
4 -gem 'acts-as-taggable-on', '~> 3.4.2' 3 +gem 'fast_gettext', '~> 0.9'
  4 +gem 'acts-as-taggable-on', '~> 3.5'
5 gem 'rails_autolink', '~> 1.1.5' 5 gem 'rails_autolink', '~> 1.1.5'
6 -gem 'pg', '~> 0.18.1'  
7 -gem 'rmagick', '~> 2.13.1'  
8 -gem 'RedCloth', '~> 4.2.9' 6 +gem 'pg', '~> 0.18'
  7 +gem 'rmagick', '~> 2.13'
  8 +gem 'RedCloth', '~> 4.2'
9 gem 'ruby-feedparser', '~> 0.7' 9 gem 'ruby-feedparser', '~> 0.7'
10 -gem 'daemons', '~> 1.1.5' 10 +gem 'daemons', '~> 1.1'
11 gem 'unicorn', '~> 4.8' 11 gem 'unicorn', '~> 4.8'
12 gem 'nokogiri', '~> 1.6.0' 12 gem 'nokogiri', '~> 1.6.0'
13 gem 'will_paginate' 13 gem 'will_paginate'
@@ -15,10 +15,10 @@ gem 'pothoven-attachment_fu', '~> 3.2.16' @@ -15,10 +15,10 @@ gem 'pothoven-attachment_fu', '~> 3.2.16'
15 gem 'delayed_job' 15 gem 'delayed_job'
16 gem 'delayed_job_active_record' 16 gem 'delayed_job_active_record'
17 gem 'rake', :require => false 17 gem 'rake', :require => false
18 -gem 'rest-client', '~> 1.6.7' 18 +gem 'rest-client', '~> 1.6'
19 gem 'exception_notification', '~> 4.0.1' 19 gem 'exception_notification', '~> 4.0.1'
20 -gem 'gettext', '~> 2.2.1', :require => false  
21 -gem 'locale', '~> 2.0.5' 20 +gem 'gettext', '~> 3.1', :require => false
  21 +gem 'locale', '~> 2.1'
22 gem 'whenever', :require => false 22 gem 'whenever', :require => false
23 gem 'eita-jrails', '~> 0.10.0', require: 'jrails' 23 gem 'eita-jrails', '~> 0.10.0', require: 'jrails'
24 24
@@ -41,10 +41,6 @@ gem 'actionpack-action_caching' @@ -41,10 +41,6 @@ gem 'actionpack-action_caching'
41 gem 'activerecord-session_store' 41 gem 'activerecord-session_store'
42 gem 'activerecord-deprecated_finders', require: 'active_record/deprecated_finders' 42 gem 'activerecord-deprecated_finders', require: 'active_record/deprecated_finders'
43 43
44 -  
45 -# FIXME list here all actual dependencies (i.e. the ones in debian/control),  
46 -# with their GEM names (not the Debian package names)  
47 -  
48 group :production do 44 group :production do
49 gem 'dalli', '~> 2.7.0' 45 gem 'dalli', '~> 2.7.0'
50 end 46 end
@@ -58,8 +54,8 @@ group :development, :test do @@ -58,8 +54,8 @@ group :development, :test do
58 end 54 end
59 55
60 group :test do 56 group :test do
61 - gem 'rspec', '~> 2.14.0'  
62 - gem 'rspec-rails', '~> 2.14.1' 57 + gem 'rspec', '~> 3.3'
  58 + gem 'rspec-rails', '~> 3.2'
63 gem 'mocha', '~> 1.1.0', :require => false 59 gem 'mocha', '~> 1.1.0', :require => false
64 gem 'test-unit' if RUBY_VERSION >= '2.2.0' 60 gem 'test-unit' if RUBY_VERSION >= '2.2.0'
65 gem 'minitest' 61 gem 'minitest'
@@ -67,11 +63,11 @@ group :test do @@ -67,11 +63,11 @@ group :test do
67 end 63 end
68 64
69 group :cucumber do 65 group :cucumber do
70 - gem 'capybara', '~> 2.1.0' 66 + gem 'capybara', '~> 2.2'
71 gem 'launchy' 67 gem 'launchy'
72 - gem 'cucumber', '~> 1.3.20' 68 + gem 'cucumber', '~> 2.0'
73 gem 'cucumber-rails', '~> 1.4.2', :require => false 69 gem 'cucumber-rails', '~> 1.4.2', :require => false
74 - gem 'database_cleaner', '~> 1.2.0' 70 + gem 'database_cleaner', '~> 1.3'
75 gem 'selenium-webdriver' 71 gem 'selenium-webdriver'
76 end 72 end
77 73
vendor/plugins/ruby_bosh/ruby_bosh.gemspec
  Diff comments   View file @01937f3
@@ -23,13 +23,13 @@ Gem::Specification.new do |s| @@ -23,13 +23,13 @@ Gem::Specification.new do |s|
23 23
24 if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then 24 if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
25 s.add_runtime_dependency(%q<builder>, [">= 0"]) 25 s.add_runtime_dependency(%q<builder>, [">= 0"])
26 - s.add_runtime_dependency(%q<adamwiggins-rest-client>, [">= 0"]) 26 + s.add_runtime_dependency(%q<rest-client>, [">= 0"])
27 else 27 else
28 s.add_dependency(%q<builder>, [">= 0"]) 28 s.add_dependency(%q<builder>, [">= 0"])
29 - s.add_dependency(%q<adamwiggins-rest-client>, [">= 0"]) 29 + s.add_dependency(%q<rest-client>, [">= 0"])
30 end 30 end
31 else 31 else
32 s.add_dependency(%q<builder>, [">= 0"]) 32 s.add_dependency(%q<builder>, [">= 0"])
33 - s.add_dependency(%q<adamwiggins-rest-client>, [">= 0"]) 33 + s.add_dependency(%q<rest-client>, [">= 0"])
34 end 34 end
35 end 35 end