Merge branch 'stable' into develop
This commit is contained in:
Steffen van Bergerem
commit
e10f606d7b
2 changed files with 110 additions and 105 deletions
36
Gemfile
36
Gemfile
|
|
@ -18,11 +18,11 @@ gem "diaspora_federation-rails", "0.0.12"
|
|||
|
||||
gem "acts_as_api", "0.4.2"
|
||||
gem "json", "1.8.3"
|
||||
gem "json-schema", "2.5.2"
|
||||
gem "json-schema", "2.6.0"
|
||||
|
||||
# Authentication
|
||||
|
||||
gem "devise", "3.5.5"
|
||||
gem "devise", "3.5.6"
|
||||
gem "devise_lastseenable", "0.0.6"
|
||||
gem "devise-token_authenticatable", "~> 0.4.0"
|
||||
|
||||
|
|
@ -62,19 +62,19 @@ gem "bootstrap-switch-rails", "3.3.3"
|
|||
# Database
|
||||
|
||||
group :mysql, optional: true do
|
||||
gem "mysql2", "0.3.20"
|
||||
gem "mysql2", "0.4.2"
|
||||
end
|
||||
group :postgresql, optional: true do
|
||||
gem "pg", "0.18.4"
|
||||
end
|
||||
|
||||
gem "activerecord-import", "0.10.0"
|
||||
gem "activerecord-import", "0.11.0"
|
||||
|
||||
# File uploading
|
||||
|
||||
gem "carrierwave", "0.10.0"
|
||||
gem "fog", "1.37.0"
|
||||
gem "mini_magick", "4.3.6"
|
||||
gem "mini_magick", "4.4.0"
|
||||
gem "remotipart", "1.2.1"
|
||||
|
||||
# GUID generation
|
||||
|
|
@ -135,7 +135,7 @@ gem "leaflet-rails", "0.7.4"
|
|||
|
||||
gem "nokogiri", "1.6.7.2"
|
||||
gem "redcarpet", "3.3.4"
|
||||
gem "twitter-text", "1.13.0"
|
||||
gem "twitter-text", "1.13.3"
|
||||
gem "roxml", "3.1.6"
|
||||
gem "ruby-oembed", "0.9.0"
|
||||
gem "open_graph_reader", "0.6.1"
|
||||
|
|
@ -146,7 +146,7 @@ gem "omniauth", "1.3.1"
|
|||
gem "omniauth-facebook", "3.0.0"
|
||||
gem "omniauth-tumblr", "1.2"
|
||||
gem "omniauth-twitter", "1.2.1"
|
||||
gem "twitter", "5.15.0"
|
||||
gem "twitter", "5.16.0"
|
||||
gem "omniauth-wordpress", "0.2.2"
|
||||
|
||||
# OpenID Connect
|
||||
|
|
@ -154,7 +154,7 @@ gem "openid_connect", "0.8.3"
|
|||
|
||||
# Serializers
|
||||
|
||||
gem "active_model_serializers", "0.9.3"
|
||||
gem "active_model_serializers", "0.9.4"
|
||||
|
||||
# XMPP chat dependencies
|
||||
gem "diaspora-vines", "~> 0.2.0.develop"
|
||||
|
|
@ -239,8 +239,8 @@ group :development do
|
|||
gem "guard-rspec", "4.6.4"
|
||||
gem "guard-rubocop", "1.2.0"
|
||||
gem "guard", "2.13.0", require: false
|
||||
gem "rb-fsevent", "0.9.6", require: false
|
||||
gem "rb-inotify", "0.9.5", require: false
|
||||
gem "rb-fsevent", "0.9.7", require: false
|
||||
gem "rb-inotify", "0.9.7", require: false
|
||||
|
||||
# Linters
|
||||
gem "jshintrb", "0.3.0"
|
||||
|
|
@ -254,7 +254,7 @@ group :development do
|
|||
|
||||
# Preloading environment
|
||||
|
||||
gem "spring", "1.6.1"
|
||||
gem "spring", "1.6.3"
|
||||
gem "spring-commands-rspec", "1.0.4"
|
||||
gem "spring-commands-cucumber", "1.0.1"
|
||||
|
||||
|
|
@ -264,7 +264,7 @@ group :development do
|
|||
gem "pry-byebug"
|
||||
|
||||
# test coverage
|
||||
gem "simplecov", "0.11.1", require: false
|
||||
gem "simplecov", "0.11.2", require: false
|
||||
end
|
||||
|
||||
group :test do
|
||||
|
|
@ -277,7 +277,7 @@ group :test do
|
|||
|
||||
# Cucumber (integration tests)
|
||||
|
||||
gem "capybara", "2.5.0"
|
||||
gem "capybara", "2.6.2"
|
||||
gem "database_cleaner" , "1.5.1"
|
||||
gem "selenium-webdriver", "2.47.1"
|
||||
|
||||
|
|
@ -286,20 +286,20 @@ group :test do
|
|||
|
||||
# General helpers
|
||||
|
||||
gem "factory_girl_rails", "4.5.0"
|
||||
gem "factory_girl_rails", "4.6.0"
|
||||
gem "timecop", "0.8.0"
|
||||
gem "webmock", "1.22.3", require: false
|
||||
gem "shoulda-matchers", "3.0.1"
|
||||
gem "webmock", "1.22.6", require: false
|
||||
gem "shoulda-matchers", "3.1.1"
|
||||
|
||||
gem "diaspora_federation-test", "0.0.12"
|
||||
end
|
||||
|
||||
group :development, :test do
|
||||
# RSpec (unit tests, some integration tests)
|
||||
gem "rspec-rails", "3.3.3"
|
||||
gem "rspec-rails", "3.4.2"
|
||||
|
||||
# Cucumber (integration tests)
|
||||
gem "cucumber-rails", "1.4.2", require: false
|
||||
gem "cucumber-rails", "1.4.3", require: false
|
||||
|
||||
# Jasmine (client side application tests (JS))
|
||||
gem "jasmine", "2.4.0"
|
||||
|
|
|
|||
179
Gemfile.lock
179
Gemfile.lock
|
|
@ -22,7 +22,7 @@ GEM
|
|||
erubis (~> 2.7.0)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||
active_model_serializers (0.9.3)
|
||||
active_model_serializers (0.9.4)
|
||||
activemodel (>= 3.2)
|
||||
activejob (4.2.5.1)
|
||||
activesupport (= 4.2.5.1)
|
||||
|
|
@ -34,7 +34,7 @@ GEM
|
|||
activemodel (= 4.2.5.1)
|
||||
activesupport (= 4.2.5.1)
|
||||
arel (~> 6.0)
|
||||
activerecord-import (0.10.0)
|
||||
activerecord-import (0.11.0)
|
||||
activerecord (>= 3.0)
|
||||
activesupport (4.2.5.1)
|
||||
i18n (~> 0.7)
|
||||
|
|
@ -74,8 +74,9 @@ GEM
|
|||
bootstrap-switch-rails (3.3.3)
|
||||
buftok (0.2.0)
|
||||
builder (3.2.2)
|
||||
byebug (8.2.1)
|
||||
capybara (2.5.0)
|
||||
byebug (8.2.2)
|
||||
capybara (2.6.2)
|
||||
addressable
|
||||
mime-types (>= 1.16)
|
||||
nokogiri (>= 1.3.3)
|
||||
rack (>= 1.0.0)
|
||||
|
|
@ -107,7 +108,7 @@ GEM
|
|||
timers (>= 4.1.1)
|
||||
celluloid-supervision (0.20.5)
|
||||
timers (>= 4.1.1)
|
||||
childprocess (0.5.8)
|
||||
childprocess (0.5.9)
|
||||
ffi (~> 1.0, >= 1.0.11)
|
||||
chunky_png (1.3.5)
|
||||
coderay (1.1.0)
|
||||
|
|
@ -139,24 +140,29 @@ GEM
|
|||
connection_pool (2.2.0)
|
||||
crack (0.4.3)
|
||||
safe_yaml (~> 1.0.0)
|
||||
cucumber (1.3.20)
|
||||
cucumber (2.3.2)
|
||||
builder (>= 2.1.2)
|
||||
cucumber-core (~> 1.4.0)
|
||||
cucumber-wire (~> 0.0.1)
|
||||
diff-lcs (>= 1.1.3)
|
||||
gherkin (~> 2.12)
|
||||
gherkin (~> 3.2.0)
|
||||
multi_json (>= 1.7.5, < 2.0)
|
||||
multi_test (>= 0.1.2)
|
||||
cucumber-api-steps (0.13)
|
||||
cucumber (>= 1.2.1)
|
||||
jsonpath (>= 0.1.2)
|
||||
rspec (>= 2.12.0)
|
||||
cucumber-rails (1.4.2)
|
||||
cucumber-core (1.4.0)
|
||||
gherkin (~> 3.2.0)
|
||||
cucumber-rails (1.4.3)
|
||||
capybara (>= 1.1.2, < 3)
|
||||
cucumber (>= 1.3.8, < 2)
|
||||
mime-types (>= 1.16, < 3)
|
||||
cucumber (>= 1.3.8, < 3)
|
||||
mime-types (>= 1.16, < 4)
|
||||
nokogiri (~> 1.5)
|
||||
rails (>= 3, < 5)
|
||||
railties (>= 3, < 5)
|
||||
cucumber-wire (0.0.1)
|
||||
database_cleaner (1.5.1)
|
||||
devise (3.5.5)
|
||||
devise (3.5.6)
|
||||
bcrypt (~> 3.0)
|
||||
orm_adapter (~> 0.1)
|
||||
railties (>= 3.2.6, < 5)
|
||||
|
|
@ -189,7 +195,7 @@ GEM
|
|||
factory_girl (~> 4.5, >= 4.5.0)
|
||||
diff-lcs (1.2.5)
|
||||
docile (1.1.5)
|
||||
domain_name (0.5.25)
|
||||
domain_name (0.5.20160128)
|
||||
unf (>= 0.0.5, < 1.0.0)
|
||||
eco (1.0.0)
|
||||
coffee-script
|
||||
|
|
@ -197,16 +203,16 @@ GEM
|
|||
execjs
|
||||
eco-source (1.1.0.rc.1)
|
||||
ejs (1.1.1)
|
||||
em-hiredis (0.3.0)
|
||||
em-hiredis (0.3.1)
|
||||
eventmachine (~> 1.0)
|
||||
hiredis (~> 0.5.0)
|
||||
hiredis (~> 0.6.0)
|
||||
entypo-rails (3.0.0.pre.rc2)
|
||||
railties (>= 4.1, <= 5)
|
||||
equalizer (0.0.10)
|
||||
erubis (2.7.0)
|
||||
ethon (0.8.0)
|
||||
ethon (0.8.1)
|
||||
ffi (>= 1.3.0)
|
||||
eventmachine (1.0.8)
|
||||
eventmachine (1.0.9.1)
|
||||
excon (0.45.4)
|
||||
execjs (2.6.0)
|
||||
eye (0.8)
|
||||
|
|
@ -217,7 +223,7 @@ GEM
|
|||
thor
|
||||
factory_girl (4.5.0)
|
||||
activesupport (>= 3.0.0)
|
||||
factory_girl_rails (4.5.0)
|
||||
factory_girl_rails (4.6.0)
|
||||
factory_girl (~> 4.5.0)
|
||||
railties (>= 3.0.0)
|
||||
faraday (0.9.2)
|
||||
|
|
@ -267,7 +273,7 @@ GEM
|
|||
fog-atmos (0.1.0)
|
||||
fog-core
|
||||
fog-xml
|
||||
fog-aws (0.7.6)
|
||||
fog-aws (0.8.1)
|
||||
fog-core (~> 1.27)
|
||||
fog-json (~> 1.0)
|
||||
fog-xml (~> 0.1)
|
||||
|
|
@ -304,7 +310,7 @@ GEM
|
|||
fog-core
|
||||
fog-xml
|
||||
nokogiri
|
||||
fog-radosgw (0.0.4)
|
||||
fog-radosgw (0.0.5)
|
||||
fog-core (>= 1.21.0)
|
||||
fog-json
|
||||
fog-xml (>= 0.0.1)
|
||||
|
|
@ -318,7 +324,7 @@ GEM
|
|||
fog-serverlove (0.1.2)
|
||||
fog-core
|
||||
fog-json
|
||||
fog-softlayer (1.0.2)
|
||||
fog-softlayer (1.0.3)
|
||||
fog-core
|
||||
fog-json
|
||||
fog-storm_on_demand (0.1.1)
|
||||
|
|
@ -333,10 +339,10 @@ GEM
|
|||
fog-voxel (0.1.0)
|
||||
fog-core
|
||||
fog-xml
|
||||
fog-vsphere (0.4.0)
|
||||
fog-vsphere (0.6.0)
|
||||
fog-core
|
||||
rbvmomi (~> 1.8)
|
||||
fog-xenserver (0.2.2)
|
||||
fog-xenserver (0.2.3)
|
||||
fog-core
|
||||
fog-xml
|
||||
fog-xml (0.1.2)
|
||||
|
|
@ -348,8 +354,7 @@ GEM
|
|||
fuubar (2.0.0)
|
||||
rspec (~> 3.0)
|
||||
ruby-progressbar (~> 1.4)
|
||||
gherkin (2.12.2)
|
||||
multi_json (~> 1.3)
|
||||
gherkin (3.2.0)
|
||||
gitlab (3.4.0)
|
||||
httparty
|
||||
terminal-table
|
||||
|
|
@ -398,9 +403,9 @@ GEM
|
|||
hashdiff (0.2.3)
|
||||
hashie (3.4.3)
|
||||
hike (1.2.3)
|
||||
hiredis (0.5.2)
|
||||
hiredis (0.6.1)
|
||||
hitimes (1.2.3)
|
||||
http (0.9.8)
|
||||
http (1.0.2)
|
||||
addressable (~> 2.3)
|
||||
http-cookie (~> 1.0)
|
||||
http-form_data (~> 1.0.1)
|
||||
|
|
@ -422,7 +427,7 @@ GEM
|
|||
i18n-inflector (~> 2.6)
|
||||
railties (>= 3.0.0)
|
||||
inflecto (0.0.2)
|
||||
ipaddress (0.8.0)
|
||||
ipaddress (0.8.2)
|
||||
jasmine (2.4.0)
|
||||
jasmine-core (~> 2.4)
|
||||
phantomjs
|
||||
|
|
@ -452,14 +457,14 @@ GEM
|
|||
multi_json (>= 1.3)
|
||||
securecompare
|
||||
url_safe_base64
|
||||
json-schema (2.5.2)
|
||||
json-schema (2.6.0)
|
||||
addressable (~> 2.3.8)
|
||||
json_spec (1.1.4)
|
||||
multi_json (~> 1.0)
|
||||
rspec (>= 2.0, < 4.0)
|
||||
jsonpath (0.5.7)
|
||||
multi_json
|
||||
jwt (1.5.2)
|
||||
jwt (1.5.1)
|
||||
kaminari (0.16.3)
|
||||
actionpack (>= 3.0.0)
|
||||
activesupport (>= 3.0.0)
|
||||
|
|
@ -476,7 +481,7 @@ GEM
|
|||
logging (>= 1.8)
|
||||
loofah (2.0.3)
|
||||
nokogiri (>= 1.5.9)
|
||||
lumberjack (1.0.9)
|
||||
lumberjack (1.0.10)
|
||||
macaddr (1.7.1)
|
||||
systemu (~> 2.6.2)
|
||||
mail (2.6.3)
|
||||
|
|
@ -487,7 +492,7 @@ GEM
|
|||
messagebus_ruby_api (1.0.3)
|
||||
method_source (0.8.2)
|
||||
mime-types (2.99)
|
||||
mini_magick (4.3.6)
|
||||
mini_magick (4.4.0)
|
||||
mini_portile2 (2.0.0)
|
||||
minitest (5.8.4)
|
||||
mobile-fu (1.3.1)
|
||||
|
|
@ -497,9 +502,9 @@ GEM
|
|||
multi_test (0.1.2)
|
||||
multi_xml (0.5.5)
|
||||
multipart-post (2.0.0)
|
||||
mysql2 (0.3.20)
|
||||
mysql2 (0.4.2)
|
||||
naught (1.1.0)
|
||||
nenv (0.2.0)
|
||||
nenv (0.3.0)
|
||||
nested_form (0.3.2)
|
||||
nio4r (1.2.1)
|
||||
nokogiri (1.6.7.2)
|
||||
|
|
@ -508,12 +513,12 @@ GEM
|
|||
nenv (~> 0.1)
|
||||
shellany (~> 0.0)
|
||||
oauth (0.4.7)
|
||||
oauth2 (1.0.0)
|
||||
oauth2 (1.1.0)
|
||||
faraday (>= 0.8, < 0.10)
|
||||
jwt (~> 1.0)
|
||||
jwt (~> 1.0, < 1.5.2)
|
||||
multi_json (~> 1.3)
|
||||
multi_xml (~> 0.5)
|
||||
rack (~> 1.2)
|
||||
rack (>= 1.2, < 3)
|
||||
octokit (4.1.1)
|
||||
sawyer (~> 0.6.0, >= 0.5.3)
|
||||
omniauth (1.3.1)
|
||||
|
|
@ -550,10 +555,10 @@ GEM
|
|||
validate_url
|
||||
webfinger (>= 0.0.2)
|
||||
orm_adapter (0.5.0)
|
||||
parser (2.2.3.0)
|
||||
ast (>= 1.1, < 3.0)
|
||||
parser (2.3.0.4)
|
||||
ast (~> 2.2)
|
||||
pg (0.18.4)
|
||||
phantomjs (1.9.8.0)
|
||||
phantomjs (2.1.1.0)
|
||||
powerpack (0.1.1)
|
||||
pronto (0.5.3)
|
||||
gitlab (~> 3.4.0)
|
||||
|
|
@ -690,11 +695,11 @@ GEM
|
|||
activesupport (= 4.2.5.1)
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rainbow (2.0.0)
|
||||
rainbow (2.1.0)
|
||||
raindrops (0.15.0)
|
||||
rake (10.5.0)
|
||||
rb-fsevent (0.9.6)
|
||||
rb-inotify (0.9.5)
|
||||
rb-fsevent (0.9.7)
|
||||
rb-inotify (0.9.7)
|
||||
ffi (>= 0.5.0)
|
||||
rbvmomi (1.8.2)
|
||||
builder
|
||||
|
|
@ -705,35 +710,35 @@ GEM
|
|||
redis-namespace (1.5.2)
|
||||
redis (~> 3.0, >= 3.0.4)
|
||||
remotipart (1.2.1)
|
||||
request_store (1.2.1)
|
||||
request_store (1.3.0)
|
||||
responders (2.1.1)
|
||||
railties (>= 4.2.0, < 5.1)
|
||||
roxml (3.1.6)
|
||||
activesupport (>= 2.3.0)
|
||||
nokogiri (>= 1.3.3)
|
||||
rspec (3.3.0)
|
||||
rspec-core (~> 3.3.0)
|
||||
rspec-expectations (~> 3.3.0)
|
||||
rspec-mocks (~> 3.3.0)
|
||||
rspec-core (3.3.2)
|
||||
rspec-support (~> 3.3.0)
|
||||
rspec-expectations (3.3.1)
|
||||
rspec (3.4.0)
|
||||
rspec-core (~> 3.4.0)
|
||||
rspec-expectations (~> 3.4.0)
|
||||
rspec-mocks (~> 3.4.0)
|
||||
rspec-core (3.4.2)
|
||||
rspec-support (~> 3.4.0)
|
||||
rspec-expectations (3.4.0)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.3.0)
|
||||
rspec-support (~> 3.4.0)
|
||||
rspec-instafail (0.4.0)
|
||||
rspec
|
||||
rspec-mocks (3.3.2)
|
||||
rspec-mocks (3.4.1)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.3.0)
|
||||
rspec-rails (3.3.3)
|
||||
rspec-support (~> 3.4.0)
|
||||
rspec-rails (3.4.2)
|
||||
actionpack (>= 3.0, < 4.3)
|
||||
activesupport (>= 3.0, < 4.3)
|
||||
railties (>= 3.0, < 4.3)
|
||||
rspec-core (~> 3.3.0)
|
||||
rspec-expectations (~> 3.3.0)
|
||||
rspec-mocks (~> 3.3.0)
|
||||
rspec-support (~> 3.3.0)
|
||||
rspec-support (3.3.0)
|
||||
rspec-core (~> 3.4.0)
|
||||
rspec-expectations (~> 3.4.0)
|
||||
rspec-mocks (~> 3.4.0)
|
||||
rspec-support (~> 3.4.0)
|
||||
rspec-support (3.4.1)
|
||||
rubocop (0.35.1)
|
||||
astrolabe (~> 1.3)
|
||||
parser (>= 2.2.3.0, < 3.0)
|
||||
|
|
@ -747,7 +752,7 @@ GEM
|
|||
rufus-scheduler (3.2.0)
|
||||
rugged (0.23.3)
|
||||
safe_yaml (1.0.4)
|
||||
sass (3.4.20)
|
||||
sass (3.4.21)
|
||||
sass-rails (5.0.4)
|
||||
railties (>= 4.0.0, < 5.0)
|
||||
sass (~> 3.1)
|
||||
|
|
@ -767,7 +772,7 @@ GEM
|
|||
rubyzip (~> 1.0)
|
||||
websocket (~> 1.0)
|
||||
shellany (0.0.1)
|
||||
shoulda-matchers (3.0.1)
|
||||
shoulda-matchers (3.1.1)
|
||||
activesupport (>= 4.0.0)
|
||||
sidekiq (4.1.0)
|
||||
concurrent-ruby (~> 1.0)
|
||||
|
|
@ -781,7 +786,7 @@ GEM
|
|||
simple_captcha2 (0.4.0)
|
||||
rails (>= 4.1)
|
||||
simple_oauth (0.3.1)
|
||||
simplecov (0.11.1)
|
||||
simplecov (0.11.2)
|
||||
docile (~> 1.1.0)
|
||||
json (~> 1.8)
|
||||
simplecov-html (~> 0.10.0)
|
||||
|
|
@ -793,7 +798,7 @@ GEM
|
|||
sinon-rails (1.15.0)
|
||||
railties (>= 3.1)
|
||||
slop (3.6.0)
|
||||
spring (1.6.1)
|
||||
spring (1.6.3)
|
||||
spring-commands-cucumber (1.0.1)
|
||||
spring (>= 0.9.1)
|
||||
spring-commands-rspec (1.0.4)
|
||||
|
|
@ -827,18 +832,18 @@ GEM
|
|||
hitimes
|
||||
tins (1.6.0)
|
||||
trollop (2.1.2)
|
||||
twitter (5.15.0)
|
||||
twitter (5.16.0)
|
||||
addressable (~> 2.3)
|
||||
buftok (~> 0.2.0)
|
||||
equalizer (= 0.0.10)
|
||||
faraday (~> 0.9.0)
|
||||
http (>= 0.4, < 0.10)
|
||||
http (~> 1.0)
|
||||
http_parser.rb (~> 0.6.0)
|
||||
json (~> 1.8)
|
||||
memoizable (~> 0.4.0)
|
||||
naught (~> 1.0)
|
||||
simple_oauth (~> 0.3.0)
|
||||
twitter-text (1.13.0)
|
||||
twitter-text (1.13.3)
|
||||
unf (~> 0.1.0)
|
||||
typhoeus (0.8.0)
|
||||
ethon (>= 0.8.0)
|
||||
|
|
@ -849,7 +854,7 @@ GEM
|
|||
json (>= 1.8.0)
|
||||
unf (0.1.4)
|
||||
unf_ext
|
||||
unf_ext (0.0.7.1)
|
||||
unf_ext (0.0.7.2)
|
||||
unicorn (5.0.1)
|
||||
kgio (~> 2.6)
|
||||
rack
|
||||
|
|
@ -874,7 +879,7 @@ GEM
|
|||
activesupport
|
||||
httpclient (>= 2.4)
|
||||
multi_json
|
||||
webmock (1.22.3)
|
||||
webmock (1.22.6)
|
||||
addressable (>= 2.3.6)
|
||||
crack (>= 0.3.2)
|
||||
hashdiff
|
||||
|
|
@ -889,8 +894,8 @@ PLATFORMS
|
|||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
active_model_serializers (= 0.9.3)
|
||||
activerecord-import (= 0.10.0)
|
||||
active_model_serializers (= 0.9.4)
|
||||
activerecord-import (= 0.11.0)
|
||||
acts-as-taggable-on (= 3.5.0)
|
||||
acts_as_api (= 0.4.2)
|
||||
addressable (= 2.3.8)
|
||||
|
|
@ -899,14 +904,14 @@ DEPENDENCIES
|
|||
backbone-on-rails (= 1.2.0.0)
|
||||
bootstrap-sass (= 3.3.6)
|
||||
bootstrap-switch-rails (= 3.3.3)
|
||||
capybara (= 2.5.0)
|
||||
capybara (= 2.6.2)
|
||||
carrierwave (= 0.10.0)
|
||||
compass-rails (= 2.0.5)
|
||||
configurate (= 0.3.1)
|
||||
cucumber-api-steps (= 0.13)
|
||||
cucumber-rails (= 1.4.2)
|
||||
cucumber-rails (= 1.4.3)
|
||||
database_cleaner (= 1.5.1)
|
||||
devise (= 3.5.5)
|
||||
devise (= 3.5.6)
|
||||
devise-token_authenticatable (~> 0.4.0)
|
||||
devise_lastseenable (= 0.0.6)
|
||||
diaspora-vines (~> 0.2.0.develop)
|
||||
|
|
@ -914,7 +919,7 @@ DEPENDENCIES
|
|||
diaspora_federation-test (= 0.0.12)
|
||||
entypo-rails (= 3.0.0.pre.rc2)
|
||||
eye (= 0.8)
|
||||
factory_girl_rails (= 4.5.0)
|
||||
factory_girl_rails (= 4.6.0)
|
||||
faraday (= 0.9.2)
|
||||
faraday-cookie_jar (= 0.0.6)
|
||||
faraday_middleware (= 0.10.0)
|
||||
|
|
@ -940,16 +945,16 @@ DEPENDENCIES
|
|||
js_image_paths (= 0.0.2)
|
||||
jshintrb (= 0.3.0)
|
||||
json (= 1.8.3)
|
||||
json-schema (= 2.5.2)
|
||||
json-schema (= 2.6.0)
|
||||
json_spec (= 1.1.4)
|
||||
leaflet-rails (= 0.7.4)
|
||||
logging-rails (= 0.5.0)
|
||||
markerb (= 1.1.0)
|
||||
messagebus_ruby_api (= 1.0.3)
|
||||
mini_magick (= 4.3.6)
|
||||
mini_magick (= 4.4.0)
|
||||
minitest
|
||||
mobile-fu (= 1.3.1)
|
||||
mysql2 (= 0.3.20)
|
||||
mysql2 (= 0.4.2)
|
||||
nokogiri (= 1.6.7.2)
|
||||
omniauth (= 1.3.1)
|
||||
omniauth-facebook (= 3.0.0)
|
||||
|
|
@ -997,39 +1002,39 @@ DEPENDENCIES
|
|||
rails-i18n (= 4.0.8)
|
||||
rails-timeago (= 2.11.0)
|
||||
rails_admin (= 0.8.1)
|
||||
rb-fsevent (= 0.9.6)
|
||||
rb-inotify (= 0.9.5)
|
||||
rb-fsevent (= 0.9.7)
|
||||
rb-inotify (= 0.9.7)
|
||||
redcarpet (= 3.3.4)
|
||||
remotipart (= 1.2.1)
|
||||
responders (= 2.1.1)
|
||||
roxml (= 3.1.6)
|
||||
rspec-instafail (= 0.4.0)
|
||||
rspec-rails (= 3.3.3)
|
||||
rspec-rails (= 3.4.2)
|
||||
rubocop (= 0.35.1)
|
||||
ruby-oembed (= 0.9.0)
|
||||
rubyzip (= 1.1.7)
|
||||
sass-rails (= 5.0.4)
|
||||
selenium-webdriver (= 2.47.1)
|
||||
shoulda-matchers (= 3.0.1)
|
||||
shoulda-matchers (= 3.1.1)
|
||||
sidekiq (= 4.1.0)
|
||||
sidekiq-cron (= 0.4.2)
|
||||
simple_captcha2 (= 0.4.0)
|
||||
simplecov (= 0.11.1)
|
||||
simplecov (= 0.11.2)
|
||||
sinatra (= 1.4.7)
|
||||
sinon-rails (= 1.15.0)
|
||||
spring (= 1.6.1)
|
||||
spring (= 1.6.3)
|
||||
spring-commands-cucumber (= 1.0.1)
|
||||
spring-commands-rspec (= 1.0.4)
|
||||
test_after_commit (= 0.4.2)
|
||||
timecop (= 0.8.0)
|
||||
twitter (= 5.15.0)
|
||||
twitter-text (= 1.13.0)
|
||||
twitter (= 5.16.0)
|
||||
twitter-text (= 1.13.3)
|
||||
typhoeus (= 0.8.0)
|
||||
uglifier (= 2.7.2)
|
||||
unicorn (= 5.0.1)
|
||||
uuid (= 2.3.8)
|
||||
versionist (= 1.4.1)
|
||||
webmock (= 1.22.3)
|
||||
webmock (= 1.22.6)
|
||||
will_paginate (= 3.1.0)
|
||||
|
||||
BUNDLED WITH
|
||||
|
|
|
|||
Loading…
Reference in a new issue