nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3568 from diaspora/update_gems

Browse source 
Update gems / participation wanted
This commit is contained in:
Jonne Haß 2012-09-20 04:57:17 -07:00
commit 9534caeb05
2 changed files with 35 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Gemfile
View file

@ -5,7 +5,7 @@ ruby '1.9.3' if ENV['HEROKU']
gem 'rails', '3.2.8'
gem 'foreman', '0.57'
gem 'foreman', '0.59'
gem 'thin', '1.4.1', :require => false
gem 'rails_autolink', '1.0.9'
@ -56,7 +56,7 @@ end
gem 'settingslogic', :git => 'https://github.com/binarylogic/settingslogic.git'
# database
gem "activerecord-import", "0.2.9"
gem "activerecord-import", "0.2.10"
gem 'foreigner', '1.2.1'
gem 'mysql2', '0.3.11' if ENV['DB'].nil? || ENV['DB'] == 'all' || ENV['DB'] == 'mysql'
gem 'pg', '0.14.1' if ENV['DB'] == 'all' || ENV['DB'] == 'postgres'
@ -71,7 +71,7 @@ gem 'mini_magick', '3.4'
# JSON and API
gem 'json', '1.7.5'
gem 'acts_as_api', '0.4'
gem 'acts_as_api', '0.4.1 '
# localization
@ -80,7 +80,7 @@ gem 'rails-i18n'
# parsing
gem 'nokogiri', '1.5.2'
gem 'nokogiri', '1.5.5'
gem 'redcarpet', "2.1.1"
gem 'roxml', :git => 'https://github.com/Empact/roxml.git', :ref => '7ea9a9ffd2338aaef5b0'
gem 'ruby-oembed', '0.8.7'
@ -112,7 +112,7 @@ gem 'gon', '4.0.0'
# assets
group :assets do
gem 'bootstrap-sass', '2.0.3.1'
gem 'bootstrap-sass', '2.1.0.0'
gem 'sass-rails', '3.2.5'
# Windows and OSX have an execjs compatible runtime built-in, Linux users should
@ -133,8 +133,8 @@ gem 'jquery-rails', '2.0.2'
# web
gem 'faraday', '0.8.1'
gem 'faraday_middleware', '0.8.7'
gem 'faraday', '0.8.4'
gem 'faraday_middleware', '0.8.8'
gem 'jasmine', '1.2.1'
@ -148,14 +148,14 @@ group :test do
gem 'cucumber-rails', '1.3.0', :require => false
gem 'database_cleaner', '0.8'
gem 'timecop'
gem 'factory_girl_rails', '4.0.0'
gem 'timecop', '0.5.1'
gem 'factory_girl_rails', '4.1.0'
gem 'fixture_builder', '0.3.4'
gem 'fuubar', '1.0.0'
gem 'rspec-instafail', '0.2.4', :require => false
gem 'selenium-webdriver', '2.25.0'
gem 'webmock', '1.8.7', :require => false
gem 'webmock', '1.8.10', :require => false
gem 'spork', '1.0.0rc3'
gem 'guard-rspec', '0.7.3'
@ -175,7 +175,7 @@ group :development do
gem 'capistrano', '2.12.0', :require => false
gem 'capistrano_colors', '0.5.5', :require => false
gem 'capistrano-ext', '1.2.1', :require => false
gem 'yard', '0.8.1', :require => false
gem 'yard', '0.8.2.1', :require => false
# for tracing AR object instantiation and memory usage per request
gem 'oink', '0.9.3'

48
Gemfile.lock
View file

@ -62,7 +62,7 @@ GEM
activesupport (= 3.2.8)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activerecord-import (0.2.9)
activerecord-import (0.2.10)
activerecord (~> 3.0)
activerecord (~> 3.0)
activeresource (3.2.8)
@ -73,7 +73,7 @@ GEM
multi_json (~> 1.0)
acts-as-taggable-on (2.3.3)
rails (~> 3.0)
acts_as_api (0.4)
acts_as_api (0.4.1)
activemodel (>= 3.0.0)
activesupport (>= 3.0.0)
rack (>= 1.1.0)
@ -87,7 +87,7 @@ GEM
fog
bbenezech-nested_form (0.0.6)
bcrypt-ruby (3.0.1)
bootstrap-sass (2.0.3.1)
bootstrap-sass (2.1.0.0)
builder (3.0.3)
capistrano (2.12.0)
highline
@ -149,14 +149,14 @@ GEM
excon (0.14.3)
execjs (1.4.0)
multi_json (~> 1.0)
factory_girl (4.0.0)
factory_girl (4.1.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.0.0)
factory_girl (~> 4.0.0)
factory_girl_rails (4.1.0)
factory_girl (~> 4.1.0)
railties (>= 3.0.0)
faraday (0.8.1)
faraday (0.8.4)
multipart-post (~> 1.1)
faraday_middleware (0.8.7)
faraday_middleware (0.8.8)
faraday (>= 0.7.4, < 0.9)
fastercsv (1.5.5)
ffi (1.1.5)
@ -175,7 +175,7 @@ GEM
ruby-hmac
foreigner (1.2.1)
activerecord (>= 3.0.0)
foreman (0.57.0)
foreman (0.59.0)
thor (>= 0.13.6)
formatador (0.2.3)
fuubar (1.0.0)
@ -279,7 +279,7 @@ GEM
net-ssh (>= 1.99.1)
netrc (0.7.7)
newrelic_rpm (3.3.5)
nokogiri (1.5.2)
nokogiri (1.5.5)
oauth (0.4.6)
oauth2 (0.6.1)
faraday (~> 0.7)
@ -416,7 +416,7 @@ GEM
rack (>= 1.0.0)
thor (0.16.0)
tilt (1.3.3)
timecop (0.4.6)
timecop (0.5.1)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
@ -439,25 +439,25 @@ GEM
rack (>= 1.0.0)
warden (1.2.1)
rack (>= 1.0)
webmock (1.8.7)
webmock (1.8.10)
addressable (>= 2.2.7)
crack (>= 0.1.7)
will_paginate (3.0.3)
xpath (0.1.4)
nokogiri (~> 1.3)
yard (0.8.1)
yard (0.8.2.1)
PLATFORMS
ruby
DEPENDENCIES
activerecord-import (= 0.2.9)
activerecord-import (= 0.2.10)
acts-as-taggable-on (= 2.3.3)
acts_as_api (= 0.4)
acts_as_api (= 0.4.1)
addressable (= 2.3.2)
airbrake (= 3.1.0)
asset_sync (= 0.4.2)
bootstrap-sass (= 2.0.3.1)
bootstrap-sass (= 2.1.0.0)
bundler (> 1.1.0)
capistrano (= 2.12.0)
capistrano-ext (= 1.2.1)
@ -469,14 +469,14 @@ DEPENDENCIES
database_cleaner (= 0.8)
debugger (= 1.2.0)
devise (= 2.1.2)
factory_girl_rails (= 4.0.0)
faraday (= 0.8.1)
faraday_middleware (= 0.8.7)
factory_girl_rails (= 4.1.0)
faraday (= 0.8.4)
faraday_middleware (= 0.8.8)
fastercsv (= 1.5.5)
fixture_builder (= 0.3.4)
fog (= 1.4.0)
foreigner (= 1.2.1)
foreman (= 0.57)
foreman (= 0.59)
fuubar (= 1.0.0)
gon (= 4.0.0)
guard-cucumber (= 1.0.0)
@ -497,7 +497,7 @@ DEPENDENCIES
mobile-fu (= 1.1.0)
mysql2 (= 0.3.11)
newrelic_rpm (= 3.3.5)
nokogiri (= 1.5.2)
nokogiri (= 1.5.5)
oink (= 0.9.3)
omniauth (= 1.1.1)
omniauth-facebook (= 1.3.0)
@ -527,11 +527,11 @@ DEPENDENCIES
settingslogic!
spork (= 1.0.0rc3)
thin (= 1.4.1)
timecop
timecop (= 0.5.1)
twitter (= 2.0.2)
typhoeus (= 0.3.3)
uglifier (= 1.3.0)
unicorn (= 4.3.1)
webmock (= 1.8.7)
webmock (= 1.8.10)
will_paginate (= 3.0.3)
yard (= 0.8.1)
yard (= 0.8.2.1)