Merge branch 'stable' into develop
This commit is contained in:
Dennis Schubert
commit
cb7ab32d06
2 changed files with 204 additions and 150 deletions
70
Gemfile
70
Gemfile
|
|
@ -12,7 +12,7 @@ gem "unicorn", "4.9.0", require: false
|
|||
|
||||
# Federation
|
||||
|
||||
gem "diaspora_federation-rails", "0.0.7"
|
||||
gem "diaspora_federation-rails", "0.0.8"
|
||||
|
||||
# API and JSON
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ gem "json-schema", "2.5.1"
|
|||
|
||||
# Authentication
|
||||
|
||||
gem "devise", "3.5.1"
|
||||
gem "devise", "3.5.2"
|
||||
gem "devise_lastseenable", "0.0.6"
|
||||
gem "devise-token_authenticatable", "~> 0.4.0"
|
||||
|
||||
|
|
@ -32,7 +32,7 @@ gem "simple_captcha2", "0.3.4", require: "simple_captcha"
|
|||
|
||||
# Background processing
|
||||
|
||||
gem "sidekiq", "3.4.2"
|
||||
gem "sidekiq", "3.5.0"
|
||||
gem "sinatra", "1.4.6"
|
||||
|
||||
# Scheduled processing
|
||||
|
|
@ -54,18 +54,18 @@ gem "rack-cors", "0.4.0", require: "rack/cors"
|
|||
# CSS
|
||||
|
||||
gem "bootstrap-sass", "3.3.5.1"
|
||||
gem "compass-rails", "2.0.4"
|
||||
gem "sass-rails", "5.0.1"
|
||||
gem "autoprefixer-rails", "5.2.1.1"
|
||||
gem "compass-rails", "2.0.5"
|
||||
gem "sass-rails", "5.0.4"
|
||||
gem "autoprefixer-rails", "6.0.3"
|
||||
gem "bootstrap-switch-rails", "3.3.3"
|
||||
|
||||
# Database
|
||||
|
||||
group :mysql, optional: true do
|
||||
gem "mysql2", "0.3.18"
|
||||
gem "mysql2", "0.3.20"
|
||||
end
|
||||
group :postgresql, optional: true do
|
||||
gem "pg", "0.18.2"
|
||||
gem "pg", "0.18.3"
|
||||
end
|
||||
|
||||
gem "activerecord-import", "0.10.0"
|
||||
|
|
@ -73,8 +73,8 @@ gem "activerecord-import", "0.10.0"
|
|||
# File uploading
|
||||
|
||||
gem "carrierwave", "0.10.0"
|
||||
gem "fog", "1.32.0"
|
||||
gem "mini_magick", "4.2.7"
|
||||
gem "fog", "1.34.0"
|
||||
gem "mini_magick", "4.3.3"
|
||||
gem "remotipart", "1.2.1"
|
||||
|
||||
# GUID generation
|
||||
|
|
@ -88,10 +88,10 @@ gem "entypo-rails", "3.0.0.pre.rc2"
|
|||
|
||||
gem "backbone-on-rails", "1.2.0.0"
|
||||
gem "handlebars_assets", "0.20.2"
|
||||
gem "jquery-rails", "4.0.4"
|
||||
gem "jquery-rails", "4.0.5"
|
||||
gem "jquery-ui-rails", "5.0.5"
|
||||
gem "js_image_paths", "0.0.2"
|
||||
gem "js-routes", "1.0.1"
|
||||
gem "js-routes", "1.1.2"
|
||||
|
||||
source "https://rails-assets.org" do
|
||||
gem "rails-assets-jquery", "1.11.2" # Should be kept in sync with jquery-rails
|
||||
|
|
@ -103,7 +103,7 @@ source "https://rails-assets.org" do
|
|||
gem "rails-assets-markdown-it--markdown-it-for-inline", "0.1.1"
|
||||
gem "rails-assets-markdown-it-sub", "1.0.0"
|
||||
gem "rails-assets-markdown-it-sup", "1.0.0"
|
||||
gem "rails-assets-highlightjs", "8.6.0"
|
||||
gem "rails-assets-highlightjs", "8.8.0"
|
||||
gem "rails-assets-typeahead.js", "0.11.1"
|
||||
|
||||
# jQuery plugins
|
||||
|
|
@ -111,9 +111,9 @@ source "https://rails-assets.org" do
|
|||
gem "rails-assets-jeresig--jquery.hotkeys", "0.2.0"
|
||||
gem "rails-assets-jquery-placeholder", "2.1.2"
|
||||
gem "rails-assets-jquery-textchange", "0.2.3"
|
||||
gem "rails-assets-perfect-scrollbar", "0.6.4"
|
||||
gem "rails-assets-perfect-scrollbar", "0.6.5"
|
||||
gem "rails-assets-jakobmattsson--jquery-elastic", "1.6.11"
|
||||
gem "rails-assets-autosize", "3.0.8"
|
||||
gem "rails-assets-autosize", "3.0.9"
|
||||
gem "rails-assets-blueimp-gallery", "2.16.0"
|
||||
end
|
||||
|
||||
|
|
@ -121,18 +121,18 @@ end
|
|||
|
||||
gem "http_accept_language", "2.0.5"
|
||||
gem "i18n-inflector-rails", "1.0.7"
|
||||
gem "rails-i18n", "4.0.4"
|
||||
gem "rails-i18n", "4.0.5"
|
||||
|
||||
# Mail
|
||||
|
||||
gem "markerb", "1.0.2"
|
||||
gem "markerb", "1.1.0"
|
||||
gem "messagebus_ruby_api", "1.0.3"
|
||||
|
||||
# Parsing
|
||||
|
||||
gem "nokogiri", "1.6.6.2"
|
||||
gem "redcarpet", "3.3.2"
|
||||
gem "twitter-text", "1.12.0"
|
||||
gem "twitter-text", "1.13.0"
|
||||
gem "roxml", "3.1.6"
|
||||
gem "ruby-oembed", "0.8.14"
|
||||
gem "open_graph_reader", "0.6.1"
|
||||
|
|
@ -142,8 +142,8 @@ gem "open_graph_reader", "0.6.1"
|
|||
gem "omniauth", "1.2.2"
|
||||
gem "omniauth-facebook", "2.0.1"
|
||||
gem "omniauth-tumblr", "1.1"
|
||||
gem "omniauth-twitter", "1.2.0"
|
||||
gem "twitter", "5.14.0"
|
||||
gem "omniauth-twitter", "1.2.1"
|
||||
gem "twitter", "5.15.0"
|
||||
gem "omniauth-wordpress", "0.2.2"
|
||||
|
||||
# Serializers
|
||||
|
|
@ -164,12 +164,12 @@ gem "addressable", "2.3.8", require: "addressable/uri"
|
|||
gem "faraday", "0.9.1"
|
||||
gem "faraday_middleware", "0.10.0"
|
||||
gem "faraday-cookie_jar", "0.0.6"
|
||||
gem "typhoeus", "0.7.2"
|
||||
gem "typhoeus", "0.8.0"
|
||||
|
||||
# Views
|
||||
|
||||
gem "gon", "6.0.1"
|
||||
gem "haml", "4.0.6"
|
||||
gem "haml", "4.0.7"
|
||||
gem "mobile-fu", "1.3.1"
|
||||
gem "will_paginate", "3.0.7"
|
||||
gem "rails-timeago", "2.11.0"
|
||||
|
|
@ -212,7 +212,7 @@ group :production do # we don"t install these on travis to speed up test runs
|
|||
|
||||
# Process management
|
||||
|
||||
gem "eye", "0.7.pre"
|
||||
gem "eye", "0.8.pre"
|
||||
|
||||
# Redirects
|
||||
|
||||
|
|
@ -228,24 +228,24 @@ group :development do
|
|||
# Automatic test runs
|
||||
gem "guard-cucumber", "1.5.4"
|
||||
gem "guard-jshintrb", "1.1.1"
|
||||
gem "guard-rspec", "4.6.3"
|
||||
gem "guard-rspec", "4.6.4"
|
||||
gem "guard-rubocop", "1.2.0"
|
||||
gem "guard", "2.13.0", require: false
|
||||
gem "rb-fsevent", "0.9.5", require: false
|
||||
gem "rb-fsevent", "0.9.6", require: false
|
||||
gem "rb-inotify", "0.9.5", require: false
|
||||
|
||||
# Linters
|
||||
gem "jshintrb", "0.3.0"
|
||||
gem "rubocop", "0.32.1"
|
||||
gem "haml_lint", "0.13.0"
|
||||
gem "pronto", "0.4.2"
|
||||
gem "rubocop", "0.34.1"
|
||||
gem "haml_lint", "0.15.2"
|
||||
gem "pronto", "0.4.3"
|
||||
gem "pronto-jshint", "0.4.2"
|
||||
gem "pronto-rubocop", "0.4.4"
|
||||
gem "pronto-haml", "0.4.3"
|
||||
gem "pronto-rubocop", "0.4.6"
|
||||
gem "pronto-haml", "0.4.4"
|
||||
|
||||
# Preloading environment
|
||||
|
||||
gem "spring", "1.3.6"
|
||||
gem "spring", "1.4.0"
|
||||
gem "spring-commands-rspec", "1.0.4"
|
||||
gem "spring-commands-cucumber", "1.0.1"
|
||||
|
||||
|
|
@ -263,13 +263,13 @@ group :test do
|
|||
|
||||
gem "fixture_builder", "0.4.1"
|
||||
gem "fuubar", "2.0.0"
|
||||
gem "rspec-instafail", "0.2.6", require: false
|
||||
gem "rspec-instafail", "0.4.0", require: false
|
||||
gem "test_after_commit", "0.4.1"
|
||||
|
||||
# Cucumber (integration tests)
|
||||
|
||||
gem "capybara", "2.4.4"
|
||||
gem "database_cleaner" , "1.4.1"
|
||||
gem "capybara", "2.5.0"
|
||||
gem "database_cleaner" , "1.5.0"
|
||||
gem "selenium-webdriver", "2.47.1"
|
||||
|
||||
# General helpers
|
||||
|
|
@ -288,7 +288,7 @@ group :development, :test do
|
|||
gem "cucumber-rails", "1.4.2", require: false
|
||||
|
||||
# Jasmine (client side application tests (JS))
|
||||
gem "jasmine", "2.3.0"
|
||||
gem "jasmine", "2.3.1"
|
||||
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"
|
||||
|
|
|
|||
282
Gemfile.lock
282
Gemfile.lock
|
|
@ -54,10 +54,10 @@ GEM
|
|||
activemodel
|
||||
fog (>= 1.8.0)
|
||||
unf
|
||||
ast (2.0.0)
|
||||
ast (2.1.0)
|
||||
astrolabe (1.3.1)
|
||||
parser (~> 2.2)
|
||||
autoprefixer-rails (5.2.1.1)
|
||||
autoprefixer-rails (6.0.3)
|
||||
execjs
|
||||
json
|
||||
backbone-on-rails (1.2.0.0)
|
||||
|
|
@ -74,7 +74,7 @@ GEM
|
|||
builder (3.2.2)
|
||||
byebug (5.0.0)
|
||||
columnize (= 0.9.0)
|
||||
capybara (2.4.4)
|
||||
capybara (2.5.0)
|
||||
mime-types (>= 1.16)
|
||||
nokogiri (>= 1.3.3)
|
||||
rack (>= 1.0.0)
|
||||
|
|
@ -85,11 +85,55 @@ GEM
|
|||
activesupport (>= 3.2.0)
|
||||
json (>= 1.7)
|
||||
mime-types (>= 1.16)
|
||||
celluloid (0.16.0)
|
||||
timers (~> 4.0.0)
|
||||
celluloid-io (0.16.2)
|
||||
celluloid (>= 0.16.0)
|
||||
nio4r (>= 1.1.0)
|
||||
celluloid (0.17.1.2)
|
||||
bundler
|
||||
celluloid-essentials
|
||||
celluloid-extras
|
||||
celluloid-fsm
|
||||
celluloid-pool
|
||||
celluloid-supervision
|
||||
dotenv
|
||||
nenv
|
||||
rspec-logsplit (>= 0.1.2)
|
||||
timers (>= 4.1.1)
|
||||
celluloid-essentials (0.20.2.1)
|
||||
bundler
|
||||
dotenv
|
||||
nenv
|
||||
rspec-logsplit (>= 0.1.2)
|
||||
timers (>= 4.1.1)
|
||||
celluloid-extras (0.20.1)
|
||||
bundler
|
||||
dotenv
|
||||
nenv
|
||||
rspec-logsplit (>= 0.1.2)
|
||||
timers (>= 4.1.1)
|
||||
celluloid-fsm (0.20.1)
|
||||
bundler
|
||||
dotenv
|
||||
nenv
|
||||
rspec-logsplit (>= 0.1.2)
|
||||
timers (>= 4.1.1)
|
||||
celluloid-io (0.17.1)
|
||||
bundler
|
||||
celluloid (>= 0.17.1.1)
|
||||
dotenv
|
||||
nenv
|
||||
nio4r (>= 1.1)
|
||||
rspec-logsplit (>= 0.1.2)
|
||||
timers (>= 4.1.1)
|
||||
celluloid-pool (0.20.1)
|
||||
bundler
|
||||
dotenv
|
||||
nenv
|
||||
rspec-logsplit (>= 0.1.2)
|
||||
timers (>= 4.1.1)
|
||||
celluloid-supervision (0.20.1.1)
|
||||
bundler
|
||||
dotenv
|
||||
nenv
|
||||
rspec-logsplit (>= 0.1.2)
|
||||
timers (>= 4.1.1)
|
||||
childprocess (0.5.6)
|
||||
ffi (~> 1.0, >= 1.0.11)
|
||||
chunky_png (1.3.4)
|
||||
|
|
@ -114,9 +158,9 @@ GEM
|
|||
sass (>= 3.3.0, < 3.5)
|
||||
compass-import-once (1.0.5)
|
||||
sass (>= 3.2, < 3.5)
|
||||
compass-rails (2.0.4)
|
||||
compass-rails (2.0.5)
|
||||
compass (~> 1.0.0)
|
||||
sass-rails (<= 5.0.1)
|
||||
sass-rails (< 5.1)
|
||||
sprockets (< 2.13)
|
||||
configurate (0.3.1)
|
||||
connection_pool (2.2.0)
|
||||
|
|
@ -134,8 +178,8 @@ GEM
|
|||
mime-types (>= 1.16, < 3)
|
||||
nokogiri (~> 1.5)
|
||||
rails (>= 3, < 5)
|
||||
database_cleaner (1.4.1)
|
||||
devise (3.5.1)
|
||||
database_cleaner (1.5.0)
|
||||
devise (3.5.2)
|
||||
bcrypt (~> 3.0)
|
||||
orm_adapter (~> 0.1)
|
||||
railties (>= 3.2.6, < 5)
|
||||
|
|
@ -154,19 +198,20 @@ GEM
|
|||
eventmachine (>= 1.0.5, < 1.1)
|
||||
http_parser.rb (~> 0.6)
|
||||
nokogiri (~> 1.6)
|
||||
diaspora_federation (0.0.7)
|
||||
diaspora_federation (0.0.8)
|
||||
faraday (~> 0.9.0)
|
||||
faraday_middleware (~> 0.10.0)
|
||||
nokogiri (~> 1.6, >= 1.6.6)
|
||||
typhoeus (~> 0.7.0)
|
||||
typhoeus (~> 0.7)
|
||||
valid (~> 1.0)
|
||||
diaspora_federation-rails (0.0.7)
|
||||
diaspora_federation (= 0.0.7)
|
||||
diaspora_federation-rails (0.0.8)
|
||||
diaspora_federation (= 0.0.8)
|
||||
rails (~> 4.2)
|
||||
diff-lcs (1.2.5)
|
||||
docile (1.1.5)
|
||||
domain_name (0.5.24)
|
||||
unf (>= 0.0.5, < 1.0.0)
|
||||
dotenv (2.0.2)
|
||||
eco (1.0.0)
|
||||
coffee-script
|
||||
eco-source
|
||||
|
|
@ -178,17 +223,17 @@ GEM
|
|||
hiredis (~> 0.5.0)
|
||||
entypo-rails (3.0.0.pre.rc2)
|
||||
railties (>= 4.1, <= 5)
|
||||
equalizer (0.0.11)
|
||||
equalizer (0.0.10)
|
||||
erubis (2.7.0)
|
||||
ethon (0.7.4)
|
||||
ethon (0.8.0)
|
||||
ffi (>= 1.3.0)
|
||||
eventmachine (1.0.8)
|
||||
excon (0.45.4)
|
||||
execjs (2.6.0)
|
||||
eye (0.7.pre)
|
||||
celluloid (~> 0.16.0)
|
||||
celluloid-io (~> 0.16.0)
|
||||
sigar (~> 0.7.2)
|
||||
eye (0.8.pre)
|
||||
celluloid (~> 0.17.0)
|
||||
celluloid-io (~> 0.17.0)
|
||||
sigar (~> 0.7.3)
|
||||
state_machine
|
||||
thor
|
||||
factory_girl (4.5.0)
|
||||
|
|
@ -209,12 +254,13 @@ GEM
|
|||
fixture_builder (0.4.1)
|
||||
activerecord (>= 2)
|
||||
activesupport (>= 2)
|
||||
fog (1.32.0)
|
||||
fog (1.34.0)
|
||||
fog-atmos
|
||||
fog-aws (>= 0.6.0)
|
||||
fog-brightbox (~> 0.4)
|
||||
fog-core (~> 1.32)
|
||||
fog-ecloud (= 0.1.1)
|
||||
fog-dynect (~> 0.0.2)
|
||||
fog-ecloud (~> 0.1)
|
||||
fog-google (>= 0.0.2)
|
||||
fog-json
|
||||
fog-local
|
||||
|
|
@ -235,23 +281,27 @@ GEM
|
|||
fog-atmos (0.1.0)
|
||||
fog-core
|
||||
fog-xml
|
||||
fog-aws (0.7.3)
|
||||
fog-aws (0.7.6)
|
||||
fog-core (~> 1.27)
|
||||
fog-json (~> 1.0)
|
||||
fog-xml (~> 0.1)
|
||||
ipaddress (~> 0.8)
|
||||
fog-brightbox (0.8.0)
|
||||
fog-brightbox (0.9.0)
|
||||
fog-core (~> 1.22)
|
||||
fog-json
|
||||
inflecto (~> 0.0.2)
|
||||
fog-core (1.32.0)
|
||||
fog-core (1.32.1)
|
||||
builder
|
||||
excon (~> 0.45)
|
||||
formatador (~> 0.2)
|
||||
mime-types
|
||||
net-scp (~> 1.1)
|
||||
net-ssh (>= 2.1.3)
|
||||
fog-ecloud (0.1.1)
|
||||
fog-dynect (0.0.2)
|
||||
fog-core
|
||||
fog-json
|
||||
fog-xml
|
||||
fog-ecloud (0.3.0)
|
||||
fog-core
|
||||
fog-xml
|
||||
fog-google (0.0.7)
|
||||
|
|
@ -279,7 +329,7 @@ GEM
|
|||
fog-core
|
||||
fog-json
|
||||
fog-xml
|
||||
fog-sakuracloud (1.0.1)
|
||||
fog-sakuracloud (1.1.1)
|
||||
fog-core
|
||||
fog-json
|
||||
fog-serverlove (0.1.2)
|
||||
|
|
@ -338,16 +388,16 @@ GEM
|
|||
guard-jshintrb (1.1.1)
|
||||
guard (~> 2.0)
|
||||
jshintrb
|
||||
guard-rspec (4.6.3)
|
||||
guard-rspec (4.6.4)
|
||||
guard (~> 2.1)
|
||||
guard-compat (~> 1.1)
|
||||
rspec (>= 2.99.0, < 4.0)
|
||||
guard-rubocop (1.2.0)
|
||||
guard (~> 2.0)
|
||||
rubocop (~> 0.20)
|
||||
haml (4.0.6)
|
||||
haml (4.0.7)
|
||||
tilt
|
||||
haml_lint (0.13.0)
|
||||
haml_lint (0.15.2)
|
||||
haml (~> 4.0)
|
||||
rubocop (>= 0.25.0)
|
||||
sysexits (~> 1.1)
|
||||
|
|
@ -359,11 +409,15 @@ GEM
|
|||
hashie (3.4.2)
|
||||
hike (1.2.3)
|
||||
hiredis (0.5.2)
|
||||
hitimes (1.2.2)
|
||||
http (0.6.4)
|
||||
hitimes (1.2.3)
|
||||
http (0.9.6)
|
||||
addressable (~> 2.3)
|
||||
http-cookie (~> 1.0)
|
||||
http-form_data (~> 1.0.1)
|
||||
http_parser.rb (~> 0.6.0)
|
||||
http-cookie (1.0.2)
|
||||
domain_name (~> 0.5)
|
||||
http-form_data (1.0.1)
|
||||
http_accept_language (2.0.5)
|
||||
http_parser.rb (0.6.0)
|
||||
httparty (0.13.5)
|
||||
|
|
@ -379,20 +433,20 @@ GEM
|
|||
ice_cube (0.11.1)
|
||||
inflecto (0.0.2)
|
||||
ipaddress (0.8.0)
|
||||
jasmine (2.3.0)
|
||||
jasmine (2.3.1)
|
||||
jasmine-core (~> 2.3)
|
||||
phantomjs
|
||||
rack (>= 1.2.1)
|
||||
rake
|
||||
jasmine-core (2.3.4)
|
||||
jasmine-jquery-rails (2.0.3)
|
||||
jquery-rails (4.0.4)
|
||||
jquery-rails (4.0.5)
|
||||
rails-dom-testing (~> 1.0)
|
||||
railties (>= 4.2.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
jquery-ui-rails (5.0.5)
|
||||
railties (>= 3.2.16)
|
||||
js-routes (1.0.1)
|
||||
js-routes (1.1.2)
|
||||
railties (>= 3.2)
|
||||
sprockets-rails
|
||||
js_image_paths (0.0.2)
|
||||
|
|
@ -408,11 +462,11 @@ GEM
|
|||
kaminari (0.16.3)
|
||||
actionpack (>= 3.0.0)
|
||||
activesupport (>= 3.0.0)
|
||||
kgio (2.9.3)
|
||||
kgio (2.10.0)
|
||||
listen (3.0.3)
|
||||
rb-fsevent (>= 0.9.3)
|
||||
rb-inotify (>= 0.9)
|
||||
little-plugger (1.1.3)
|
||||
little-plugger (1.1.4)
|
||||
logging (2.0.0)
|
||||
little-plugger (~> 1.1)
|
||||
multi_json (~> 1.10)
|
||||
|
|
@ -425,14 +479,13 @@ GEM
|
|||
systemu (~> 2.6.2)
|
||||
mail (2.6.3)
|
||||
mime-types (>= 1.16, < 3)
|
||||
markerb (1.0.2)
|
||||
redcarpet (>= 2.0)
|
||||
markerb (1.1.0)
|
||||
memoizable (0.4.2)
|
||||
thread_safe (~> 0.3, >= 0.3.1)
|
||||
messagebus_ruby_api (1.0.3)
|
||||
method_source (0.8.2)
|
||||
mime-types (2.6.1)
|
||||
mini_magick (4.2.7)
|
||||
mime-types (2.6.2)
|
||||
mini_magick (4.3.3)
|
||||
mini_portile (0.6.2)
|
||||
minitest (5.8.0)
|
||||
mobile-fu (1.3.1)
|
||||
|
|
@ -442,8 +495,8 @@ GEM
|
|||
multi_test (0.1.2)
|
||||
multi_xml (0.5.5)
|
||||
multipart-post (2.0.0)
|
||||
mysql2 (0.3.18)
|
||||
naught (1.0.0)
|
||||
mysql2 (0.3.20)
|
||||
naught (1.1.0)
|
||||
nenv (0.2.0)
|
||||
nested_form (0.3.2)
|
||||
net-scp (1.2.1)
|
||||
|
|
@ -452,7 +505,7 @@ GEM
|
|||
nio4r (1.1.1)
|
||||
nokogiri (1.6.6.2)
|
||||
mini_portile (~> 0.6.0)
|
||||
notiffany (0.0.7)
|
||||
notiffany (0.0.8)
|
||||
nenv (~> 0.1)
|
||||
shellany (~> 0.0)
|
||||
oauth (0.4.7)
|
||||
|
|
@ -462,7 +515,7 @@ GEM
|
|||
multi_json (~> 1.3)
|
||||
multi_xml (~> 0.5)
|
||||
rack (~> 1.2)
|
||||
octokit (3.8.0)
|
||||
octokit (4.1.0)
|
||||
sawyer (~> 0.6.0, >= 0.5.3)
|
||||
omniauth (1.2.2)
|
||||
hashie (>= 1.2, < 4)
|
||||
|
|
@ -477,7 +530,7 @@ GEM
|
|||
omniauth (~> 1.2)
|
||||
omniauth-tumblr (1.1)
|
||||
omniauth-oauth (~> 1.0)
|
||||
omniauth-twitter (1.2.0)
|
||||
omniauth-twitter (1.2.1)
|
||||
json (~> 1.3)
|
||||
omniauth-oauth (~> 1.1)
|
||||
omniauth-wordpress (0.2.2)
|
||||
|
|
@ -488,23 +541,23 @@ GEM
|
|||
orm_adapter (0.5.0)
|
||||
parser (2.2.2.6)
|
||||
ast (>= 1.1, < 3.0)
|
||||
pg (0.18.2)
|
||||
pg (0.18.3)
|
||||
phantomjs (1.9.8.0)
|
||||
powerpack (0.1.1)
|
||||
pronto (0.4.2)
|
||||
pronto (0.4.3)
|
||||
gitlab (~> 3.4.0)
|
||||
octokit (~> 3.8.0)
|
||||
rugged (~> 0.22.0)
|
||||
octokit (~> 4.1.0)
|
||||
rugged (~> 0.23.0)
|
||||
thor (~> 0.19.0)
|
||||
pronto-haml (0.4.3)
|
||||
haml_lint (~> 0.13.0)
|
||||
pronto-haml (0.4.4)
|
||||
haml_lint (~> 0.15.0)
|
||||
pronto (~> 0.4.0)
|
||||
pronto-jshint (0.4.2)
|
||||
jshintrb (~> 0.3.0)
|
||||
pronto (~> 0.4.0)
|
||||
pronto-rubocop (0.4.4)
|
||||
pronto-rubocop (0.4.6)
|
||||
pronto (~> 0.4.0)
|
||||
rubocop (~> 0.32.0)
|
||||
rubocop (~> 0.34.0)
|
||||
pry (0.10.1)
|
||||
coderay (~> 1.1.0)
|
||||
method_source (~> 0.8.1)
|
||||
|
|
@ -545,7 +598,7 @@ GEM
|
|||
bundler (>= 1.3.0, < 2.0)
|
||||
railties (= 4.2.4)
|
||||
sprockets-rails
|
||||
rails-assets-autosize (3.0.8)
|
||||
rails-assets-autosize (3.0.9)
|
||||
rails-assets-blueimp-gallery (2.16.0)
|
||||
rails-assets-colorbox (1.6.3)
|
||||
rails-assets-jquery (>= 1.3.2)
|
||||
|
|
@ -557,7 +610,7 @@ GEM
|
|||
rails-assets-jquery.slimscroll (= 1.3.6)
|
||||
rails-assets-jquery.ui (= 1.11.4)
|
||||
rails-assets-favico.js (0.3.9)
|
||||
rails-assets-highlightjs (8.6.0)
|
||||
rails-assets-highlightjs (8.8.0)
|
||||
rails-assets-jakobmattsson--jquery-elastic (1.6.11)
|
||||
rails-assets-jquery (>= 1.2.6)
|
||||
rails-assets-jasmine (2.3.4)
|
||||
|
|
@ -582,7 +635,7 @@ GEM
|
|||
rails-assets-markdown-it-sanitizer (0.3.2)
|
||||
rails-assets-markdown-it-sub (1.0.0)
|
||||
rails-assets-markdown-it-sup (1.0.0)
|
||||
rails-assets-perfect-scrollbar (0.6.4)
|
||||
rails-assets-perfect-scrollbar (0.6.5)
|
||||
rails-assets-typeahead.js (0.11.1)
|
||||
rails-assets-jquery (>= 1.7)
|
||||
rails-deprecated_sanitizer (1.0.3)
|
||||
|
|
@ -593,7 +646,7 @@ GEM
|
|||
rails-deprecated_sanitizer (>= 1.0.1)
|
||||
rails-html-sanitizer (1.0.2)
|
||||
loofah (~> 2.0)
|
||||
rails-i18n (4.0.4)
|
||||
rails-i18n (4.0.5)
|
||||
i18n (~> 0.6)
|
||||
railties (~> 4.0)
|
||||
rails-timeago (2.11.0)
|
||||
|
|
@ -621,7 +674,7 @@ GEM
|
|||
rainbow (2.0.0)
|
||||
raindrops (0.15.0)
|
||||
rake (10.4.2)
|
||||
rb-fsevent (0.9.5)
|
||||
rb-fsevent (0.9.6)
|
||||
rb-inotify (0.9.5)
|
||||
ffi (>= 0.5.0)
|
||||
redcarpet (3.3.2)
|
||||
|
|
@ -644,8 +697,9 @@ GEM
|
|||
rspec-expectations (3.3.1)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.3.0)
|
||||
rspec-instafail (0.2.6)
|
||||
rspec-instafail (0.4.0)
|
||||
rspec
|
||||
rspec-logsplit (0.1.3)
|
||||
rspec-mocks (3.3.2)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.3.0)
|
||||
|
|
@ -658,7 +712,7 @@ GEM
|
|||
rspec-mocks (~> 3.3.0)
|
||||
rspec-support (~> 3.3.0)
|
||||
rspec-support (3.3.0)
|
||||
rubocop (0.32.1)
|
||||
rubocop (0.34.1)
|
||||
astrolabe (~> 1.3)
|
||||
parser (>= 2.2.2.5, < 3.0)
|
||||
powerpack (~> 0.1)
|
||||
|
|
@ -667,15 +721,15 @@ GEM
|
|||
ruby-oembed (0.8.14)
|
||||
ruby-progressbar (1.7.5)
|
||||
rubyzip (1.1.7)
|
||||
rugged (0.22.2)
|
||||
rugged (0.23.2)
|
||||
safe_yaml (1.0.4)
|
||||
sass (3.4.16)
|
||||
sass-rails (5.0.1)
|
||||
sass (3.4.18)
|
||||
sass-rails (5.0.4)
|
||||
railties (>= 4.0.0, < 5.0)
|
||||
sass (~> 3.1)
|
||||
sprockets (>= 2.8, < 4.0)
|
||||
sprockets-rails (>= 2.0, < 4.0)
|
||||
tilt (~> 1.1)
|
||||
tilt (>= 1.1, < 3)
|
||||
sawyer (0.6.0)
|
||||
addressable (~> 2.3.5)
|
||||
faraday (~> 0.8, < 0.10)
|
||||
|
|
@ -687,8 +741,8 @@ GEM
|
|||
shellany (0.0.1)
|
||||
shoulda-matchers (2.8.0)
|
||||
activesupport (>= 3.0.0)
|
||||
sidekiq (3.4.2)
|
||||
celluloid (~> 0.16.0)
|
||||
sidekiq (3.5.0)
|
||||
celluloid (~> 0.17.0)
|
||||
connection_pool (~> 2.2, >= 2.2.0)
|
||||
json (~> 1.0)
|
||||
redis (~> 3.2, >= 3.2.1)
|
||||
|
|
@ -713,7 +767,7 @@ GEM
|
|||
sinon-rails (1.15.0)
|
||||
railties (>= 3.1)
|
||||
slop (3.6.0)
|
||||
spring (1.3.6)
|
||||
spring (1.4.0)
|
||||
spring-commands-cucumber (1.0.1)
|
||||
spring (>= 0.9.1)
|
||||
spring-commands-rspec (1.0.4)
|
||||
|
|
@ -723,7 +777,7 @@ GEM
|
|||
multi_json (~> 1.0)
|
||||
rack (~> 1.0)
|
||||
tilt (~> 1.1, != 1.3.0)
|
||||
sprockets-rails (2.3.2)
|
||||
sprockets-rails (2.3.3)
|
||||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
sprockets (>= 2.8, < 4.0)
|
||||
|
|
@ -737,23 +791,23 @@ GEM
|
|||
thread_safe (0.3.5)
|
||||
tilt (1.4.1)
|
||||
timecop (0.8.0)
|
||||
timers (4.0.1)
|
||||
timers (4.1.1)
|
||||
hitimes
|
||||
twitter (5.14.0)
|
||||
twitter (5.15.0)
|
||||
addressable (~> 2.3)
|
||||
buftok (~> 0.2.0)
|
||||
equalizer (~> 0.0.9)
|
||||
equalizer (= 0.0.10)
|
||||
faraday (~> 0.9.0)
|
||||
http (~> 0.6.0)
|
||||
http (>= 0.4, < 0.10)
|
||||
http_parser.rb (~> 0.6.0)
|
||||
json (~> 1.8)
|
||||
memoizable (~> 0.4.0)
|
||||
naught (~> 1.0)
|
||||
simple_oauth (~> 0.3.0)
|
||||
twitter-text (1.12.0)
|
||||
twitter-text (1.13.0)
|
||||
unf (~> 0.1.0)
|
||||
typhoeus (0.7.2)
|
||||
ethon (>= 0.7.4)
|
||||
typhoeus (0.8.0)
|
||||
ethon (>= 0.8.0)
|
||||
tzinfo (1.2.2)
|
||||
thread_safe (~> 0.1)
|
||||
uglifier (2.7.2)
|
||||
|
|
@ -768,7 +822,7 @@ GEM
|
|||
raindrops (~> 0.7)
|
||||
uuid (2.3.8)
|
||||
macaddr (~> 1.0)
|
||||
valid (1.0.0)
|
||||
valid (1.0.2)
|
||||
warden (1.2.3)
|
||||
rack (>= 1.0)
|
||||
webmock (1.21.0)
|
||||
|
|
@ -789,69 +843,69 @@ DEPENDENCIES
|
|||
acts_as_api (= 0.4.2)
|
||||
addressable (= 2.3.8)
|
||||
asset_sync (= 1.1.0)
|
||||
autoprefixer-rails (= 5.2.1.1)
|
||||
autoprefixer-rails (= 6.0.3)
|
||||
backbone-on-rails (= 1.2.0.0)
|
||||
bootstrap-sass (= 3.3.5.1)
|
||||
bootstrap-switch-rails (= 3.3.3)
|
||||
capybara (= 2.4.4)
|
||||
capybara (= 2.5.0)
|
||||
carrierwave (= 0.10.0)
|
||||
compass-rails (= 2.0.4)
|
||||
compass-rails (= 2.0.5)
|
||||
configurate (= 0.3.1)
|
||||
cucumber-rails (= 1.4.2)
|
||||
database_cleaner (= 1.4.1)
|
||||
devise (= 3.5.1)
|
||||
database_cleaner (= 1.5.0)
|
||||
devise (= 3.5.2)
|
||||
devise-token_authenticatable (~> 0.4.0)
|
||||
devise_lastseenable (= 0.0.6)
|
||||
diaspora-vines (~> 0.2.0.develop)
|
||||
diaspora_federation-rails (= 0.0.7)
|
||||
diaspora_federation-rails (= 0.0.8)
|
||||
entypo-rails (= 3.0.0.pre.rc2)
|
||||
eye (= 0.7.pre)
|
||||
eye (= 0.8.pre)
|
||||
factory_girl_rails (= 4.5.0)
|
||||
faraday (= 0.9.1)
|
||||
faraday-cookie_jar (= 0.0.6)
|
||||
faraday_middleware (= 0.10.0)
|
||||
fixture_builder (= 0.4.1)
|
||||
fog (= 1.32.0)
|
||||
fog (= 1.34.0)
|
||||
fuubar (= 2.0.0)
|
||||
gon (= 6.0.1)
|
||||
guard (= 2.13.0)
|
||||
guard-cucumber (= 1.5.4)
|
||||
guard-jshintrb (= 1.1.1)
|
||||
guard-rspec (= 4.6.3)
|
||||
guard-rspec (= 4.6.4)
|
||||
guard-rubocop (= 1.2.0)
|
||||
haml (= 4.0.6)
|
||||
haml_lint (= 0.13.0)
|
||||
haml (= 4.0.7)
|
||||
haml_lint (= 0.15.2)
|
||||
handlebars_assets (= 0.20.2)
|
||||
http_accept_language (= 2.0.5)
|
||||
i18n-inflector-rails (= 1.0.7)
|
||||
jasmine (= 2.3.0)
|
||||
jasmine (= 2.3.1)
|
||||
jasmine-jquery-rails (= 2.0.3)
|
||||
jquery-rails (= 4.0.4)
|
||||
jquery-rails (= 4.0.5)
|
||||
jquery-ui-rails (= 5.0.5)
|
||||
js-routes (= 1.0.1)
|
||||
js-routes (= 1.1.2)
|
||||
js_image_paths (= 0.0.2)
|
||||
jshintrb (= 0.3.0)
|
||||
json (= 1.8.3)
|
||||
json-schema (= 2.5.1)
|
||||
logging-rails (= 0.5.0)
|
||||
markerb (= 1.0.2)
|
||||
markerb (= 1.1.0)
|
||||
messagebus_ruby_api (= 1.0.3)
|
||||
mini_magick (= 4.2.7)
|
||||
mini_magick (= 4.3.3)
|
||||
minitest
|
||||
mobile-fu (= 1.3.1)
|
||||
mysql2 (= 0.3.18)
|
||||
mysql2 (= 0.3.20)
|
||||
nokogiri (= 1.6.6.2)
|
||||
omniauth (= 1.2.2)
|
||||
omniauth-facebook (= 2.0.1)
|
||||
omniauth-tumblr (= 1.1)
|
||||
omniauth-twitter (= 1.2.0)
|
||||
omniauth-twitter (= 1.2.1)
|
||||
omniauth-wordpress (= 0.2.2)
|
||||
open_graph_reader (= 0.6.1)
|
||||
pg (= 0.18.2)
|
||||
pronto (= 0.4.2)
|
||||
pronto-haml (= 0.4.3)
|
||||
pg (= 0.18.3)
|
||||
pronto (= 0.4.3)
|
||||
pronto-haml (= 0.4.4)
|
||||
pronto-jshint (= 0.4.2)
|
||||
pronto-rubocop (= 0.4.4)
|
||||
pronto-rubocop (= 0.4.6)
|
||||
pry
|
||||
pry-byebug
|
||||
pry-debundle
|
||||
|
|
@ -863,10 +917,10 @@ DEPENDENCIES
|
|||
rack-rewrite (= 1.5.1)
|
||||
rack-ssl (= 1.4.1)
|
||||
rails (= 4.2.4)
|
||||
rails-assets-autosize (= 3.0.8)!
|
||||
rails-assets-autosize (= 3.0.9)!
|
||||
rails-assets-blueimp-gallery (= 2.16.0)!
|
||||
rails-assets-diaspora_jsxc (~> 0.1.4.develop)!
|
||||
rails-assets-highlightjs (= 8.6.0)!
|
||||
rails-assets-highlightjs (= 8.8.0)!
|
||||
rails-assets-jakobmattsson--jquery-elastic (= 1.6.11)!
|
||||
rails-assets-jasmine-ajax (= 3.2.0)!
|
||||
rails-assets-jeresig--jquery.hotkeys (= 0.2.0)!
|
||||
|
|
@ -880,39 +934,39 @@ DEPENDENCIES
|
|||
rails-assets-markdown-it-sanitizer (= 0.3.2)!
|
||||
rails-assets-markdown-it-sub (= 1.0.0)!
|
||||
rails-assets-markdown-it-sup (= 1.0.0)!
|
||||
rails-assets-perfect-scrollbar (= 0.6.4)!
|
||||
rails-assets-perfect-scrollbar (= 0.6.5)!
|
||||
rails-assets-typeahead.js (= 0.11.1)!
|
||||
rails-i18n (= 4.0.4)
|
||||
rails-i18n (= 4.0.5)
|
||||
rails-timeago (= 2.11.0)
|
||||
rails_admin (= 0.7.0)
|
||||
rb-fsevent (= 0.9.5)
|
||||
rb-fsevent (= 0.9.6)
|
||||
rb-inotify (= 0.9.5)
|
||||
redcarpet (= 3.3.2)
|
||||
remotipart (= 1.2.1)
|
||||
responders (= 2.1.0)
|
||||
roxml (= 3.1.6)
|
||||
rspec-instafail (= 0.2.6)
|
||||
rspec-instafail (= 0.4.0)
|
||||
rspec-rails (= 3.3.3)
|
||||
rubocop (= 0.32.1)
|
||||
rubocop (= 0.34.1)
|
||||
ruby-oembed (= 0.8.14)
|
||||
rubyzip (= 1.1.7)
|
||||
sass-rails (= 5.0.1)
|
||||
sass-rails (= 5.0.4)
|
||||
selenium-webdriver (= 2.47.1)
|
||||
shoulda-matchers (= 2.8.0)
|
||||
sidekiq (= 3.4.2)
|
||||
sidekiq (= 3.5.0)
|
||||
sidetiq (= 0.6.3)
|
||||
simple_captcha2 (= 0.3.4)
|
||||
simplecov (= 0.10.0)
|
||||
sinatra (= 1.4.6)
|
||||
sinon-rails (= 1.15.0)
|
||||
spring (= 1.3.6)
|
||||
spring (= 1.4.0)
|
||||
spring-commands-cucumber (= 1.0.1)
|
||||
spring-commands-rspec (= 1.0.4)
|
||||
test_after_commit (= 0.4.1)
|
||||
timecop (= 0.8.0)
|
||||
twitter (= 5.14.0)
|
||||
twitter-text (= 1.12.0)
|
||||
typhoeus (= 0.7.2)
|
||||
twitter (= 5.15.0)
|
||||
twitter-text (= 1.13.0)
|
||||
typhoeus (= 0.8.0)
|
||||
uglifier (= 2.7.2)
|
||||
unicorn (= 4.9.0)
|
||||
uuid (= 2.3.8)
|
||||
|
|
|
|||
Loading…
Reference in a new issue