Merge branch 'stable' into develop
This commit is contained in:
Dennis Schubert
commit
9dca1785c2
8 changed files with 157 additions and 139 deletions
48
Gemfile
48
Gemfile
|
|
@ -4,11 +4,11 @@ gem "rails", "4.2.5"
|
|||
|
||||
# Legacy Rails features, remove me!
|
||||
# responders (class level)
|
||||
gem "responders", "2.1.0"
|
||||
gem "responders", "2.1.1"
|
||||
|
||||
# Appserver
|
||||
|
||||
gem "unicorn", "4.9.0", require: false
|
||||
gem "unicorn", "5.0.1", require: false
|
||||
|
||||
# Federation
|
||||
|
||||
|
|
@ -18,11 +18,11 @@ gem "diaspora_federation-rails", "0.0.10"
|
|||
|
||||
gem "acts_as_api", "0.4.2"
|
||||
gem "json", "1.8.3"
|
||||
gem "json-schema", "2.5.1"
|
||||
gem "json-schema", "2.5.2"
|
||||
|
||||
# Authentication
|
||||
|
||||
gem "devise", "3.5.2"
|
||||
gem "devise", "3.5.3"
|
||||
gem "devise_lastseenable", "0.0.6"
|
||||
gem "devise-token_authenticatable", "~> 0.4.0"
|
||||
|
||||
|
|
@ -56,7 +56,7 @@ gem "rack-cors", "0.4.0", require: "rack/cors"
|
|||
gem "bootstrap-sass", "3.3.5.1"
|
||||
gem "compass-rails", "2.0.5"
|
||||
gem "sass-rails", "5.0.4"
|
||||
gem "autoprefixer-rails", "6.0.3"
|
||||
gem "autoprefixer-rails", "6.2.2"
|
||||
gem "bootstrap-switch-rails", "3.3.3"
|
||||
|
||||
# Database
|
||||
|
|
@ -65,7 +65,7 @@ group :mysql, optional: true do
|
|||
gem "mysql2", "0.3.20"
|
||||
end
|
||||
group :postgresql, optional: true do
|
||||
gem "pg", "0.18.3"
|
||||
gem "pg", "0.18.4"
|
||||
end
|
||||
|
||||
gem "activerecord-import", "0.10.0"
|
||||
|
|
@ -73,7 +73,7 @@ gem "activerecord-import", "0.10.0"
|
|||
# File uploading
|
||||
|
||||
gem "carrierwave", "0.10.0"
|
||||
gem "fog", "1.34.0"
|
||||
gem "fog", "1.37.0"
|
||||
gem "mini_magick", "4.3.6"
|
||||
gem "remotipart", "1.2.1"
|
||||
|
||||
|
|
@ -87,11 +87,11 @@ gem "entypo-rails", "3.0.0.pre.rc2"
|
|||
# JavaScript
|
||||
|
||||
gem "backbone-on-rails", "1.2.0.0"
|
||||
gem "handlebars_assets", "0.21.0"
|
||||
gem "handlebars_assets", "0.22.0"
|
||||
gem "jquery-rails", "4.0.5"
|
||||
gem "jquery-ui-rails", "5.0.5"
|
||||
gem "js_image_paths", "0.0.2"
|
||||
gem "js-routes", "1.1.2"
|
||||
gem "js-routes", "1.2.0"
|
||||
|
||||
source "https://rails-assets.org" do
|
||||
gem "rails-assets-jquery", "1.11.2" # Should be kept in sync with jquery-rails
|
||||
|
|
@ -109,9 +109,9 @@ source "https://rails-assets.org" do
|
|||
# jQuery plugins
|
||||
|
||||
gem "rails-assets-jeresig--jquery.hotkeys", "0.2.0"
|
||||
gem "rails-assets-jquery-placeholder", "2.1.3"
|
||||
gem "rails-assets-jquery-placeholder", "2.3.1"
|
||||
gem "rails-assets-jquery-textchange", "0.2.3"
|
||||
gem "rails-assets-perfect-scrollbar", "0.6.7"
|
||||
gem "rails-assets-perfect-scrollbar", "0.6.8"
|
||||
gem "rails-assets-jakobmattsson--jquery-elastic", "1.6.11"
|
||||
gem "rails-assets-autosize", "3.0.14"
|
||||
gem "rails-assets-blueimp-gallery", "2.16.0"
|
||||
|
|
@ -121,7 +121,7 @@ end
|
|||
|
||||
gem "http_accept_language", "2.0.5"
|
||||
gem "i18n-inflector-rails", "1.0.7"
|
||||
gem "rails-i18n", "4.0.5"
|
||||
gem "rails-i18n", "4.0.8"
|
||||
|
||||
# Mail
|
||||
|
||||
|
|
@ -134,17 +134,17 @@ gem "leaflet-rails", "0.7.4"
|
|||
# Parsing
|
||||
|
||||
gem "nokogiri", "1.6.7.1"
|
||||
gem "redcarpet", "3.3.3"
|
||||
gem "redcarpet", "3.3.4"
|
||||
gem "twitter-text", "1.13.0"
|
||||
gem "roxml", "3.1.6"
|
||||
gem "ruby-oembed", "0.8.14"
|
||||
gem "ruby-oembed", "0.9.0"
|
||||
gem "open_graph_reader", "0.6.1"
|
||||
|
||||
# Services
|
||||
|
||||
gem "omniauth", "1.2.2"
|
||||
gem "omniauth-facebook", "2.0.1"
|
||||
gem "omniauth-tumblr", "1.1"
|
||||
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 "omniauth-wordpress", "0.2.2"
|
||||
|
|
@ -202,7 +202,7 @@ gem "minitest"
|
|||
group :production do # we don"t install these on travis to speed up test runs
|
||||
# Administration
|
||||
|
||||
gem "rails_admin", "0.7.0"
|
||||
gem "rails_admin", "0.8.1"
|
||||
|
||||
# Analytics
|
||||
|
||||
|
|
@ -249,7 +249,7 @@ group :development do
|
|||
|
||||
# Preloading environment
|
||||
|
||||
gem "spring", "1.4.0"
|
||||
gem "spring", "1.6.1"
|
||||
gem "spring-commands-rspec", "1.0.4"
|
||||
gem "spring-commands-cucumber", "1.0.1"
|
||||
|
||||
|
|
@ -259,7 +259,7 @@ group :development do
|
|||
gem "pry-byebug"
|
||||
|
||||
# test coverage
|
||||
gem "simplecov", "0.10.0", require: false
|
||||
gem "simplecov", "0.11.1", require: false
|
||||
end
|
||||
|
||||
group :test do
|
||||
|
|
@ -268,7 +268,7 @@ group :test do
|
|||
gem "fixture_builder", "0.4.1"
|
||||
gem "fuubar", "2.0.0"
|
||||
gem "rspec-instafail", "0.4.0", require: false
|
||||
gem "test_after_commit", "0.4.1"
|
||||
gem "test_after_commit", "0.4.2"
|
||||
|
||||
# Cucumber (integration tests)
|
||||
|
||||
|
|
@ -280,8 +280,8 @@ group :test do
|
|||
|
||||
gem "factory_girl_rails", "4.5.0"
|
||||
gem "timecop", "0.8.0"
|
||||
gem "webmock", "1.22.1", require: false
|
||||
gem "shoulda-matchers", "3.0.0"
|
||||
gem "webmock", "1.22.3", require: false
|
||||
gem "shoulda-matchers", "3.0.1"
|
||||
|
||||
gem "diaspora_federation-test", "0.0.10"
|
||||
end
|
||||
|
|
@ -294,7 +294,7 @@ group :development, :test do
|
|||
gem "cucumber-rails", "1.4.2", require: false
|
||||
|
||||
# Jasmine (client side application tests (JS))
|
||||
gem "jasmine", "2.3.1"
|
||||
gem "jasmine", "2.4.0"
|
||||
gem "jasmine-jquery-rails", "2.0.3"
|
||||
gem "rails-assets-jasmine-ajax", "3.2.0", source: "https://rails-assets.org"
|
||||
gem "sinon-rails", "1.15.0"
|
||||
|
|
|
|||
203
Gemfile.lock
203
Gemfile.lock
|
|
@ -54,10 +54,10 @@ GEM
|
|||
activemodel
|
||||
fog (>= 1.8.0)
|
||||
unf
|
||||
ast (2.1.0)
|
||||
ast (2.2.0)
|
||||
astrolabe (1.3.1)
|
||||
parser (~> 2.2)
|
||||
autoprefixer-rails (6.0.3)
|
||||
autoprefixer-rails (6.2.2)
|
||||
execjs
|
||||
json
|
||||
backbone-on-rails (1.2.0.0)
|
||||
|
|
@ -72,8 +72,7 @@ GEM
|
|||
bootstrap-switch-rails (3.3.3)
|
||||
buftok (0.2.0)
|
||||
builder (3.2.2)
|
||||
byebug (5.0.0)
|
||||
columnize (= 0.9.0)
|
||||
byebug (8.2.1)
|
||||
capybara (2.5.0)
|
||||
mime-types (>= 1.16)
|
||||
nokogiri (>= 1.3.3)
|
||||
|
|
@ -90,18 +89,17 @@ GEM
|
|||
celluloid-io (0.16.2)
|
||||
celluloid (>= 0.16.0)
|
||||
nio4r (>= 1.1.0)
|
||||
childprocess (0.5.6)
|
||||
childprocess (0.5.8)
|
||||
ffi (~> 1.0, >= 1.0.11)
|
||||
chunky_png (1.3.4)
|
||||
chunky_png (1.3.5)
|
||||
coderay (1.1.0)
|
||||
coffee-rails (4.1.0)
|
||||
coffee-rails (4.1.1)
|
||||
coffee-script (>= 2.2.0)
|
||||
railties (>= 4.0.0, < 5.0)
|
||||
railties (>= 4.0.0, < 5.1.x)
|
||||
coffee-script (2.4.1)
|
||||
coffee-script-source
|
||||
execjs
|
||||
coffee-script-source (1.9.1.1)
|
||||
columnize (0.9.0)
|
||||
coffee-script-source (1.10.0)
|
||||
compass (1.0.3)
|
||||
chunky_png (~> 1.2)
|
||||
compass-core (~> 1.0.2)
|
||||
|
|
@ -120,7 +118,7 @@ GEM
|
|||
sprockets (< 2.13)
|
||||
configurate (0.3.1)
|
||||
connection_pool (2.2.0)
|
||||
crack (0.4.2)
|
||||
crack (0.4.3)
|
||||
safe_yaml (~> 1.0.0)
|
||||
cucumber (1.3.20)
|
||||
builder (>= 2.1.2)
|
||||
|
|
@ -135,7 +133,7 @@ GEM
|
|||
nokogiri (~> 1.5)
|
||||
rails (>= 3, < 5)
|
||||
database_cleaner (1.5.1)
|
||||
devise (3.5.2)
|
||||
devise (3.5.3)
|
||||
bcrypt (~> 3.0)
|
||||
orm_adapter (~> 0.1)
|
||||
railties (>= 3.2.6, < 5)
|
||||
|
|
@ -212,14 +210,15 @@ GEM
|
|||
fixture_builder (0.4.1)
|
||||
activerecord (>= 2)
|
||||
activesupport (>= 2)
|
||||
fog (1.34.0)
|
||||
fog (1.37.0)
|
||||
fog-aliyun (>= 0.1.0)
|
||||
fog-atmos
|
||||
fog-aws (>= 0.6.0)
|
||||
fog-brightbox (~> 0.4)
|
||||
fog-core (~> 1.32)
|
||||
fog-dynect (~> 0.0.2)
|
||||
fog-ecloud (~> 0.1)
|
||||
fog-google (>= 0.0.2)
|
||||
fog-google (<= 0.1.0)
|
||||
fog-json
|
||||
fog-local
|
||||
fog-powerdns (>= 0.1.1)
|
||||
|
|
@ -233,9 +232,15 @@ GEM
|
|||
fog-terremark
|
||||
fog-vmfusion
|
||||
fog-voxel
|
||||
fog-vsphere (>= 0.4.0)
|
||||
fog-xenserver
|
||||
fog-xml (~> 0.1.1)
|
||||
ipaddress (~> 0.5)
|
||||
nokogiri (~> 1.5, >= 1.5.11)
|
||||
fog-aliyun (0.1.0)
|
||||
fog-core (~> 1.27)
|
||||
fog-json (~> 1.0)
|
||||
ipaddress (~> 0.8)
|
||||
xml-simple (~> 1.1)
|
||||
fog-atmos (0.1.0)
|
||||
fog-core
|
||||
fog-xml
|
||||
|
|
@ -244,17 +249,14 @@ GEM
|
|||
fog-json (~> 1.0)
|
||||
fog-xml (~> 0.1)
|
||||
ipaddress (~> 0.8)
|
||||
fog-brightbox (0.9.0)
|
||||
fog-brightbox (0.10.1)
|
||||
fog-core (~> 1.22)
|
||||
fog-json
|
||||
inflecto (~> 0.0.2)
|
||||
fog-core (1.32.1)
|
||||
fog-core (1.35.0)
|
||||
builder
|
||||
excon (~> 0.45)
|
||||
formatador (~> 0.2)
|
||||
mime-types
|
||||
net-scp (~> 1.1)
|
||||
net-ssh (>= 2.1.3)
|
||||
fog-dynect (0.0.2)
|
||||
fog-core
|
||||
fog-json
|
||||
|
|
@ -262,7 +264,7 @@ GEM
|
|||
fog-ecloud (0.3.0)
|
||||
fog-core
|
||||
fog-xml
|
||||
fog-google (0.1.1)
|
||||
fog-google (0.1.0)
|
||||
fog-core
|
||||
fog-json
|
||||
fog-xml
|
||||
|
|
@ -287,13 +289,13 @@ GEM
|
|||
fog-core
|
||||
fog-json
|
||||
fog-xml
|
||||
fog-sakuracloud (1.3.3)
|
||||
fog-sakuracloud (1.7.5)
|
||||
fog-core
|
||||
fog-json
|
||||
fog-serverlove (0.1.2)
|
||||
fog-core
|
||||
fog-json
|
||||
fog-softlayer (1.0.0)
|
||||
fog-softlayer (1.0.2)
|
||||
fog-core
|
||||
fog-json
|
||||
fog-storm_on_demand (0.1.1)
|
||||
|
|
@ -308,10 +310,16 @@ GEM
|
|||
fog-voxel (0.1.0)
|
||||
fog-core
|
||||
fog-xml
|
||||
fog-vsphere (0.4.0)
|
||||
fog-core
|
||||
rbvmomi (~> 1.8)
|
||||
fog-xenserver (0.2.2)
|
||||
fog-core
|
||||
fog-xml
|
||||
fog-xml (0.1.2)
|
||||
fog-core
|
||||
nokogiri (~> 1.5, >= 1.5.11)
|
||||
font-awesome-rails (4.4.0.0)
|
||||
font-awesome-rails (4.5.0.0)
|
||||
railties (>= 3.2, < 5.0)
|
||||
formatador (0.2.5)
|
||||
fuubar (2.0.0)
|
||||
|
|
@ -359,13 +367,13 @@ GEM
|
|||
haml (~> 4.0)
|
||||
rubocop (>= 0.25.0)
|
||||
sysexits (~> 1.1)
|
||||
handlebars_assets (0.21.0)
|
||||
handlebars_assets (0.22.0)
|
||||
execjs (~> 2.0)
|
||||
multi_json (~> 1.0)
|
||||
sprockets (>= 2.0.0, < 4.0)
|
||||
tilt (~> 1.2)
|
||||
hashdiff (0.2.2)
|
||||
hashie (3.4.2)
|
||||
hashdiff (0.2.3)
|
||||
hashie (3.4.3)
|
||||
hike (1.2.3)
|
||||
hiredis (0.5.2)
|
||||
hitimes (1.2.3)
|
||||
|
|
@ -392,12 +400,12 @@ GEM
|
|||
ice_cube (0.11.1)
|
||||
inflecto (0.0.2)
|
||||
ipaddress (0.8.0)
|
||||
jasmine (2.3.1)
|
||||
jasmine-core (~> 2.3)
|
||||
jasmine (2.4.0)
|
||||
jasmine-core (~> 2.4)
|
||||
phantomjs
|
||||
rack (>= 1.2.1)
|
||||
rake
|
||||
jasmine-core (2.3.4)
|
||||
jasmine-core (2.4.1)
|
||||
jasmine-jquery-rails (2.0.3)
|
||||
jquery-rails (4.0.5)
|
||||
rails-dom-testing (~> 1.0)
|
||||
|
|
@ -405,7 +413,7 @@ GEM
|
|||
thor (>= 0.14, < 2.0)
|
||||
jquery-ui-rails (5.0.5)
|
||||
railties (>= 3.2.16)
|
||||
js-routes (1.1.2)
|
||||
js-routes (1.2.0)
|
||||
railties (>= 3.2)
|
||||
sprockets-rails
|
||||
js_image_paths (0.0.2)
|
||||
|
|
@ -415,15 +423,15 @@ GEM
|
|||
multi_json (>= 1.3)
|
||||
rake
|
||||
json (1.8.3)
|
||||
json-schema (2.5.1)
|
||||
addressable (~> 2.3.7)
|
||||
jwt (1.5.1)
|
||||
json-schema (2.5.2)
|
||||
addressable (~> 2.3.8)
|
||||
jwt (1.5.2)
|
||||
kaminari (0.16.3)
|
||||
actionpack (>= 3.0.0)
|
||||
activesupport (>= 3.0.0)
|
||||
kgio (2.10.0)
|
||||
leaflet-rails (0.7.4)
|
||||
listen (3.0.3)
|
||||
listen (3.0.5)
|
||||
rb-fsevent (>= 0.9.3)
|
||||
rb-inotify (>= 0.9)
|
||||
little-plugger (1.1.4)
|
||||
|
|
@ -444,10 +452,10 @@ GEM
|
|||
thread_safe (~> 0.3, >= 0.3.1)
|
||||
messagebus_ruby_api (1.0.3)
|
||||
method_source (0.8.2)
|
||||
mime-types (2.6.2)
|
||||
mime-types (2.99)
|
||||
mini_magick (4.3.6)
|
||||
mini_portile2 (2.0.0)
|
||||
minitest (5.8.2)
|
||||
minitest (5.8.3)
|
||||
mobile-fu (1.3.1)
|
||||
rack-mobile-detect
|
||||
rails
|
||||
|
|
@ -459,10 +467,7 @@ GEM
|
|||
naught (1.1.0)
|
||||
nenv (0.2.0)
|
||||
nested_form (0.3.2)
|
||||
net-scp (1.2.1)
|
||||
net-ssh (>= 2.6.5)
|
||||
net-ssh (3.0.1)
|
||||
nio4r (1.1.1)
|
||||
nio4r (1.2.0)
|
||||
nokogiri (1.6.7.1)
|
||||
mini_portile2 (~> 2.0.0.rc2)
|
||||
notiffany (0.0.8)
|
||||
|
|
@ -477,18 +482,19 @@ GEM
|
|||
rack (~> 1.2)
|
||||
octokit (4.1.1)
|
||||
sawyer (~> 0.6.0, >= 0.5.3)
|
||||
omniauth (1.2.2)
|
||||
omniauth (1.3.1)
|
||||
hashie (>= 1.2, < 4)
|
||||
rack (~> 1.0)
|
||||
omniauth-facebook (2.0.1)
|
||||
rack (>= 1.0, < 3)
|
||||
omniauth-facebook (3.0.0)
|
||||
omniauth-oauth2 (~> 1.2)
|
||||
omniauth-oauth (1.1.0)
|
||||
oauth
|
||||
omniauth (~> 1.0)
|
||||
omniauth-oauth2 (1.3.1)
|
||||
omniauth-oauth2 (1.4.0)
|
||||
oauth2 (~> 1.0)
|
||||
omniauth (~> 1.2)
|
||||
omniauth-tumblr (1.1)
|
||||
omniauth-tumblr (1.2)
|
||||
multi_json
|
||||
omniauth-oauth (~> 1.0)
|
||||
omniauth-twitter (1.2.1)
|
||||
json (~> 1.3)
|
||||
|
|
@ -525,8 +531,8 @@ GEM
|
|||
coderay (~> 1.1.0)
|
||||
method_source (~> 0.8.1)
|
||||
slop (~> 3.4)
|
||||
pry-byebug (3.2.0)
|
||||
byebug (~> 5.0)
|
||||
pry-byebug (3.3.0)
|
||||
byebug (~> 8.0)
|
||||
pry (~> 0.10)
|
||||
pry-debundle (0.8)
|
||||
pry
|
||||
|
|
@ -574,7 +580,7 @@ GEM
|
|||
rails-assets-highlightjs (9.0.0)
|
||||
rails-assets-jakobmattsson--jquery-elastic (1.6.11)
|
||||
rails-assets-jquery (>= 1.2.6)
|
||||
rails-assets-jasmine (2.3.4)
|
||||
rails-assets-jasmine (2.4.1)
|
||||
rails-assets-jasmine-ajax (3.2.0)
|
||||
rails-assets-jasmine (~> 2)
|
||||
rails-assets-jeresig--jquery.hotkeys (0.2.0)
|
||||
|
|
@ -583,7 +589,7 @@ GEM
|
|||
rails-assets-jquery-colorbox (1.6.3)
|
||||
rails-assets-jquery (>= 1.3.2)
|
||||
rails-assets-jquery-fullscreen-plugin (0.5.0)
|
||||
rails-assets-jquery-placeholder (2.1.3)
|
||||
rails-assets-jquery-placeholder (2.3.1)
|
||||
rails-assets-jquery (>= 1.6)
|
||||
rails-assets-jquery-textchange (0.2.3)
|
||||
rails-assets-jquery
|
||||
|
|
@ -597,7 +603,7 @@ GEM
|
|||
rails-assets-markdown-it-sanitizer (0.4.1)
|
||||
rails-assets-markdown-it-sub (1.0.0)
|
||||
rails-assets-markdown-it-sup (1.0.0)
|
||||
rails-assets-perfect-scrollbar (0.6.7)
|
||||
rails-assets-perfect-scrollbar (0.6.8)
|
||||
rails-assets-typeahead.js (0.11.1)
|
||||
rails-assets-jquery (>= 1.7)
|
||||
rails-deprecated_sanitizer (1.0.3)
|
||||
|
|
@ -608,13 +614,13 @@ GEM
|
|||
rails-deprecated_sanitizer (>= 1.0.1)
|
||||
rails-html-sanitizer (1.0.2)
|
||||
loofah (~> 2.0)
|
||||
rails-i18n (4.0.5)
|
||||
i18n (~> 0.6)
|
||||
rails-i18n (4.0.8)
|
||||
i18n (~> 0.7)
|
||||
railties (~> 4.0)
|
||||
rails-timeago (2.11.0)
|
||||
actionpack (>= 3.1)
|
||||
activesupport (>= 3.1)
|
||||
rails_admin (0.7.0)
|
||||
rails_admin (0.8.1)
|
||||
builder (~> 3.1)
|
||||
coffee-rails (~> 4.0)
|
||||
font-awesome-rails (>= 3.0, < 5)
|
||||
|
|
@ -639,14 +645,18 @@ GEM
|
|||
rb-fsevent (0.9.6)
|
||||
rb-inotify (0.9.5)
|
||||
ffi (>= 0.5.0)
|
||||
redcarpet (3.3.3)
|
||||
redis (3.2.1)
|
||||
rbvmomi (1.8.2)
|
||||
builder
|
||||
nokogiri (>= 1.4.1)
|
||||
trollop
|
||||
redcarpet (3.3.4)
|
||||
redis (3.2.2)
|
||||
redis-namespace (1.5.2)
|
||||
redis (~> 3.0, >= 3.0.4)
|
||||
remotipart (1.2.1)
|
||||
request_store (1.2.0)
|
||||
responders (2.1.0)
|
||||
railties (>= 4.2.0, < 5)
|
||||
request_store (1.2.1)
|
||||
responders (2.1.1)
|
||||
railties (>= 4.2.0, < 5.1)
|
||||
roxml (3.1.6)
|
||||
activesupport (>= 2.3.0)
|
||||
nokogiri (>= 1.3.3)
|
||||
|
|
@ -673,18 +683,19 @@ GEM
|
|||
rspec-mocks (~> 3.3.0)
|
||||
rspec-support (~> 3.3.0)
|
||||
rspec-support (3.3.0)
|
||||
rubocop (0.34.2)
|
||||
rubocop (0.35.1)
|
||||
astrolabe (~> 1.3)
|
||||
parser (>= 2.2.2.5, < 3.0)
|
||||
parser (>= 2.2.3.0, < 3.0)
|
||||
powerpack (~> 0.1)
|
||||
rainbow (>= 1.99.1, < 3.0)
|
||||
ruby-progressbar (~> 1.4)
|
||||
ruby-oembed (0.8.14)
|
||||
ruby-progressbar (~> 1.7)
|
||||
tins (<= 1.6.0)
|
||||
ruby-oembed (0.9.0)
|
||||
ruby-progressbar (1.7.5)
|
||||
rubyzip (1.1.7)
|
||||
rugged (0.23.3)
|
||||
safe_yaml (1.0.4)
|
||||
sass (3.4.19)
|
||||
sass (3.4.20)
|
||||
sass-rails (5.0.4)
|
||||
railties (>= 4.0.0, < 5.0)
|
||||
sass (~> 3.1)
|
||||
|
|
@ -703,7 +714,7 @@ GEM
|
|||
rubyzip (~> 1.0)
|
||||
websocket (~> 1.0)
|
||||
shellany (0.0.1)
|
||||
shoulda-matchers (3.0.0)
|
||||
shoulda-matchers (3.0.1)
|
||||
activesupport (>= 4.0.0)
|
||||
sidekiq (3.4.2)
|
||||
celluloid (~> 0.16.0)
|
||||
|
|
@ -719,7 +730,7 @@ GEM
|
|||
simple_captcha2 (0.3.4)
|
||||
rails (>= 4.1)
|
||||
simple_oauth (0.3.1)
|
||||
simplecov (0.10.0)
|
||||
simplecov (0.11.1)
|
||||
docile (~> 1.1.0)
|
||||
json (~> 1.8)
|
||||
simplecov-html (~> 0.10.0)
|
||||
|
|
@ -731,7 +742,7 @@ GEM
|
|||
sinon-rails (1.15.0)
|
||||
railties (>= 3.1)
|
||||
slop (3.6.0)
|
||||
spring (1.4.0)
|
||||
spring (1.6.1)
|
||||
spring-commands-cucumber (1.0.1)
|
||||
spring (>= 0.9.1)
|
||||
spring-commands-rspec (1.0.4)
|
||||
|
|
@ -749,7 +760,7 @@ GEM
|
|||
sysexits (1.2.0)
|
||||
systemu (2.6.5)
|
||||
terminal-table (1.5.2)
|
||||
test_after_commit (0.4.1)
|
||||
test_after_commit (0.4.2)
|
||||
activerecord (>= 3.2)
|
||||
thor (0.19.1)
|
||||
thread_safe (0.3.5)
|
||||
|
|
@ -757,6 +768,8 @@ GEM
|
|||
timecop (0.8.0)
|
||||
timers (4.0.4)
|
||||
hitimes
|
||||
tins (1.6.0)
|
||||
trollop (2.1.2)
|
||||
twitter (5.15.0)
|
||||
addressable (~> 2.3)
|
||||
buftok (~> 0.2.0)
|
||||
|
|
@ -780,21 +793,22 @@ GEM
|
|||
unf (0.1.4)
|
||||
unf_ext
|
||||
unf_ext (0.0.7.1)
|
||||
unicorn (4.9.0)
|
||||
unicorn (5.0.1)
|
||||
kgio (~> 2.6)
|
||||
rack
|
||||
raindrops (~> 0.7)
|
||||
uuid (2.3.8)
|
||||
macaddr (~> 1.0)
|
||||
valid (1.1.0)
|
||||
warden (1.2.3)
|
||||
warden (1.2.4)
|
||||
rack (>= 1.0)
|
||||
webmock (1.22.1)
|
||||
webmock (1.22.3)
|
||||
addressable (>= 2.3.6)
|
||||
crack (>= 0.3.2)
|
||||
hashdiff
|
||||
websocket (1.2.2)
|
||||
will_paginate (3.0.7)
|
||||
xml-simple (1.1.5)
|
||||
xpath (2.0.0)
|
||||
nokogiri (~> 1.3)
|
||||
|
||||
|
|
@ -808,7 +822,7 @@ DEPENDENCIES
|
|||
acts_as_api (= 0.4.2)
|
||||
addressable (= 2.3.8)
|
||||
asset_sync (= 1.1.0)
|
||||
autoprefixer-rails (= 6.0.3)
|
||||
autoprefixer-rails (= 6.2.2)
|
||||
backbone-on-rails (= 1.2.0.0)
|
||||
bootstrap-sass (= 3.3.5.1)
|
||||
bootstrap-switch-rails (= 3.3.3)
|
||||
|
|
@ -818,7 +832,7 @@ DEPENDENCIES
|
|||
configurate (= 0.3.1)
|
||||
cucumber-rails (= 1.4.2)
|
||||
database_cleaner (= 1.5.1)
|
||||
devise (= 3.5.2)
|
||||
devise (= 3.5.3)
|
||||
devise-token_authenticatable (~> 0.4.0)
|
||||
devise_lastseenable (= 0.0.6)
|
||||
diaspora-vines (~> 0.2.0.develop)
|
||||
|
|
@ -831,7 +845,7 @@ DEPENDENCIES
|
|||
faraday-cookie_jar (= 0.0.6)
|
||||
faraday_middleware (= 0.10.0)
|
||||
fixture_builder (= 0.4.1)
|
||||
fog (= 1.34.0)
|
||||
fog (= 1.37.0)
|
||||
fuubar (= 2.0.0)
|
||||
gon (= 6.0.1)
|
||||
guard (= 2.13.0)
|
||||
|
|
@ -841,18 +855,19 @@ DEPENDENCIES
|
|||
guard-rubocop (= 1.2.0)
|
||||
haml (= 4.0.7)
|
||||
haml_lint (= 0.15.2)
|
||||
handlebars_assets (= 0.21.0)
|
||||
handlebars_assets (= 0.22.0)
|
||||
http_accept_language (= 2.0.5)
|
||||
i18n-inflector-rails (= 1.0.7)
|
||||
jasmine (= 2.3.1)
|
||||
jasmine (= 2.4.0)
|
||||
jasmine-jquery-rails (= 2.0.3)
|
||||
jquery-rails (= 4.0.5)
|
||||
jquery-ui-rails (= 5.0.5)
|
||||
js-routes (= 1.1.2)
|
||||
js-routes (= 1.2.0)
|
||||
js_image_paths (= 0.0.2)
|
||||
jshintrb (= 0.3.0)
|
||||
json (= 1.8.3)
|
||||
json-schema (= 2.5.1)
|
||||
json-schema (= 2.5.2)
|
||||
leaflet-rails (= 0.7.4)
|
||||
logging-rails (= 0.5.0)
|
||||
markerb (= 1.1.0)
|
||||
|
|
@ -862,9 +877,9 @@ DEPENDENCIES
|
|||
mobile-fu (= 1.3.1)
|
||||
mysql2 (= 0.3.20)
|
||||
nokogiri (= 1.6.7.1)
|
||||
omniauth (= 1.2.2)
|
||||
omniauth-facebook (= 2.0.1)
|
||||
omniauth-tumblr (= 1.1)
|
||||
omniauth (= 1.3.1)
|
||||
omniauth-facebook (= 3.0.0)
|
||||
omniauth-tumblr (= 1.2)
|
||||
omniauth-twitter (= 1.2.1)
|
||||
omniauth-wordpress (= 0.2.2)
|
||||
open_graph_reader (= 0.6.1)
|
||||
|
|
@ -893,7 +908,7 @@ DEPENDENCIES
|
|||
rails-assets-jasmine-ajax (= 3.2.0)!
|
||||
rails-assets-jeresig--jquery.hotkeys (= 0.2.0)!
|
||||
rails-assets-jquery (= 1.11.2)!
|
||||
rails-assets-jquery-placeholder (= 2.1.3)!
|
||||
rails-assets-jquery-placeholder (= 2.3.1)!
|
||||
rails-assets-jquery-textchange (= 0.2.3)!
|
||||
rails-assets-markdown-it (= 5.0.2)!
|
||||
rails-assets-markdown-it--markdown-it-for-inline (= 0.1.1)!
|
||||
|
|
@ -902,43 +917,43 @@ DEPENDENCIES
|
|||
rails-assets-markdown-it-sanitizer (= 0.4.1)!
|
||||
rails-assets-markdown-it-sub (= 1.0.0)!
|
||||
rails-assets-markdown-it-sup (= 1.0.0)!
|
||||
rails-assets-perfect-scrollbar (= 0.6.7)!
|
||||
rails-assets-perfect-scrollbar (= 0.6.8)!
|
||||
rails-assets-typeahead.js (= 0.11.1)!
|
||||
rails-i18n (= 4.0.5)
|
||||
rails-i18n (= 4.0.8)
|
||||
rails-timeago (= 2.11.0)
|
||||
rails_admin (= 0.7.0)
|
||||
rails_admin (= 0.8.1)
|
||||
rb-fsevent (= 0.9.6)
|
||||
rb-inotify (= 0.9.5)
|
||||
redcarpet (= 3.3.3)
|
||||
redcarpet (= 3.3.4)
|
||||
remotipart (= 1.2.1)
|
||||
responders (= 2.1.0)
|
||||
responders (= 2.1.1)
|
||||
roxml (= 3.1.6)
|
||||
rspec-instafail (= 0.4.0)
|
||||
rspec-rails (= 3.3.3)
|
||||
rubocop (= 0.34.2)
|
||||
ruby-oembed (= 0.8.14)
|
||||
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.0)
|
||||
shoulda-matchers (= 3.0.1)
|
||||
sidekiq (= 3.4.2)
|
||||
sidetiq (= 0.6.3)
|
||||
simple_captcha2 (= 0.3.4)
|
||||
simplecov (= 0.10.0)
|
||||
simplecov (= 0.11.1)
|
||||
sinatra (= 1.4.6)
|
||||
sinon-rails (= 1.15.0)
|
||||
spring (= 1.4.0)
|
||||
spring (= 1.6.1)
|
||||
spring-commands-cucumber (= 1.0.1)
|
||||
spring-commands-rspec (= 1.0.4)
|
||||
test_after_commit (= 0.4.1)
|
||||
test_after_commit (= 0.4.2)
|
||||
timecop (= 0.8.0)
|
||||
twitter (= 5.15.0)
|
||||
twitter-text (= 1.13.0)
|
||||
typhoeus (= 0.8.0)
|
||||
uglifier (= 2.7.2)
|
||||
unicorn (= 4.9.0)
|
||||
unicorn (= 5.0.1)
|
||||
uuid (= 2.3.8)
|
||||
webmock (= 1.22.1)
|
||||
webmock (= 1.22.3)
|
||||
will_paginate (= 3.0.7)
|
||||
|
||||
BUNDLED WITH
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
#!/usr/bin/env ruby
|
||||
begin
|
||||
load File.expand_path("../spring", __FILE__)
|
||||
rescue LoadError
|
||||
load File.expand_path('../spring', __FILE__)
|
||||
rescue LoadError => e
|
||||
raise unless e.message.include?('spring')
|
||||
end
|
||||
require 'bundler/setup'
|
||||
load Gem.bin_path('cucumber', 'cucumber')
|
||||
|
|
|
|||
|
|
@ -1,8 +1,11 @@
|
|||
#!/usr/bin/env ruby
|
||||
begin
|
||||
load File.expand_path("../spring", __FILE__)
|
||||
rescue LoadError
|
||||
load File.expand_path('../spring', __FILE__)
|
||||
rescue LoadError => e
|
||||
raise unless e.message.include?('spring')
|
||||
end
|
||||
# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
|
||||
|
||||
APP_PATH = File.expand_path('../../config/application', __FILE__)
|
||||
require_relative '../config/boot'
|
||||
require File.expand_path('../../config/boot', __FILE__)
|
||||
require 'rails/commands'
|
||||
|
|
|
|||
5
bin/rake
5
bin/rake
|
|
@ -1,7 +1,8 @@
|
|||
#!/usr/bin/env ruby
|
||||
begin
|
||||
load File.expand_path("../spring", __FILE__)
|
||||
rescue LoadError
|
||||
load File.expand_path('../spring', __FILE__)
|
||||
rescue LoadError => e
|
||||
raise unless e.message.include?('spring')
|
||||
end
|
||||
require_relative '../config/boot'
|
||||
require 'rake'
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
#!/usr/bin/env ruby
|
||||
begin
|
||||
load File.expand_path("../spring", __FILE__)
|
||||
rescue LoadError
|
||||
load File.expand_path('../spring', __FILE__)
|
||||
rescue LoadError => e
|
||||
raise unless e.message.include?('spring')
|
||||
end
|
||||
require 'bundler/setup'
|
||||
load Gem.bin_path('rspec-core', 'rspec')
|
||||
|
|
|
|||
19
bin/spring
19
bin/spring
|
|
@ -1,18 +1,15 @@
|
|||
#!/usr/bin/env ruby
|
||||
|
||||
# This file loads spring without using Bundler, in order to be fast
|
||||
# It gets overwritten when you run the `spring binstub` command
|
||||
# This file loads spring without using Bundler, in order to be fast.
|
||||
# It gets overwritten when you run the `spring binstub` command.
|
||||
|
||||
unless defined?(Spring)
|
||||
require "rubygems"
|
||||
require "bundler"
|
||||
require 'rubygems'
|
||||
require 'bundler'
|
||||
|
||||
if match = Bundler.default_lockfile.read.match(/^GEM$.*?^ (?: )*spring \((.*?)\)$.*?^$/m)
|
||||
ENV["GEM_PATH"] = ([Bundler.bundle_path.to_s] + Gem.path).join(File::PATH_SEPARATOR)
|
||||
ENV["GEM_HOME"] = nil
|
||||
Gem.paths = ENV
|
||||
|
||||
gem "spring", match[1]
|
||||
require "spring/binstub"
|
||||
if (match = Bundler.default_lockfile.read.match(/^GEM$.*?^ (?: )*spring \((.*?)\)$.*?^$/m))
|
||||
Gem.paths = { 'GEM_PATH' => [Bundler.bundle_path.to_s, *Gem.path].uniq }
|
||||
gem 'spring', match[1]
|
||||
require 'spring/binstub'
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ describe StreamsController, :type => :controller do
|
|||
it "generates a jasmine fixture with a post containing a video", :fixture => true do
|
||||
stub_request(
|
||||
:get,
|
||||
"http://www.youtube.com/oembed?format=json&frame=1&iframe=1&maxheight=420&maxwidth=420&scheme=https&url=http://www.youtube.com/watch?v=UYrkQL1bX4A"
|
||||
"https://www.youtube.com/oembed?format=json&frame=1&iframe=1&maxheight=420&maxwidth=420&scheme=https&url=http://www.youtube.com/watch?v=UYrkQL1bX4A"
|
||||
).with(
|
||||
:headers => {'Accept'=>'*/*'}
|
||||
).to_return(
|
||||
|
|
|
|||
Loading…
Reference in a new issue