Merge branch 'stable' into develop
This commit is contained in:
Dennis Schubert
commit
caf565681c
2 changed files with 105 additions and 105 deletions
50
Gemfile
50
Gemfile
|
|
@ -18,13 +18,13 @@ gem "unicorn", "4.9.0", require: false
|
||||||
# API and JSON
|
# API and JSON
|
||||||
|
|
||||||
gem "acts_as_api", "0.4.2"
|
gem "acts_as_api", "0.4.2"
|
||||||
gem "json", "1.8.2"
|
gem "json", "1.8.3"
|
||||||
|
|
||||||
# Authentication
|
# Authentication
|
||||||
|
|
||||||
gem "devise", "3.4.1"
|
gem "devise", "3.5.1"
|
||||||
gem "devise_lastseenable", "0.0.4"
|
gem "devise_lastseenable", "0.0.4"
|
||||||
gem "devise-token_authenticatable", "~> 0.3.0"
|
gem "devise-token_authenticatable", "~> 0.4.0"
|
||||||
|
|
||||||
# Captcha
|
# Captcha
|
||||||
|
|
||||||
|
|
@ -32,7 +32,7 @@ gem "simple_captcha2", "0.3.4", require: "simple_captcha"
|
||||||
|
|
||||||
# Background processing
|
# Background processing
|
||||||
|
|
||||||
gem "sidekiq", "3.3.4"
|
gem "sidekiq", "3.4.1"
|
||||||
gem "sinatra", "1.4.6"
|
gem "sinatra", "1.4.6"
|
||||||
|
|
||||||
# Scheduled processing
|
# Scheduled processing
|
||||||
|
|
@ -56,7 +56,7 @@ gem "rack-cors", "0.4.0", require: "rack/cors"
|
||||||
gem "bootstrap-sass", "3.3.4.1"
|
gem "bootstrap-sass", "3.3.4.1"
|
||||||
gem "compass-rails", "2.0.4"
|
gem "compass-rails", "2.0.4"
|
||||||
gem "sass-rails", "5.0.1"
|
gem "sass-rails", "5.0.1"
|
||||||
gem "autoprefixer-rails", "5.1.11"
|
gem "autoprefixer-rails", "5.2.1"
|
||||||
|
|
||||||
# Database
|
# Database
|
||||||
|
|
||||||
|
|
@ -67,17 +67,17 @@ group :postgresql, optional: true do
|
||||||
gem "pg", "0.18.1"
|
gem "pg", "0.18.1"
|
||||||
end
|
end
|
||||||
|
|
||||||
gem "activerecord-import", "0.7.0"
|
gem "activerecord-import", "0.8.0"
|
||||||
|
|
||||||
# File uploading
|
# File uploading
|
||||||
|
|
||||||
gem "carrierwave", "0.10.0"
|
gem "carrierwave", "0.10.0"
|
||||||
gem "fog", "1.30.0"
|
gem "fog", "1.31.0"
|
||||||
gem "mini_magick", "4.2.3"
|
gem "mini_magick", "4.2.7"
|
||||||
gem "remotipart", "1.2.1"
|
gem "remotipart", "1.2.1"
|
||||||
|
|
||||||
# GUID generation
|
# GUID generation
|
||||||
gem "uuid", "2.3.7"
|
gem "uuid", "2.3.8"
|
||||||
|
|
||||||
# Icons
|
# Icons
|
||||||
|
|
||||||
|
|
@ -85,12 +85,12 @@ gem "entypo-rails", "2.2.3"
|
||||||
|
|
||||||
# JavaScript
|
# JavaScript
|
||||||
|
|
||||||
gem "backbone-on-rails", "1.1.2.1"
|
gem "backbone-on-rails", "1.1.2.1"
|
||||||
gem "handlebars_assets", "0.20.1"
|
gem "handlebars_assets", "0.20.2"
|
||||||
gem "jquery-rails", "4.0.4"
|
gem "jquery-rails", "4.0.4"
|
||||||
gem "jquery-ui-rails", "5.0.3"
|
gem "jquery-ui-rails", "5.0.5"
|
||||||
gem "js_image_paths", "0.0.2"
|
gem "js_image_paths", "0.0.2"
|
||||||
gem "js-routes", "1.0.1"
|
gem "js-routes", "1.0.1"
|
||||||
|
|
||||||
source "https://rails-assets.org" do
|
source "https://rails-assets.org" do
|
||||||
gem "rails-assets-jquery", "1.11.2" # Should be kept in sync with jquery-rails
|
gem "rails-assets-jquery", "1.11.2" # Should be kept in sync with jquery-rails
|
||||||
|
|
@ -129,7 +129,7 @@ gem "messagebus_ruby_api", "1.0.3"
|
||||||
# Parsing
|
# Parsing
|
||||||
|
|
||||||
gem "nokogiri", "1.6.6.2"
|
gem "nokogiri", "1.6.6.2"
|
||||||
gem "redcarpet", "3.2.3"
|
gem "redcarpet", "3.3.1"
|
||||||
gem "twitter-text", "1.12.0"
|
gem "twitter-text", "1.12.0"
|
||||||
gem "roxml", "3.1.6"
|
gem "roxml", "3.1.6"
|
||||||
gem "ruby-oembed", "0.8.14"
|
gem "ruby-oembed", "0.8.14"
|
||||||
|
|
@ -162,7 +162,7 @@ gem "addressable", "2.3.8", require: "addressable/uri"
|
||||||
gem "faraday", "0.9.1"
|
gem "faraday", "0.9.1"
|
||||||
gem "faraday_middleware", "0.9.1"
|
gem "faraday_middleware", "0.9.1"
|
||||||
gem "faraday-cookie_jar", "0.0.6"
|
gem "faraday-cookie_jar", "0.0.6"
|
||||||
gem "typhoeus", "0.7.1"
|
gem "typhoeus", "0.7.2"
|
||||||
|
|
||||||
# Views
|
# Views
|
||||||
|
|
||||||
|
|
@ -197,7 +197,7 @@ gem "minitest"
|
||||||
group :production do # we don"t install these on travis to speed up test runs
|
group :production do # we don"t install these on travis to speed up test runs
|
||||||
# Administration
|
# Administration
|
||||||
|
|
||||||
gem "rails_admin", "0.6.7"
|
gem "rails_admin", "0.6.8"
|
||||||
|
|
||||||
# Analytics
|
# Analytics
|
||||||
|
|
||||||
|
|
@ -226,19 +226,19 @@ group :development do
|
||||||
# Automatic test runs
|
# Automatic test runs
|
||||||
gem "guard-cucumber", "1.5.4"
|
gem "guard-cucumber", "1.5.4"
|
||||||
gem "guard-jshintrb", "1.1.1"
|
gem "guard-jshintrb", "1.1.1"
|
||||||
gem "guard-rspec", "4.5.0"
|
gem "guard-rspec", "4.5.2"
|
||||||
gem "guard-rubocop", "1.2.0"
|
gem "guard-rubocop", "1.2.0"
|
||||||
gem "guard", "2.12.5", require: false
|
gem "guard", "2.12.5", require: false
|
||||||
gem "rb-fsevent", "0.9.4", require: false
|
gem "rb-fsevent", "0.9.5", require: false
|
||||||
gem "rb-inotify", "0.9.5", require: false
|
gem "rb-inotify", "0.9.5", require: false
|
||||||
|
|
||||||
# Linters
|
# Linters
|
||||||
gem "jshintrb", "0.3.0"
|
gem "jshintrb", "0.3.0"
|
||||||
gem "rubocop", "0.31.0"
|
gem "rubocop", "0.32.0"
|
||||||
|
|
||||||
# Preloading environment
|
# Preloading environment
|
||||||
|
|
||||||
gem "spring", "1.3.5"
|
gem "spring", "1.3.6"
|
||||||
gem "spring-commands-rspec", "1.0.4"
|
gem "spring-commands-rspec", "1.0.4"
|
||||||
gem "spring-commands-cucumber", "1.0.1"
|
gem "spring-commands-cucumber", "1.0.1"
|
||||||
|
|
||||||
|
|
@ -273,14 +273,14 @@ group :test do
|
||||||
# General helpers
|
# General helpers
|
||||||
|
|
||||||
gem "factory_girl_rails", "4.5.0"
|
gem "factory_girl_rails", "4.5.0"
|
||||||
gem "timecop", "0.7.3"
|
gem "timecop", "0.7.4"
|
||||||
gem "webmock", "1.21.0", require: false
|
gem "webmock", "1.21.0", require: false
|
||||||
gem "shoulda-matchers", "2.8.0", require: false
|
gem "shoulda-matchers", "2.8.0", require: false
|
||||||
end
|
end
|
||||||
|
|
||||||
group :development, :test do
|
group :development, :test do
|
||||||
# RSpec (unit tests, some integration tests)
|
# RSpec (unit tests, some integration tests)
|
||||||
gem "rspec-rails", "3.2.1"
|
gem "rspec-rails", "3.3.2"
|
||||||
|
|
||||||
# Cucumber (integration tests)
|
# Cucumber (integration tests)
|
||||||
gem "cucumber-rails", "1.4.2", require: false
|
gem "cucumber-rails", "1.4.2", require: false
|
||||||
|
|
@ -289,7 +289,7 @@ group :development, :test do
|
||||||
gem "jasmine", "2.3.0"
|
gem "jasmine", "2.3.0"
|
||||||
gem "jasmine-jquery-rails", "2.0.3"
|
gem "jasmine-jquery-rails", "2.0.3"
|
||||||
gem "rails-assets-jasmine-ajax", "3.1.1", source: "https://rails-assets.org"
|
gem "rails-assets-jasmine-ajax", "3.1.1", source: "https://rails-assets.org"
|
||||||
gem "sinon-rails", "1.10.3"
|
gem "sinon-rails", "1.15.0"
|
||||||
|
|
||||||
# silence assets
|
# silence assets
|
||||||
gem "quiet_assets", "1.1.0"
|
gem "quiet_assets", "1.1.0"
|
||||||
|
|
|
||||||
160
Gemfile.lock
160
Gemfile.lock
|
|
@ -38,7 +38,7 @@ GEM
|
||||||
activemodel (= 4.2.2)
|
activemodel (= 4.2.2)
|
||||||
activesupport (= 4.2.2)
|
activesupport (= 4.2.2)
|
||||||
arel (~> 6.0)
|
arel (~> 6.0)
|
||||||
activerecord-import (0.7.0)
|
activerecord-import (0.8.0)
|
||||||
activerecord (>= 3.0)
|
activerecord (>= 3.0)
|
||||||
activesupport (4.2.2)
|
activesupport (4.2.2)
|
||||||
i18n (~> 0.7)
|
i18n (~> 0.7)
|
||||||
|
|
@ -61,7 +61,7 @@ GEM
|
||||||
ast (2.0.0)
|
ast (2.0.0)
|
||||||
astrolabe (1.3.0)
|
astrolabe (1.3.0)
|
||||||
parser (>= 2.2.0.pre.3, < 3.0)
|
parser (>= 2.2.0.pre.3, < 3.0)
|
||||||
autoprefixer-rails (5.1.11)
|
autoprefixer-rails (5.2.1)
|
||||||
execjs
|
execjs
|
||||||
json
|
json
|
||||||
backbone-on-rails (1.1.2.1)
|
backbone-on-rails (1.1.2.1)
|
||||||
|
|
@ -125,7 +125,7 @@ GEM
|
||||||
connection_pool (2.2.0)
|
connection_pool (2.2.0)
|
||||||
crack (0.4.2)
|
crack (0.4.2)
|
||||||
safe_yaml (~> 1.0.0)
|
safe_yaml (~> 1.0.0)
|
||||||
cucumber (1.3.19)
|
cucumber (1.3.20)
|
||||||
builder (>= 2.1.2)
|
builder (>= 2.1.2)
|
||||||
diff-lcs (>= 1.1.3)
|
diff-lcs (>= 1.1.3)
|
||||||
gherkin (~> 2.12)
|
gherkin (~> 2.12)
|
||||||
|
|
@ -138,15 +138,15 @@ GEM
|
||||||
nokogiri (~> 1.5)
|
nokogiri (~> 1.5)
|
||||||
rails (>= 3, < 5)
|
rails (>= 3, < 5)
|
||||||
database_cleaner (1.4.1)
|
database_cleaner (1.4.1)
|
||||||
devise (3.4.1)
|
devise (3.5.1)
|
||||||
bcrypt (~> 3.0)
|
bcrypt (~> 3.0)
|
||||||
orm_adapter (~> 0.1)
|
orm_adapter (~> 0.1)
|
||||||
railties (>= 3.2.6, < 5)
|
railties (>= 3.2.6, < 5)
|
||||||
responders
|
responders
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
warden (~> 1.2.3)
|
warden (~> 1.2.3)
|
||||||
devise-token_authenticatable (0.3.0)
|
devise-token_authenticatable (0.4.0)
|
||||||
devise (~> 3.4.0)
|
devise (~> 3.5.0)
|
||||||
devise_lastseenable (0.0.4)
|
devise_lastseenable (0.0.4)
|
||||||
devise
|
devise
|
||||||
rails (>= 3.0.4)
|
rails (>= 3.0.4)
|
||||||
|
|
@ -175,7 +175,7 @@ GEM
|
||||||
railties (>= 3.1, <= 5)
|
railties (>= 3.1, <= 5)
|
||||||
equalizer (0.0.11)
|
equalizer (0.0.11)
|
||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
ethon (0.7.3)
|
ethon (0.7.4)
|
||||||
ffi (>= 1.3.0)
|
ffi (>= 1.3.0)
|
||||||
eventmachine (1.0.7)
|
eventmachine (1.0.7)
|
||||||
excon (0.45.3)
|
excon (0.45.3)
|
||||||
|
|
@ -204,11 +204,11 @@ GEM
|
||||||
fixture_builder (0.4.1)
|
fixture_builder (0.4.1)
|
||||||
activerecord (>= 2)
|
activerecord (>= 2)
|
||||||
activesupport (>= 2)
|
activesupport (>= 2)
|
||||||
fog (1.30.0)
|
fog (1.31.0)
|
||||||
fog-atmos
|
fog-atmos
|
||||||
fog-aws (~> 0.0)
|
fog-aws (~> 0.0)
|
||||||
fog-brightbox (~> 0.4)
|
fog-brightbox (~> 0.4)
|
||||||
fog-core (~> 1.27, >= 1.27.4)
|
fog-core (~> 1.30)
|
||||||
fog-ecloud
|
fog-ecloud
|
||||||
fog-google (>= 0.0.2)
|
fog-google (>= 0.0.2)
|
||||||
fog-json
|
fog-json
|
||||||
|
|
@ -230,7 +230,7 @@ GEM
|
||||||
fog-atmos (0.1.0)
|
fog-atmos (0.1.0)
|
||||||
fog-core
|
fog-core
|
||||||
fog-xml
|
fog-xml
|
||||||
fog-aws (0.1.2)
|
fog-aws (0.5.0)
|
||||||
fog-core (~> 1.27)
|
fog-core (~> 1.27)
|
||||||
fog-json (~> 1.0)
|
fog-json (~> 1.0)
|
||||||
fog-xml (~> 0.1)
|
fog-xml (~> 0.1)
|
||||||
|
|
@ -239,30 +239,30 @@ GEM
|
||||||
fog-core (~> 1.22)
|
fog-core (~> 1.22)
|
||||||
fog-json
|
fog-json
|
||||||
inflecto (~> 0.0.2)
|
inflecto (~> 0.0.2)
|
||||||
fog-core (1.30.0)
|
fog-core (1.31.1)
|
||||||
builder
|
builder
|
||||||
excon (~> 0.45)
|
excon (~> 0.45)
|
||||||
formatador (~> 0.2)
|
formatador (~> 0.2)
|
||||||
mime-types
|
mime-types
|
||||||
net-scp (~> 1.1)
|
net-scp (~> 1.1)
|
||||||
net-ssh (>= 2.1.3)
|
net-ssh (>= 2.1.3)
|
||||||
fog-ecloud (0.1.1)
|
fog-ecloud (0.1.3)
|
||||||
fog-core
|
fog-core
|
||||||
fog-xml
|
fog-xml
|
||||||
fog-google (0.0.5)
|
fog-google (0.0.5)
|
||||||
fog-core
|
fog-core
|
||||||
fog-json
|
fog-json
|
||||||
fog-xml
|
fog-xml
|
||||||
fog-json (1.0.1)
|
fog-json (1.0.2)
|
||||||
fog-core (~> 1.0)
|
fog-core (~> 1.0)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.10)
|
||||||
fog-local (0.2.1)
|
fog-local (0.2.1)
|
||||||
fog-core (~> 1.27)
|
fog-core (~> 1.27)
|
||||||
fog-powerdns (0.1.1)
|
fog-powerdns (0.1.1)
|
||||||
fog-core (~> 1.27)
|
fog-core (~> 1.27)
|
||||||
fog-json (~> 1.0)
|
fog-json (~> 1.0)
|
||||||
fog-xml (~> 0.1)
|
fog-xml (~> 0.1)
|
||||||
fog-profitbricks (0.0.2)
|
fog-profitbricks (0.0.3)
|
||||||
fog-core
|
fog-core
|
||||||
fog-xml
|
fog-xml
|
||||||
nokogiri
|
nokogiri
|
||||||
|
|
@ -280,7 +280,7 @@ GEM
|
||||||
fog-serverlove (0.1.2)
|
fog-serverlove (0.1.2)
|
||||||
fog-core
|
fog-core
|
||||||
fog-json
|
fog-json
|
||||||
fog-softlayer (0.4.5)
|
fog-softlayer (0.4.6)
|
||||||
fog-core
|
fog-core
|
||||||
fog-json
|
fog-json
|
||||||
fog-storm_on_demand (0.1.1)
|
fog-storm_on_demand (0.1.1)
|
||||||
|
|
@ -330,7 +330,7 @@ GEM
|
||||||
guard-jshintrb (1.1.1)
|
guard-jshintrb (1.1.1)
|
||||||
guard (~> 2.0)
|
guard (~> 2.0)
|
||||||
jshintrb
|
jshintrb
|
||||||
guard-rspec (4.5.0)
|
guard-rspec (4.5.2)
|
||||||
guard (~> 2.1)
|
guard (~> 2.1)
|
||||||
guard-compat (~> 1.1)
|
guard-compat (~> 1.1)
|
||||||
rspec (>= 2.99.0, < 4.0)
|
rspec (>= 2.99.0, < 4.0)
|
||||||
|
|
@ -339,12 +339,12 @@ GEM
|
||||||
rubocop (~> 0.20)
|
rubocop (~> 0.20)
|
||||||
haml (4.0.6)
|
haml (4.0.6)
|
||||||
tilt
|
tilt
|
||||||
handlebars_assets (0.20.1)
|
handlebars_assets (0.20.2)
|
||||||
execjs (~> 2.0)
|
execjs (~> 2.0)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
sprockets (~> 2.0)
|
sprockets (>= 2.0.0, < 4.0)
|
||||||
tilt (~> 1.2)
|
tilt (~> 1.2)
|
||||||
hashie (3.4.1)
|
hashie (3.4.2)
|
||||||
hike (1.2.3)
|
hike (1.2.3)
|
||||||
hiredis (0.5.2)
|
hiredis (0.5.2)
|
||||||
hitimes (1.2.2)
|
hitimes (1.2.2)
|
||||||
|
|
@ -369,13 +369,13 @@ GEM
|
||||||
phantomjs
|
phantomjs
|
||||||
rack (>= 1.2.1)
|
rack (>= 1.2.1)
|
||||||
rake
|
rake
|
||||||
jasmine-core (2.3.0)
|
jasmine-core (2.3.4)
|
||||||
jasmine-jquery-rails (2.0.3)
|
jasmine-jquery-rails (2.0.3)
|
||||||
jquery-rails (4.0.4)
|
jquery-rails (4.0.4)
|
||||||
rails-dom-testing (~> 1.0)
|
rails-dom-testing (~> 1.0)
|
||||||
railties (>= 4.2.0)
|
railties (>= 4.2.0)
|
||||||
thor (>= 0.14, < 2.0)
|
thor (>= 0.14, < 2.0)
|
||||||
jquery-ui-rails (5.0.3)
|
jquery-ui-rails (5.0.5)
|
||||||
railties (>= 3.2.16)
|
railties (>= 3.2.16)
|
||||||
js-routes (1.0.1)
|
js-routes (1.0.1)
|
||||||
railties (>= 3.2)
|
railties (>= 3.2)
|
||||||
|
|
@ -386,13 +386,13 @@ GEM
|
||||||
execjs
|
execjs
|
||||||
multi_json (>= 1.3)
|
multi_json (>= 1.3)
|
||||||
rake
|
rake
|
||||||
json (1.8.2)
|
json (1.8.3)
|
||||||
jwt (1.4.1)
|
jwt (1.5.0)
|
||||||
kaminari (0.16.3)
|
kaminari (0.16.3)
|
||||||
actionpack (>= 3.0.0)
|
actionpack (>= 3.0.0)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
kgio (2.9.3)
|
kgio (2.9.3)
|
||||||
listen (2.10.0)
|
listen (2.10.1)
|
||||||
celluloid (~> 0.16.0)
|
celluloid (~> 0.16.0)
|
||||||
rb-fsevent (>= 0.9.3)
|
rb-fsevent (>= 0.9.3)
|
||||||
rb-inotify (>= 0.9)
|
rb-inotify (>= 0.9)
|
||||||
|
|
@ -416,7 +416,7 @@ GEM
|
||||||
messagebus_ruby_api (1.0.3)
|
messagebus_ruby_api (1.0.3)
|
||||||
method_source (0.8.2)
|
method_source (0.8.2)
|
||||||
mime-types (2.6.1)
|
mime-types (2.6.1)
|
||||||
mini_magick (4.2.3)
|
mini_magick (4.2.7)
|
||||||
mini_portile (0.6.2)
|
mini_portile (0.6.2)
|
||||||
minitest (5.7.0)
|
minitest (5.7.0)
|
||||||
mobile-fu (1.3.1)
|
mobile-fu (1.3.1)
|
||||||
|
|
@ -468,7 +468,7 @@ GEM
|
||||||
faraday (~> 0.9.0)
|
faraday (~> 0.9.0)
|
||||||
nokogiri (~> 1.6)
|
nokogiri (~> 1.6)
|
||||||
orm_adapter (0.5.0)
|
orm_adapter (0.5.0)
|
||||||
parser (2.2.2.2)
|
parser (2.2.2.5)
|
||||||
ast (>= 1.1, < 3.0)
|
ast (>= 1.1, < 3.0)
|
||||||
pg (0.18.1)
|
pg (0.18.1)
|
||||||
phantomjs (1.9.8.0)
|
phantomjs (1.9.8.0)
|
||||||
|
|
@ -484,7 +484,7 @@ GEM
|
||||||
pry
|
pry
|
||||||
quiet_assets (1.1.0)
|
quiet_assets (1.1.0)
|
||||||
railties (>= 3.1, < 5.0)
|
railties (>= 3.1, < 5.0)
|
||||||
rack (1.6.2)
|
rack (1.6.4)
|
||||||
rack-cors (0.4.0)
|
rack-cors (0.4.0)
|
||||||
rack-google-analytics (1.2.0)
|
rack-google-analytics (1.2.0)
|
||||||
actionpack
|
actionpack
|
||||||
|
|
@ -523,7 +523,7 @@ GEM
|
||||||
rails-assets-highlightjs (8.5.0)
|
rails-assets-highlightjs (8.5.0)
|
||||||
rails-assets-jakobmattsson--jquery-elastic (1.6.11)
|
rails-assets-jakobmattsson--jquery-elastic (1.6.11)
|
||||||
rails-assets-jquery (>= 1.2.6)
|
rails-assets-jquery (>= 1.2.6)
|
||||||
rails-assets-jasmine (2.3.1)
|
rails-assets-jasmine (2.3.4)
|
||||||
rails-assets-jasmine-ajax (3.1.1)
|
rails-assets-jasmine-ajax (3.1.1)
|
||||||
rails-assets-jasmine (~> 2)
|
rails-assets-jasmine (~> 2)
|
||||||
rails-assets-jeresig--jquery.hotkeys (0.2.0)
|
rails-assets-jeresig--jquery.hotkeys (0.2.0)
|
||||||
|
|
@ -542,7 +542,7 @@ GEM
|
||||||
rails-assets-jquery
|
rails-assets-jquery
|
||||||
rails-assets-jquery-ui (1.10.4)
|
rails-assets-jquery-ui (1.10.4)
|
||||||
rails-assets-jquery (>= 1.6)
|
rails-assets-jquery (>= 1.6)
|
||||||
rails-assets-jquery.slimscroll (1.3.3)
|
rails-assets-jquery.slimscroll (1.3.6)
|
||||||
rails-assets-jquery (>= 1.7)
|
rails-assets-jquery (>= 1.7)
|
||||||
rails-assets-markdown-it--markdown-it-for-inline (0.1.1)
|
rails-assets-markdown-it--markdown-it-for-inline (0.1.1)
|
||||||
rails-assets-markdown-it (4.2.2)
|
rails-assets-markdown-it (4.2.2)
|
||||||
|
|
@ -566,7 +566,7 @@ GEM
|
||||||
rails-timeago (2.11.0)
|
rails-timeago (2.11.0)
|
||||||
actionpack (>= 3.1)
|
actionpack (>= 3.1)
|
||||||
activesupport (>= 3.1)
|
activesupport (>= 3.1)
|
||||||
rails_admin (0.6.7)
|
rails_admin (0.6.8)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
coffee-rails (~> 4.0)
|
coffee-rails (~> 4.0)
|
||||||
font-awesome-rails (>= 3.0, < 5)
|
font-awesome-rails (>= 3.0, < 5)
|
||||||
|
|
@ -588,10 +588,10 @@ GEM
|
||||||
rainbow (2.0.0)
|
rainbow (2.0.0)
|
||||||
raindrops (0.13.0)
|
raindrops (0.13.0)
|
||||||
rake (10.4.2)
|
rake (10.4.2)
|
||||||
rb-fsevent (0.9.4)
|
rb-fsevent (0.9.5)
|
||||||
rb-inotify (0.9.5)
|
rb-inotify (0.9.5)
|
||||||
ffi (>= 0.5.0)
|
ffi (>= 0.5.0)
|
||||||
redcarpet (3.2.3)
|
redcarpet (3.3.1)
|
||||||
redis (3.2.1)
|
redis (3.2.1)
|
||||||
redis-namespace (1.5.2)
|
redis-namespace (1.5.2)
|
||||||
redis (~> 3.0, >= 3.0.4)
|
redis (~> 3.0, >= 3.0.4)
|
||||||
|
|
@ -602,32 +602,32 @@ GEM
|
||||||
roxml (3.1.6)
|
roxml (3.1.6)
|
||||||
activesupport (>= 2.3.0)
|
activesupport (>= 2.3.0)
|
||||||
nokogiri (>= 1.3.3)
|
nokogiri (>= 1.3.3)
|
||||||
rspec (3.2.0)
|
rspec (3.3.0)
|
||||||
rspec-core (~> 3.2.0)
|
rspec-core (~> 3.3.0)
|
||||||
rspec-expectations (~> 3.2.0)
|
rspec-expectations (~> 3.3.0)
|
||||||
rspec-mocks (~> 3.2.0)
|
rspec-mocks (~> 3.3.0)
|
||||||
rspec-core (3.2.3)
|
rspec-core (3.3.1)
|
||||||
rspec-support (~> 3.2.0)
|
rspec-support (~> 3.3.0)
|
||||||
rspec-expectations (3.2.1)
|
rspec-expectations (3.3.0)
|
||||||
diff-lcs (>= 1.2.0, < 2.0)
|
diff-lcs (>= 1.2.0, < 2.0)
|
||||||
rspec-support (~> 3.2.0)
|
rspec-support (~> 3.3.0)
|
||||||
rspec-instafail (0.2.6)
|
rspec-instafail (0.2.6)
|
||||||
rspec
|
rspec
|
||||||
rspec-mocks (3.2.1)
|
rspec-mocks (3.3.1)
|
||||||
diff-lcs (>= 1.2.0, < 2.0)
|
diff-lcs (>= 1.2.0, < 2.0)
|
||||||
rspec-support (~> 3.2.0)
|
rspec-support (~> 3.3.0)
|
||||||
rspec-rails (3.2.1)
|
rspec-rails (3.3.2)
|
||||||
actionpack (>= 3.0, < 4.3)
|
actionpack (>= 3.0, < 4.3)
|
||||||
activesupport (>= 3.0, < 4.3)
|
activesupport (>= 3.0, < 4.3)
|
||||||
railties (>= 3.0, < 4.3)
|
railties (>= 3.0, < 4.3)
|
||||||
rspec-core (~> 3.2.0)
|
rspec-core (~> 3.3.0)
|
||||||
rspec-expectations (~> 3.2.0)
|
rspec-expectations (~> 3.3.0)
|
||||||
rspec-mocks (~> 3.2.0)
|
rspec-mocks (~> 3.3.0)
|
||||||
rspec-support (~> 3.2.0)
|
rspec-support (~> 3.3.0)
|
||||||
rspec-support (3.2.2)
|
rspec-support (3.3.0)
|
||||||
rubocop (0.31.0)
|
rubocop (0.32.0)
|
||||||
astrolabe (~> 1.3)
|
astrolabe (~> 1.3)
|
||||||
parser (>= 2.2.2.1, < 3.0)
|
parser (>= 2.2.2.5, < 3.0)
|
||||||
powerpack (~> 0.1)
|
powerpack (~> 0.1)
|
||||||
rainbow (>= 1.99.1, < 3.0)
|
rainbow (>= 1.99.1, < 3.0)
|
||||||
ruby-progressbar (~> 1.4)
|
ruby-progressbar (~> 1.4)
|
||||||
|
|
@ -650,8 +650,8 @@ GEM
|
||||||
shellany (0.0.1)
|
shellany (0.0.1)
|
||||||
shoulda-matchers (2.8.0)
|
shoulda-matchers (2.8.0)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
sidekiq (3.3.4)
|
sidekiq (3.4.1)
|
||||||
celluloid (>= 0.16.0)
|
celluloid (~> 0.16.0)
|
||||||
connection_pool (>= 2.1.1)
|
connection_pool (>= 2.1.1)
|
||||||
json
|
json
|
||||||
redis (>= 3.0.6)
|
redis (>= 3.0.6)
|
||||||
|
|
@ -673,10 +673,10 @@ GEM
|
||||||
rack (~> 1.4)
|
rack (~> 1.4)
|
||||||
rack-protection (~> 1.4)
|
rack-protection (~> 1.4)
|
||||||
tilt (>= 1.3, < 3)
|
tilt (>= 1.3, < 3)
|
||||||
sinon-rails (1.10.3)
|
sinon-rails (1.15.0)
|
||||||
railties (>= 3.1)
|
railties (>= 3.1)
|
||||||
slop (3.6.0)
|
slop (3.6.0)
|
||||||
spring (1.3.5)
|
spring (1.3.6)
|
||||||
spring-commands-cucumber (1.0.1)
|
spring-commands-cucumber (1.0.1)
|
||||||
spring (>= 0.9.1)
|
spring (>= 0.9.1)
|
||||||
spring-commands-rspec (1.0.4)
|
spring-commands-rspec (1.0.4)
|
||||||
|
|
@ -697,7 +697,7 @@ GEM
|
||||||
thor (0.19.1)
|
thor (0.19.1)
|
||||||
thread_safe (0.3.5)
|
thread_safe (0.3.5)
|
||||||
tilt (1.4.1)
|
tilt (1.4.1)
|
||||||
timecop (0.7.3)
|
timecop (0.7.4)
|
||||||
timers (4.0.1)
|
timers (4.0.1)
|
||||||
hitimes
|
hitimes
|
||||||
twitter (5.14.0)
|
twitter (5.14.0)
|
||||||
|
|
@ -713,8 +713,8 @@ GEM
|
||||||
simple_oauth (~> 0.3.0)
|
simple_oauth (~> 0.3.0)
|
||||||
twitter-text (1.12.0)
|
twitter-text (1.12.0)
|
||||||
unf (~> 0.1.0)
|
unf (~> 0.1.0)
|
||||||
typhoeus (0.7.1)
|
typhoeus (0.7.2)
|
||||||
ethon (>= 0.7.1)
|
ethon (>= 0.7.4)
|
||||||
tzinfo (1.2.2)
|
tzinfo (1.2.2)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
uglifier (2.7.1)
|
uglifier (2.7.1)
|
||||||
|
|
@ -727,7 +727,7 @@ GEM
|
||||||
kgio (~> 2.6)
|
kgio (~> 2.6)
|
||||||
rack
|
rack
|
||||||
raindrops (~> 0.7)
|
raindrops (~> 0.7)
|
||||||
uuid (2.3.7)
|
uuid (2.3.8)
|
||||||
macaddr (~> 1.0)
|
macaddr (~> 1.0)
|
||||||
warden (1.2.3)
|
warden (1.2.3)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
|
|
@ -746,12 +746,12 @@ DEPENDENCIES
|
||||||
actionpack-action_caching
|
actionpack-action_caching
|
||||||
actionpack-page_caching
|
actionpack-page_caching
|
||||||
active_model_serializers (= 0.9.3)
|
active_model_serializers (= 0.9.3)
|
||||||
activerecord-import (= 0.7.0)
|
activerecord-import (= 0.8.0)
|
||||||
acts-as-taggable-on (= 3.5.0)
|
acts-as-taggable-on (= 3.5.0)
|
||||||
acts_as_api (= 0.4.2)
|
acts_as_api (= 0.4.2)
|
||||||
addressable (= 2.3.8)
|
addressable (= 2.3.8)
|
||||||
asset_sync (= 1.1.0)
|
asset_sync (= 1.1.0)
|
||||||
autoprefixer-rails (= 5.1.11)
|
autoprefixer-rails (= 5.2.1)
|
||||||
backbone-on-rails (= 1.1.2.1)
|
backbone-on-rails (= 1.1.2.1)
|
||||||
bootstrap-sass (= 3.3.4.1)
|
bootstrap-sass (= 3.3.4.1)
|
||||||
capybara (= 2.4.4)
|
capybara (= 2.4.4)
|
||||||
|
|
@ -760,8 +760,8 @@ DEPENDENCIES
|
||||||
configurate (= 0.3.1)
|
configurate (= 0.3.1)
|
||||||
cucumber-rails (= 1.4.2)
|
cucumber-rails (= 1.4.2)
|
||||||
database_cleaner (= 1.4.1)
|
database_cleaner (= 1.4.1)
|
||||||
devise (= 3.4.1)
|
devise (= 3.5.1)
|
||||||
devise-token_authenticatable (~> 0.3.0)
|
devise-token_authenticatable (~> 0.4.0)
|
||||||
devise_lastseenable (= 0.0.4)
|
devise_lastseenable (= 0.0.4)
|
||||||
diaspora-vines (~> 0.1.27)
|
diaspora-vines (~> 0.1.27)
|
||||||
entypo-rails (= 2.2.3)
|
entypo-rails (= 2.2.3)
|
||||||
|
|
@ -771,30 +771,30 @@ DEPENDENCIES
|
||||||
faraday-cookie_jar (= 0.0.6)
|
faraday-cookie_jar (= 0.0.6)
|
||||||
faraday_middleware (= 0.9.1)
|
faraday_middleware (= 0.9.1)
|
||||||
fixture_builder (= 0.4.1)
|
fixture_builder (= 0.4.1)
|
||||||
fog (= 1.30.0)
|
fog (= 1.31.0)
|
||||||
fuubar (= 2.0.0)
|
fuubar (= 2.0.0)
|
||||||
gon (= 5.2.3)
|
gon (= 5.2.3)
|
||||||
guard (= 2.12.5)
|
guard (= 2.12.5)
|
||||||
guard-cucumber (= 1.5.4)
|
guard-cucumber (= 1.5.4)
|
||||||
guard-jshintrb (= 1.1.1)
|
guard-jshintrb (= 1.1.1)
|
||||||
guard-rspec (= 4.5.0)
|
guard-rspec (= 4.5.2)
|
||||||
guard-rubocop (= 1.2.0)
|
guard-rubocop (= 1.2.0)
|
||||||
haml (= 4.0.6)
|
haml (= 4.0.6)
|
||||||
handlebars_assets (= 0.20.1)
|
handlebars_assets (= 0.20.2)
|
||||||
http_accept_language (= 2.0.5)
|
http_accept_language (= 2.0.5)
|
||||||
i18n-inflector-rails (= 1.0.7)
|
i18n-inflector-rails (= 1.0.7)
|
||||||
jasmine (= 2.3.0)
|
jasmine (= 2.3.0)
|
||||||
jasmine-jquery-rails (= 2.0.3)
|
jasmine-jquery-rails (= 2.0.3)
|
||||||
jquery-rails (= 4.0.4)
|
jquery-rails (= 4.0.4)
|
||||||
jquery-ui-rails (= 5.0.3)
|
jquery-ui-rails (= 5.0.5)
|
||||||
js-routes (= 1.0.1)
|
js-routes (= 1.0.1)
|
||||||
js_image_paths (= 0.0.2)
|
js_image_paths (= 0.0.2)
|
||||||
jshintrb (= 0.3.0)
|
jshintrb (= 0.3.0)
|
||||||
json (= 1.8.2)
|
json (= 1.8.3)
|
||||||
logging-rails (= 0.5.0)
|
logging-rails (= 0.5.0)
|
||||||
markerb (= 1.0.2)
|
markerb (= 1.0.2)
|
||||||
messagebus_ruby_api (= 1.0.3)
|
messagebus_ruby_api (= 1.0.3)
|
||||||
mini_magick (= 4.2.3)
|
mini_magick (= 4.2.7)
|
||||||
minitest
|
minitest
|
||||||
mobile-fu (= 1.3.1)
|
mobile-fu (= 1.3.1)
|
||||||
mysql2 (= 0.3.18)
|
mysql2 (= 0.3.18)
|
||||||
|
|
@ -839,38 +839,38 @@ DEPENDENCIES
|
||||||
rails-assets-perfect-scrollbar (= 0.6.2)!
|
rails-assets-perfect-scrollbar (= 0.6.2)!
|
||||||
rails-i18n (= 4.0.4)
|
rails-i18n (= 4.0.4)
|
||||||
rails-timeago (= 2.11.0)
|
rails-timeago (= 2.11.0)
|
||||||
rails_admin (= 0.6.7)
|
rails_admin (= 0.6.8)
|
||||||
rb-fsevent (= 0.9.4)
|
rb-fsevent (= 0.9.5)
|
||||||
rb-inotify (= 0.9.5)
|
rb-inotify (= 0.9.5)
|
||||||
redcarpet (= 3.2.3)
|
redcarpet (= 3.3.1)
|
||||||
remotipart (= 1.2.1)
|
remotipart (= 1.2.1)
|
||||||
responders (= 2.1.0)
|
responders (= 2.1.0)
|
||||||
roxml (= 3.1.6)
|
roxml (= 3.1.6)
|
||||||
rspec-instafail (= 0.2.6)
|
rspec-instafail (= 0.2.6)
|
||||||
rspec-rails (= 3.2.1)
|
rspec-rails (= 3.3.2)
|
||||||
rubocop (= 0.31.0)
|
rubocop (= 0.32.0)
|
||||||
ruby-oembed (= 0.8.14)
|
ruby-oembed (= 0.8.14)
|
||||||
rubyzip (= 1.1.7)
|
rubyzip (= 1.1.7)
|
||||||
sass-rails (= 5.0.1)
|
sass-rails (= 5.0.1)
|
||||||
selenium-webdriver (= 2.45.0)
|
selenium-webdriver (= 2.45.0)
|
||||||
shoulda-matchers (= 2.8.0)
|
shoulda-matchers (= 2.8.0)
|
||||||
sidekiq (= 3.3.4)
|
sidekiq (= 3.4.1)
|
||||||
sidetiq (= 0.6.3)
|
sidetiq (= 0.6.3)
|
||||||
simple_captcha2 (= 0.3.4)
|
simple_captcha2 (= 0.3.4)
|
||||||
simplecov (= 0.10.0)
|
simplecov (= 0.10.0)
|
||||||
sinatra (= 1.4.6)
|
sinatra (= 1.4.6)
|
||||||
sinon-rails (= 1.10.3)
|
sinon-rails (= 1.15.0)
|
||||||
spring (= 1.3.5)
|
spring (= 1.3.6)
|
||||||
spring-commands-cucumber (= 1.0.1)
|
spring-commands-cucumber (= 1.0.1)
|
||||||
spring-commands-rspec (= 1.0.4)
|
spring-commands-rspec (= 1.0.4)
|
||||||
test_after_commit (= 0.4.1)
|
test_after_commit (= 0.4.1)
|
||||||
timecop (= 0.7.3)
|
timecop (= 0.7.4)
|
||||||
twitter (= 5.14.0)
|
twitter (= 5.14.0)
|
||||||
twitter-text (= 1.12.0)
|
twitter-text (= 1.12.0)
|
||||||
typhoeus (= 0.7.1)
|
typhoeus (= 0.7.2)
|
||||||
uglifier (= 2.7.1)
|
uglifier (= 2.7.1)
|
||||||
unicorn (= 4.9.0)
|
unicorn (= 4.9.0)
|
||||||
uuid (= 2.3.7)
|
uuid (= 2.3.8)
|
||||||
webmock (= 1.21.0)
|
webmock (= 1.21.0)
|
||||||
will_paginate (= 3.0.7)
|
will_paginate (= 3.0.7)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue