Download as
Browse Code »

Commit be6c3d11c5470648ceeac7853321178a171f0f26

Authored by Antonio Terceiro
1 parent d8a41cb3
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, 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_event_date_issue, 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, tasks_keep_filter_params, user_mention, webfinger_server

re-add dependency on rest-client 

Now make sure it will be installed together with the Debian package
Showing 3 changed files with 5 additions and 0 deletions   Show diff stats
@@ -15,6 +15,7 @@ gem 'thin' @@ -15,6 +15,7 @@ gem 'thin'
15 gem 'hpricot' 15 gem 'hpricot'
16 gem 'nokogiri' 16 gem 'nokogiri'
17 gem 'rake', :require => false 17 gem 'rake', :require => false
  18 +gem 'rest-client'
18 19
19 # FIXME list here all actual dependencies (i.e. the ones in debian/control), 20 # FIXME list here all actual dependencies (i.e. the ones in debian/control),
20 # with their GEM names (not the Debian package names) 21 # with their GEM names (not the Debian package names)
@@ -111,6 +111,8 @@ GEM @@ -111,6 +111,8 @@ GEM
111 thor (>= 0.14.6, < 2.0) 111 thor (>= 0.14.6, < 2.0)
112 rake (0.9.2.2) 112 rake (0.9.2.2)
113 rdoc (3.9.4) 113 rdoc (3.9.4)
  114 + rest-client (1.6.7)
  115 + mime-types (>= 1.16)
114 rmagick (2.13.1) 116 rmagick (2.13.1)
115 rspec (2.10.0) 117 rspec (2.10.0)
116 rspec-core (~> 2.10.0) 118 rspec-core (~> 2.10.0)
@@ -175,6 +177,7 @@ DEPENDENCIES @@ -175,6 +177,7 @@ DEPENDENCIES
175 rails 177 rails
176 rails_autolink 178 rails_autolink
177 rake 179 rake
  180 + rest-client
178 rmagick 181 rmagick
179 rspec 182 rspec
180 rspec-rails 183 rspec-rails
debian/control
  Diff comments   View file @be6c3d1
@@ -53,6 +53,7 @@ Depends: @@ -53,6 +53,7 @@ Depends:
53 ruby-rails-autolink, 53 ruby-rails-autolink,
54 memcached, 54 memcached,
55 ruby-memcache-client, 55 ruby-memcache-client,
  56 + ruby-rest-client,
56 debconf, 57 debconf,
57 dbconfig-common, 58 dbconfig-common,
58 adduser, 59 adduser,