Download as
Browse Code »

Commit 01937f3d09ffc1d60878d36abea8d9e0294b55d5

Authored by Antonio Terceiro
1 parent 4b28211e
Exists in staging and in 39 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, user_mention, webfinger_server

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
Gemfile
  Diff comments   View file @01937f3
1 1 source "https://rubygems.org"
2 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 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 9 gem 'ruby-feedparser', '~> 0.7'
10   -gem 'daemons', '~> 1.1.5'
  10 +gem 'daemons', '~> 1.1'
11 11 gem 'unicorn', '~> 4.8'
12 12 gem 'nokogiri', '~> 1.6.0'
13 13 gem 'will_paginate'
... ... @@ -15,10 +15,10 @@ gem 'pothoven-attachment_fu', '~> 3.2.16'
15 15 gem 'delayed_job'
16 16 gem 'delayed_job_active_record'
17 17 gem 'rake', :require => false
18   -gem 'rest-client', '~> 1.6.7'
  18 +gem 'rest-client', '~> 1.6'
19 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 22 gem 'whenever', :require => false
23 23 gem 'eita-jrails', '~> 0.10.0', require: 'jrails'
24 24  
... ... @@ -41,10 +41,6 @@ gem 'actionpack-action_caching'
41 41 gem 'activerecord-session_store'
42 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 44 group :production do
49 45 gem 'dalli', '~> 2.7.0'
50 46 end
... ... @@ -58,8 +54,8 @@ group :development, :test do
58 54 end
59 55  
60 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 59 gem 'mocha', '~> 1.1.0', :require => false
64 60 gem 'test-unit' if RUBY_VERSION >= '2.2.0'
65 61 gem 'minitest'
... ... @@ -67,11 +63,11 @@ group :test do
67 63 end
68 64  
69 65 group :cucumber do
70   - gem 'capybara', '~> 2.1.0'
  66 + gem 'capybara', '~> 2.2'
71 67 gem 'launchy'
72   - gem 'cucumber', '~> 1.3.20'
  68 + gem 'cucumber', '~> 2.0'
73 69 gem 'cucumber-rails', '~> 1.4.2', :require => false
74   - gem 'database_cleaner', '~> 1.2.0'
  70 + gem 'database_cleaner', '~> 1.3'
75 71 gem 'selenium-webdriver'
76 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 23  
24 24 if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
25 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 27 else
28 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 30 end
31 31 else
32 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 34 end
35 35 end
... ...