Merge branch 'stable' into develop

This commit is contained in:
Jonne Haß 2016-05-12 13:34:10 +02:00
commit b4a63e7369
No known key found for this signature in database
GPG key ID: F347E0EB47AC70D6
3 changed files with 239 additions and 216 deletions

View file

@ -1,9 +1,11 @@
AllCops: AllCops:
RunRailsCops: true
Exclude: Exclude:
- "bin/**/*" - "bin/**/*"
- "db/schema.rb" - "db/schema.rb"
Rails:
Enabled: true
# Commonly used screens these days easily fit more than 80 characters. # Commonly used screens these days easily fit more than 80 characters.
Metrics/LineLength: Metrics/LineLength:
Max: 120 Max: 120

81
Gemfile
View file

@ -1,14 +1,14 @@
source "https://rubygems.org" source "https://rubygems.org"
gem "rails", "4.2.5.2" gem "rails", "4.2.6"
# Legacy Rails features, remove me! # Legacy Rails features, remove me!
# responders (class level) # responders (class level)
gem "responders", "2.1.1" gem "responders", "2.2.0"
# Appserver # Appserver
gem "unicorn", "5.0.1", require: false gem "unicorn", "5.1.0", require: false
gem "unicorn-worker-killer", "0.4.4" gem "unicorn-worker-killer", "0.4.4"
# Federation # Federation
@ -19,13 +19,13 @@ gem "diaspora_federation-rails", "0.0.13"
gem "acts_as_api", "0.4.2" gem "acts_as_api", "0.4.2"
gem "json", "1.8.3" gem "json", "1.8.3"
gem "json-schema", "2.6.0" gem "json-schema", "2.6.1"
# Authentication # Authentication
gem "devise", "3.5.6" gem "devise", "3.5.6"
gem "devise_lastseenable", "0.0.6" gem "devise_lastseenable", "0.0.6"
gem "devise-token_authenticatable", "~> 0.4.0" gem "devise-token_authenticatable", "0.4.6"
# Captcha # Captcha
@ -42,7 +42,7 @@ gem "sidekiq-cron", "0.4.2"
# Compression # Compression
gem "uglifier", "2.7.2" gem "uglifier", "3.0.0"
# Configuration # Configuration
@ -57,25 +57,26 @@ gem "rack-cors", "0.4.0", require: "rack/cors"
gem "bootstrap-sass", "3.3.6" gem "bootstrap-sass", "3.3.6"
gem "compass-rails", "2.0.5" gem "compass-rails", "2.0.5"
gem "sass-rails", "5.0.4" gem "sass-rails", "5.0.4"
gem "autoprefixer-rails", "6.3.3.1" gem "autoprefixer-rails", "6.3.6"
gem "bootstrap-switch-rails", "3.3.3" gem "bootstrap-switch-rails", "3.3.3"
# Database # Database
group :mysql, optional: true do group :mysql, optional: true do
gem "mysql2", "0.4.3" gem "mysql2", "0.4.4"
end end
group :postgresql, optional: true do group :postgresql, optional: true do
gem "pg", "0.18.4" gem "pg", "0.18.4"
end end
gem "activerecord-import", "0.11.0"
gem "activerecord-import", "0.13.0"
# File uploading # File uploading
gem "carrierwave", "0.10.0" gem "carrierwave", "0.11.2"
gem "fog", "1.37.0" gem "fog", "1.38.0"
gem "mini_magick", "4.4.0" gem "mini_magick", "4.5.1"
gem "remotipart", "1.2.1" gem "remotipart", "1.2.1"
# GUID generation # GUID generation
@ -89,29 +90,29 @@ gem "entypo-rails", "3.0.0.pre.rc2"
gem "backbone-on-rails", "1.2.0.0" gem "backbone-on-rails", "1.2.0.0"
gem "handlebars_assets", "0.23.0" gem "handlebars_assets", "0.23.0"
gem "jquery-rails", "4.1.0" gem "jquery-rails", "4.1.1"
gem "jquery-ui-rails", "5.0.5" gem "jquery-ui-rails", "5.0.5"
gem "js_image_paths", "0.1.0" gem "js_image_paths", "0.1.0"
gem "js-routes", "1.2.4" gem "js-routes", "1.2.5"
source "https://rails-assets.org" do source "https://rails-assets.org" do
gem "rails-assets-jquery", "1.12.0" # Should be kept in sync with jquery-rails gem "rails-assets-jquery", "1.12.0" # Should be kept in sync with jquery-rails
gem "rails-assets-markdown-it", "6.0.0" gem "rails-assets-markdown-it", "6.0.1"
gem "rails-assets-markdown-it-hashtag", "0.4.0" gem "rails-assets-markdown-it-hashtag", "0.4.0"
gem "rails-assets-markdown-it-diaspora-mention", "0.4.0" gem "rails-assets-markdown-it-diaspora-mention", "0.4.0"
gem "rails-assets-markdown-it-sanitizer", "0.4.1" gem "rails-assets-markdown-it-sanitizer", "0.4.1"
gem "rails-assets-markdown-it--markdown-it-for-inline", "0.1.1" 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-sub", "1.0.0"
gem "rails-assets-markdown-it-sup", "1.0.0" gem "rails-assets-markdown-it-sup", "1.0.0"
gem "rails-assets-highlightjs", "9.1.0" gem "rails-assets-highlightjs", "9.2.0"
gem "rails-assets-typeahead.js", "0.11.1" gem "rails-assets-typeahead.js", "0.11.1"
# jQuery plugins # jQuery plugins
gem "rails-assets-jquery-placeholder", "2.3.1" gem "rails-assets-jquery-placeholder", "2.3.1"
gem "rails-assets-jquery-textchange", "0.2.3" gem "rails-assets-jquery-textchange", "0.2.3"
gem "rails-assets-perfect-scrollbar", "0.6.10" gem "rails-assets-perfect-scrollbar", "0.6.11"
gem "rails-assets-autosize", "3.0.15" gem "rails-assets-autosize", "3.0.15"
gem "rails-assets-blueimp-gallery", "2.17.0" gem "rails-assets-blueimp-gallery", "2.17.0"
end end
@ -134,9 +135,9 @@ gem "leaflet-rails", "0.7.4"
gem "nokogiri", "1.6.7.2" gem "nokogiri", "1.6.7.2"
gem "redcarpet", "3.3.4" gem "redcarpet", "3.3.4"
gem "twitter-text", "1.13.3" gem "twitter-text", "1.13.4"
gem "roxml", "3.1.6" gem "roxml", "3.1.6"
gem "ruby-oembed", "0.9.0" gem "ruby-oembed", "0.10.0"
gem "open_graph_reader", "0.6.1" gem "open_graph_reader", "0.6.1"
# Services # Services
@ -153,11 +154,11 @@ gem "openid_connect", "0.10.0"
# Serializers # Serializers
gem "active_model_serializers", "0.9.4" gem "active_model_serializers", "0.9.5"
# XMPP chat dependencies # XMPP chat dependencies
gem "diaspora-prosody-config", "~> 0.0.5" gem "diaspora-prosody-config", "0.0.5"
gem "rails-assets-diaspora_jsxc", "~> 0.1.5.develop", source: "https://rails-assets.org" gem "rails-assets-diaspora_jsxc", "0.1.5.develop.1", source: "https://rails-assets.org"
# Tags # Tags
@ -169,7 +170,7 @@ gem "addressable", "2.3.8", require: "addressable/uri"
gem "faraday", "0.9.2" gem "faraday", "0.9.2"
gem "faraday_middleware", "0.10.0" gem "faraday_middleware", "0.10.0"
gem "faraday-cookie_jar", "0.0.6" gem "faraday-cookie_jar", "0.0.6"
gem "typhoeus", "1.0.1" gem "typhoeus", "1.0.2"
# Views # Views
@ -185,7 +186,7 @@ gem "logging-rails", "0.5.0", require: "logging/rails"
# Reading and writing zip files # Reading and writing zip files
gem "rubyzip", "1.1.7", require: "zip" gem "rubyzip", "1.2.0", require: "zip"
# Prevent occasions where minitest is not bundled in # Prevent occasions where minitest is not bundled in
# packaged versions of ruby. See following issues/prs: # packaged versions of ruby. See following issues/prs:
@ -233,9 +234,9 @@ end
group :development do group :development do
# Automatic test runs # Automatic test runs
gem "guard-cucumber", "1.5.4" gem "guard-cucumber", "2.1.2"
gem "guard-jshintrb", "1.1.1" gem "guard-jshintrb", "1.1.1"
gem "guard-rspec", "4.6.4" gem "guard-rspec", "4.6.5"
gem "guard-rubocop", "1.2.0" gem "guard-rubocop", "1.2.0"
gem "guard", "2.13.0", require: false gem "guard", "2.13.0", require: false
gem "rb-fsevent", "0.9.7", require: false gem "rb-fsevent", "0.9.7", require: false
@ -243,17 +244,17 @@ group :development do
# Linters # Linters
gem "jshintrb", "0.3.0" gem "jshintrb", "0.3.0"
gem "rubocop", "0.35.1" gem "rubocop", "0.40.0"
gem "haml_lint", "0.15.2" gem "haml_lint", "0.17.1"
gem "pronto", "0.5.3" gem "pronto", "0.6.0"
gem "pronto-jshint", "0.5.0" gem "pronto-jshint", "0.6.0"
gem "pronto-rubocop", "0.5.0" gem "pronto-rubocop", "0.6.2"
gem "pronto-haml", "0.5.0" gem "pronto-haml", "0.6.0"
gem "pronto-scss", "0.5.0", require: false gem "pronto-scss", "0.6.0", require: false
# Preloading environment # Preloading environment
gem "spring", "1.6.3" gem "spring", "1.7.1"
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,13 +274,13 @@ group :test do
gem "fixture_builder", "0.4.1" gem "fixture_builder", "0.4.1"
gem "fuubar", "2.0.0" gem "fuubar", "2.0.0"
gem "rspec-instafail", "0.4.0", require: false gem "rspec-instafail", "0.5.0", require: false
gem "test_after_commit", "0.4.2" gem "test_after_commit", "1.0.0"
# Cucumber (integration tests) # Cucumber (integration tests)
gem "capybara", "2.6.2" gem "capybara", "2.7.1"
gem "database_cleaner" , "1.5.1" gem "database_cleaner", "1.5.3"
gem "selenium-webdriver", "2.47.1" gem "selenium-webdriver", "2.47.1"
gem "cucumber-api-steps", "0.13", require: false gem "cucumber-api-steps", "0.13", require: false
@ -287,8 +288,8 @@ group :test do
# General helpers # General helpers
gem "factory_girl_rails", "4.6.0" gem "factory_girl_rails", "4.7.0"
gem "timecop", "0.8.0" gem "timecop", "0.8.1"
gem "webmock", "1.22.6", require: false gem "webmock", "1.22.6", require: false
gem "shoulda-matchers", "3.1.1" gem "shoulda-matchers", "3.1.1"

View file

@ -3,40 +3,40 @@ GEM
remote: https://rails-assets.org/ remote: https://rails-assets.org/
specs: specs:
CFPropertyList (2.3.2) CFPropertyList (2.3.2)
actionmailer (4.2.5.2) actionmailer (4.2.6)
actionpack (= 4.2.5.2) actionpack (= 4.2.6)
actionview (= 4.2.5.2) actionview (= 4.2.6)
activejob (= 4.2.5.2) activejob (= 4.2.6)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5) rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.5.2) actionpack (4.2.6)
actionview (= 4.2.5.2) actionview (= 4.2.6)
activesupport (= 4.2.5.2) activesupport (= 4.2.6)
rack (~> 1.6) rack (~> 1.6)
rack-test (~> 0.6.2) rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5) rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2) rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.5.2) actionview (4.2.6)
activesupport (= 4.2.5.2) activesupport (= 4.2.6)
builder (~> 3.1) builder (~> 3.1)
erubis (~> 2.7.0) erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5) rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2) rails-html-sanitizer (~> 1.0, >= 1.0.2)
active_model_serializers (0.9.4) active_model_serializers (0.9.5)
activemodel (>= 3.2) activemodel (>= 3.2)
activejob (4.2.5.2) activejob (4.2.6)
activesupport (= 4.2.5.2) activesupport (= 4.2.6)
globalid (>= 0.3.0) globalid (>= 0.3.0)
activemodel (4.2.5.2) activemodel (4.2.6)
activesupport (= 4.2.5.2) activesupport (= 4.2.6)
builder (~> 3.1) builder (~> 3.1)
activerecord (4.2.5.2) activerecord (4.2.6)
activemodel (= 4.2.5.2) activemodel (= 4.2.6)
activesupport (= 4.2.5.2) activesupport (= 4.2.6)
arel (~> 6.0) arel (~> 6.0)
activerecord-import (0.11.0) activerecord-import (0.13.0)
activerecord (>= 3.0) activerecord (>= 3.0)
activesupport (4.2.5.2) activesupport (4.2.6)
i18n (~> 0.7) i18n (~> 0.7)
json (~> 1.7, >= 1.7.7) json (~> 1.7, >= 1.7.7)
minitest (~> 5.1) minitest (~> 5.1)
@ -55,17 +55,15 @@ GEM
fog (>= 1.8.0) fog (>= 1.8.0)
unf unf
ast (2.2.0) ast (2.2.0)
astrolabe (1.3.1)
parser (~> 2.2)
attr_required (1.0.1) attr_required (1.0.1)
autoprefixer-rails (6.3.3.1) autoprefixer-rails (6.3.6)
execjs execjs
backbone-on-rails (1.2.0.0) backbone-on-rails (1.2.0.0)
eco eco
ejs ejs
jquery-rails jquery-rails
railties railties
bcrypt (3.1.10) bcrypt (3.1.11)
bindata (2.2.0) bindata (2.2.0)
bootstrap-sass (3.3.6) bootstrap-sass (3.3.6)
autoprefixer-rails (>= 5.2.1) autoprefixer-rails (>= 5.2.1)
@ -73,19 +71,20 @@ GEM
bootstrap-switch-rails (3.3.3) bootstrap-switch-rails (3.3.3)
buftok (0.2.0) buftok (0.2.0)
builder (3.2.2) builder (3.2.2)
byebug (8.2.2) byebug (8.2.5)
capybara (2.6.2) capybara (2.7.1)
addressable addressable
mime-types (>= 1.16) mime-types (>= 1.16)
nokogiri (>= 1.3.3) nokogiri (>= 1.3.3)
rack (>= 1.0.0) rack (>= 1.0.0)
rack-test (>= 0.5.4) rack-test (>= 0.5.4)
xpath (~> 2.0) xpath (~> 2.0)
carrierwave (0.10.0) carrierwave (0.11.2)
activemodel (>= 3.2.0) activemodel (>= 3.2.0)
activesupport (>= 3.2.0) activesupport (>= 3.2.0)
json (>= 1.7) json (>= 1.7)
mime-types (>= 1.16) mime-types (>= 1.16)
mimemagic (>= 0.3.0)
celluloid (0.17.3) celluloid (0.17.3)
celluloid-essentials celluloid-essentials
celluloid-extras celluloid-extras
@ -110,7 +109,7 @@ GEM
childprocess (0.5.9) childprocess (0.5.9)
ffi (~> 1.0, >= 1.0.11) ffi (~> 1.0, >= 1.0.11)
chunky_png (1.3.5) chunky_png (1.3.5)
coderay (1.1.0) coderay (1.1.1)
coffee-rails (4.1.1) coffee-rails (4.1.1)
coffee-script (>= 2.2.0) coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.1.x) railties (>= 4.0.0, < 5.1.x)
@ -139,7 +138,7 @@ GEM
connection_pool (2.2.0) connection_pool (2.2.0)
crack (0.4.3) crack (0.4.3)
safe_yaml (~> 1.0.0) safe_yaml (~> 1.0.0)
cucumber (2.3.2) cucumber (2.3.3)
builder (>= 2.1.2) builder (>= 2.1.2)
cucumber-core (~> 1.4.0) cucumber-core (~> 1.4.0)
cucumber-wire (~> 0.0.1) cucumber-wire (~> 0.0.1)
@ -160,7 +159,7 @@ GEM
nokogiri (~> 1.5) nokogiri (~> 1.5)
railties (>= 3, < 5) railties (>= 3, < 5)
cucumber-wire (0.0.1) cucumber-wire (0.0.1)
database_cleaner (1.5.1) database_cleaner (1.5.3)
devise (3.5.6) devise (3.5.6)
bcrypt (~> 3.0) bcrypt (~> 3.0)
orm_adapter (~> 0.1) orm_adapter (~> 0.1)
@ -168,8 +167,8 @@ GEM
responders responders
thread_safe (~> 0.1) thread_safe (~> 0.1)
warden (~> 1.2.3) warden (~> 1.2.3)
devise-token_authenticatable (0.4.0) devise-token_authenticatable (0.4.6)
devise (~> 3.5.0) devise (>= 3.5.2, < 4.0.0)
devise_lastseenable (0.0.6) devise_lastseenable (0.0.6)
devise devise
rails (>= 3.0.4) rails (>= 3.0.4)
@ -188,7 +187,7 @@ GEM
factory_girl (~> 4.5, >= 4.5.0) factory_girl (~> 4.5, >= 4.5.0)
diff-lcs (1.2.5) diff-lcs (1.2.5)
docile (1.1.5) docile (1.1.5)
domain_name (0.5.20160128) domain_name (0.5.20160310)
unf (>= 0.0.5, < 1.0.0) unf (>= 0.0.5, < 1.0.0)
eco (1.0.0) eco (1.0.0)
coffee-script coffee-script
@ -200,9 +199,9 @@ GEM
railties (>= 4.1, <= 5) railties (>= 4.1, <= 5)
equalizer (0.0.10) equalizer (0.0.10)
erubis (2.7.0) erubis (2.7.0)
ethon (0.8.1) ethon (0.9.0)
ffi (>= 1.3.0) ffi (>= 1.3.0)
excon (0.45.4) excon (0.49.0)
execjs (2.6.0) execjs (2.6.0)
eye (0.8) eye (0.8)
celluloid (~> 0.17.2) celluloid (~> 0.17.2)
@ -210,10 +209,10 @@ GEM
sigar (~> 0.7.3) sigar (~> 0.7.3)
state_machine state_machine
thor thor
factory_girl (4.5.0) factory_girl (4.7.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
factory_girl_rails (4.6.0) factory_girl_rails (4.7.0)
factory_girl (~> 4.5.0) factory_girl (~> 4.7.0)
railties (>= 3.0.0) railties (>= 3.0.0)
faraday (0.9.2) faraday (0.9.2)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
@ -228,19 +227,22 @@ GEM
fixture_builder (0.4.1) fixture_builder (0.4.1)
activerecord (>= 2) activerecord (>= 2)
activesupport (>= 2) activesupport (>= 2)
fog (1.37.0) fog (1.38.0)
fog-aliyun (>= 0.1.0) fog-aliyun (>= 0.1.0)
fog-atmos fog-atmos
fog-aws (>= 0.6.0) fog-aws (>= 0.6.0)
fog-brightbox (~> 0.4) fog-brightbox (~> 0.4)
fog-cloudatcost (~> 0.1.0)
fog-core (~> 1.32) fog-core (~> 1.32)
fog-dynect (~> 0.0.2) fog-dynect (~> 0.0.2)
fog-ecloud (~> 0.1) fog-ecloud (~> 0.1)
fog-google (<= 0.1.0) fog-google (<= 0.1.0)
fog-json fog-json
fog-local fog-local
fog-openstack
fog-powerdns (>= 0.1.1) fog-powerdns (>= 0.1.1)
fog-profitbricks fog-profitbricks
fog-rackspace
fog-radosgw (>= 0.0.2) fog-radosgw (>= 0.0.2)
fog-riakcs fog-riakcs
fog-sakuracloud (>= 0.0.4) fog-sakuracloud (>= 0.0.4)
@ -262,7 +264,7 @@ GEM
fog-atmos (0.1.0) fog-atmos (0.1.0)
fog-core fog-core
fog-xml fog-xml
fog-aws (0.8.1) fog-aws (0.9.2)
fog-core (~> 1.27) fog-core (~> 1.27)
fog-json (~> 1.0) fog-json (~> 1.0)
fog-xml (~> 0.1) fog-xml (~> 0.1)
@ -271,11 +273,16 @@ GEM
fog-core (~> 1.22) fog-core (~> 1.22)
fog-json fog-json
inflecto (~> 0.0.2) inflecto (~> 0.0.2)
fog-core (1.35.0) fog-cloudatcost (0.1.2)
fog-core (~> 1.36)
fog-json (~> 1.0)
fog-xml (~> 0.1)
ipaddress (~> 0.8)
fog-core (1.39.0)
builder builder
excon (~> 0.45) excon (~> 0.49)
formatador (~> 0.2) formatador (~> 0.2)
fog-dynect (0.0.2) fog-dynect (0.0.3)
fog-core fog-core
fog-json fog-json
fog-xml fog-xml
@ -289,8 +296,13 @@ GEM
fog-json (1.0.2) fog-json (1.0.2)
fog-core (~> 1.0) fog-core (~> 1.0)
multi_json (~> 1.10) multi_json (~> 1.10)
fog-local (0.2.1) fog-local (0.3.0)
fog-core (~> 1.27) fog-core (~> 1.27)
fog-openstack (0.1.5)
fog-core (>= 1.38)
fog-json (>= 1.0)
fog-xml (>= 0.1)
ipaddress (>= 0.8)
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)
@ -299,6 +311,11 @@ GEM
fog-core fog-core
fog-xml fog-xml
nokogiri nokogiri
fog-rackspace (0.1.1)
fog-core (>= 1.35)
fog-json (>= 1.0)
fog-xml (>= 0.1)
ipaddress (>= 0.8)
fog-radosgw (0.0.5) fog-radosgw (0.0.5)
fog-core (>= 1.21.0) fog-core (>= 1.21.0)
fog-json fog-json
@ -313,7 +330,7 @@ GEM
fog-serverlove (0.1.2) fog-serverlove (0.1.2)
fog-core fog-core
fog-json fog-json
fog-softlayer (1.0.3) fog-softlayer (1.1.1)
fog-core fog-core
fog-json fog-json
fog-storm_on_demand (0.1.1) fog-storm_on_demand (0.1.1)
@ -328,7 +345,7 @@ GEM
fog-voxel (0.1.0) fog-voxel (0.1.0)
fog-core fog-core
fog-xml fog-xml
fog-vsphere (0.6.0) fog-vsphere (0.6.4)
fog-core fog-core
rbvmomi (~> 1.8) rbvmomi (~> 1.8)
fog-xenserver (0.2.3) fog-xenserver (0.2.3)
@ -337,15 +354,15 @@ GEM
fog-xml (0.1.2) fog-xml (0.1.2)
fog-core fog-core
nokogiri (~> 1.5, >= 1.5.11) nokogiri (~> 1.5, >= 1.5.11)
font-awesome-rails (4.5.0.0) font-awesome-rails (4.6.2.0)
railties (>= 3.2, < 5.0) railties (>= 3.2, < 5.1)
formatador (0.2.5) formatador (0.2.5)
fuubar (2.0.0) fuubar (2.0.0)
rspec (~> 3.0) rspec (~> 3.0)
ruby-progressbar (~> 1.4) ruby-progressbar (~> 1.4)
get_process_mem (0.2.0) get_process_mem (0.2.0)
gherkin (3.2.0) gherkin (3.2.0)
gitlab (3.4.0) gitlab (3.6.1)
httparty httparty
terminal-table terminal-table
globalid (0.3.6) globalid (0.3.6)
@ -365,14 +382,14 @@ GEM
shellany (~> 0.0) shellany (~> 0.0)
thor (>= 0.18.1) thor (>= 0.18.1)
guard-compat (1.2.1) guard-compat (1.2.1)
guard-cucumber (1.5.4) guard-cucumber (2.1.2)
cucumber (>= 1.3.0) cucumber (~> 2.0)
guard-compat (~> 1.0) guard-compat (~> 1.0)
nenv (~> 0.1) nenv (~> 0.1)
guard-jshintrb (1.1.1) guard-jshintrb (1.1.1)
guard (~> 2.0) guard (~> 2.0)
jshintrb jshintrb
guard-rspec (4.6.4) guard-rspec (4.6.5)
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)
@ -381,9 +398,10 @@ GEM
rubocop (~> 0.20) rubocop (~> 0.20)
haml (4.0.7) haml (4.0.7)
tilt tilt
haml_lint (0.15.2) haml_lint (0.17.1)
haml (~> 4.0) haml (~> 4.0)
rubocop (>= 0.25.0) rake (>= 10, < 12)
rubocop (>= 0.36.0)
sysexits (~> 1.1) sysexits (~> 1.1)
hamlit (2.2.1) hamlit (2.2.1)
temple (~> 0.7.6) temple (~> 0.7.6)
@ -394,11 +412,11 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
sprockets (>= 2.0.0) sprockets (>= 2.0.0)
tilt (>= 1.2) tilt (>= 1.2)
hashdiff (0.2.3) hashdiff (0.3.0)
hashie (3.4.3) hashie (3.4.4)
hike (1.2.3) hike (1.2.3)
hitimes (1.2.3) hitimes (1.2.4)
http (1.0.2) http (1.0.4)
addressable (~> 2.3) addressable (~> 2.3)
http-cookie (~> 1.0) http-cookie (~> 1.0)
http-form_data (~> 1.0.1) http-form_data (~> 1.0.1)
@ -420,7 +438,7 @@ GEM
i18n-inflector (~> 2.6) i18n-inflector (~> 2.6)
railties (>= 3.0.0) railties (>= 3.0.0)
inflecto (0.0.2) inflecto (0.0.2)
ipaddress (0.8.2) ipaddress (0.8.3)
jasmine (2.4.0) jasmine (2.4.0)
jasmine-core (~> 2.4) jasmine-core (~> 2.4)
phantomjs phantomjs
@ -428,13 +446,13 @@ GEM
rake rake
jasmine-core (2.4.1) jasmine-core (2.4.1)
jasmine-jquery-rails (2.0.3) jasmine-jquery-rails (2.0.3)
jquery-rails (4.1.0) jquery-rails (4.1.1)
rails-dom-testing (~> 1.0) rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0) railties (>= 4.2.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
jquery-ui-rails (5.0.5) jquery-ui-rails (5.0.5)
railties (>= 3.2.16) railties (>= 3.2.16)
js-routes (1.2.4) js-routes (1.2.5)
railties (>= 3.2) railties (>= 3.2)
sprockets-rails sprockets-rails
js_image_paths (0.1.0) js_image_paths (0.1.0)
@ -450,7 +468,7 @@ GEM
multi_json (>= 1.3) multi_json (>= 1.3)
securecompare securecompare
url_safe_base64 url_safe_base64
json-schema (2.6.0) json-schema (2.6.1)
addressable (~> 2.3.8) addressable (~> 2.3.8)
json_spec (1.1.4) json_spec (1.1.4)
multi_json (~> 1.0) multi_json (~> 1.0)
@ -467,7 +485,7 @@ GEM
rb-fsevent (>= 0.9.3) rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9) rb-inotify (>= 0.9)
little-plugger (1.1.4) little-plugger (1.1.4)
logging (2.0.0) logging (2.1.0)
little-plugger (~> 1.1) little-plugger (~> 1.1)
multi_json (~> 1.10) multi_json (~> 1.10)
logging-rails (0.5.0) logging-rails (0.5.0)
@ -477,25 +495,28 @@ GEM
lumberjack (1.0.10) lumberjack (1.0.10)
macaddr (1.7.1) macaddr (1.7.1)
systemu (~> 2.6.2) systemu (~> 2.6.2)
mail (2.6.3) mail (2.6.4)
mime-types (>= 1.16, < 3) mime-types (>= 1.16, < 4)
markerb (1.1.0) markerb (1.1.0)
memoizable (0.4.2) memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1) thread_safe (~> 0.3, >= 0.3.1)
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.99.1) mime-types (3.0)
mini_magick (4.4.0) mime-types-data (~> 3.2015)
mime-types-data (3.2016.0221)
mimemagic (0.3.1)
mini_magick (4.5.1)
mini_portile2 (2.0.0) mini_portile2 (2.0.0)
minitest (5.8.4) minitest (5.8.4)
mobile-fu (1.3.1) mobile-fu (1.3.1)
rack-mobile-detect rack-mobile-detect
rails rails
multi_json (1.11.2) multi_json (1.12.0)
multi_test (0.1.2) multi_test (0.1.2)
multi_xml (0.5.5) multi_xml (0.5.5)
multipart-post (2.0.0) multipart-post (2.0.0)
mysql2 (0.4.3) mysql2 (0.4.4)
naught (1.1.0) naught (1.1.0)
nenv (0.3.0) nenv (0.3.0)
nested_form (0.3.2) nested_form (0.3.2)
@ -505,15 +526,15 @@ GEM
notiffany (0.0.8) notiffany (0.0.8)
nenv (~> 0.1) nenv (~> 0.1)
shellany (~> 0.0) shellany (~> 0.0)
oauth (0.4.7) oauth (0.5.1)
oauth2 (1.1.0) oauth2 (1.1.0)
faraday (>= 0.8, < 0.10) faraday (>= 0.8, < 0.10)
jwt (~> 1.0, < 1.5.2) jwt (~> 1.0, < 1.5.2)
multi_json (~> 1.3) multi_json (~> 1.3)
multi_xml (~> 0.5) multi_xml (~> 0.5)
rack (>= 1.2, < 3) rack (>= 1.2, < 3)
octokit (4.1.1) octokit (4.3.0)
sawyer (~> 0.6.0, >= 0.5.3) sawyer (~> 0.7.0, >= 0.5.3)
omniauth (1.3.1) omniauth (1.3.1)
hashie (>= 1.2, < 4) hashie (>= 1.2, < 4)
rack (>= 1.0, < 3) rack (>= 1.0, < 3)
@ -548,28 +569,28 @@ GEM
validate_url validate_url
webfinger (>= 1.0.1) webfinger (>= 1.0.1)
orm_adapter (0.5.0) orm_adapter (0.5.0)
parser (2.3.0.4) parser (2.3.1.0)
ast (~> 2.2) ast (~> 2.2)
pg (0.18.4) pg (0.18.4)
phantomjs (2.1.1.0) phantomjs (2.1.1.0)
powerpack (0.1.1) powerpack (0.1.1)
pronto (0.5.3) pronto (0.6.0)
gitlab (~> 3.4.0) gitlab (~> 3.6, >= 3.4.0)
octokit (~> 4.1.0) octokit (~> 4.3, >= 4.1.0)
rugged (~> 0.23.0) rugged (~> 0.24, >= 0.23.0)
thor (~> 0.19.0) thor (~> 0.19.0)
pronto-haml (0.5.0) pronto-haml (0.6.0)
haml_lint (~> 0.15.0) haml_lint (~> 0.16, >= 0.15.0)
pronto (~> 0.5.0) pronto (~> 0.6.0)
pronto-jshint (0.5.0) pronto-jshint (0.6.0)
jshintrb (~> 0.3.0) jshintrb (~> 0.3.0)
pronto (~> 0.5.0) pronto (~> 0.6.0)
pronto-rubocop (0.5.0) pronto-rubocop (0.6.2)
pronto (~> 0.5.0) pronto (~> 0.6.0)
rubocop (~> 0.35.0) rubocop (~> 0.38, >= 0.35.0)
pronto-scss (0.5.0) pronto-scss (0.6.0)
pronto (~> 0.5.0) pronto (~> 0.6.0)
scss_lint (~> 0.42.0) scss_lint (~> 0.43, >= 0.43.0)
pry (0.10.3) pry (0.10.3)
coderay (~> 1.1.0) coderay (~> 1.1.0)
method_source (~> 0.8.1) method_source (~> 0.8.1)
@ -605,16 +626,16 @@ GEM
rack rack
rack-test (0.6.3) rack-test (0.6.3)
rack (>= 1.0) rack (>= 1.0)
rails (4.2.5.2) rails (4.2.6)
actionmailer (= 4.2.5.2) actionmailer (= 4.2.6)
actionpack (= 4.2.5.2) actionpack (= 4.2.6)
actionview (= 4.2.5.2) actionview (= 4.2.6)
activejob (= 4.2.5.2) activejob (= 4.2.6)
activemodel (= 4.2.5.2) activemodel (= 4.2.6)
activerecord (= 4.2.5.2) activerecord (= 4.2.6)
activesupport (= 4.2.5.2) activesupport (= 4.2.6)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.2.5.2) railties (= 4.2.6)
sprockets-rails sprockets-rails
rails-assets-autosize (3.0.15) rails-assets-autosize (3.0.15)
rails-assets-blueimp-gallery (2.17.0) rails-assets-blueimp-gallery (2.17.0)
@ -626,12 +647,12 @@ GEM
rails-assets-jquery.slimscroll (~> 1.3.6) rails-assets-jquery.slimscroll (~> 1.3.6)
rails-assets-jquery.ui (~> 1.11.4) rails-assets-jquery.ui (~> 1.11.4)
rails-assets-favico.js (0.3.10) rails-assets-favico.js (0.3.10)
rails-assets-highlightjs (9.1.0) rails-assets-highlightjs (9.2.0)
rails-assets-jasmine (2.4.1) rails-assets-jasmine (2.4.1)
rails-assets-jasmine-ajax (3.2.0) rails-assets-jasmine-ajax (3.2.0)
rails-assets-jasmine (~> 2) rails-assets-jasmine (~> 2)
rails-assets-jquery (1.12.0) rails-assets-jquery (1.12.0)
rails-assets-jquery-colorbox (1.6.3) rails-assets-jquery-colorbox (1.6.4)
rails-assets-jquery (>= 1.3.2) rails-assets-jquery (>= 1.3.2)
rails-assets-jquery-fullscreen-plugin (0.5.0) rails-assets-jquery-fullscreen-plugin (0.5.0)
rails-assets-jquery-placeholder (2.3.1) rails-assets-jquery-placeholder (2.3.1)
@ -642,13 +663,13 @@ GEM
rails-assets-jquery.ui (1.11.4) rails-assets-jquery.ui (1.11.4)
rails-assets-jquery (>= 1.6) rails-assets-jquery (>= 1.6)
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 (6.0.0) rails-assets-markdown-it (6.0.1)
rails-assets-markdown-it-diaspora-mention (0.4.0) rails-assets-markdown-it-diaspora-mention (0.4.0)
rails-assets-markdown-it-hashtag (0.4.0) rails-assets-markdown-it-hashtag (0.4.0)
rails-assets-markdown-it-sanitizer (0.4.1) rails-assets-markdown-it-sanitizer (0.4.1)
rails-assets-markdown-it-sub (1.0.0) rails-assets-markdown-it-sub (1.0.0)
rails-assets-markdown-it-sup (1.0.0) rails-assets-markdown-it-sup (1.0.0)
rails-assets-perfect-scrollbar (0.6.10) rails-assets-perfect-scrollbar (0.6.11)
rails-assets-typeahead.js (0.11.1) rails-assets-typeahead.js (0.11.1)
rails-assets-jquery (>= 1.7) rails-assets-jquery (>= 1.7)
rails-deprecated_sanitizer (1.0.3) rails-deprecated_sanitizer (1.0.3)
@ -679,14 +700,14 @@ GEM
remotipart (~> 1.0) remotipart (~> 1.0)
safe_yaml (~> 1.0) safe_yaml (~> 1.0)
sass-rails (>= 4.0, < 6) sass-rails (>= 4.0, < 6)
railties (4.2.5.2) railties (4.2.6)
actionpack (= 4.2.5.2) actionpack (= 4.2.6)
activesupport (= 4.2.5.2) activesupport (= 4.2.6)
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rainbow (2.1.0) rainbow (2.1.0)
raindrops (0.15.0) raindrops (0.16.0)
rake (10.5.0) rake (11.1.2)
rb-fsevent (0.9.7) rb-fsevent (0.9.7)
rb-inotify (0.9.7) rb-inotify (0.9.7)
ffi (>= 0.5.0) ffi (>= 0.5.0)
@ -699,8 +720,8 @@ GEM
redis-namespace (1.5.2) redis-namespace (1.5.2)
redis (~> 3.0, >= 3.0.4) redis (~> 3.0, >= 3.0.4)
remotipart (1.2.1) remotipart (1.2.1)
request_store (1.3.0) request_store (1.3.1)
responders (2.1.1) responders (2.2.0)
railties (>= 4.2.0, < 5.1) railties (>= 4.2.0, < 5.1)
roxml (3.1.6) roxml (3.1.6)
activesupport (>= 2.3.0) activesupport (>= 2.3.0)
@ -709,12 +730,12 @@ GEM
rspec-core (~> 3.4.0) rspec-core (~> 3.4.0)
rspec-expectations (~> 3.4.0) rspec-expectations (~> 3.4.0)
rspec-mocks (~> 3.4.0) rspec-mocks (~> 3.4.0)
rspec-core (3.4.2) rspec-core (3.4.4)
rspec-support (~> 3.4.0) rspec-support (~> 3.4.0)
rspec-expectations (3.4.0) rspec-expectations (3.4.0)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.4.0) rspec-support (~> 3.4.0)
rspec-instafail (0.4.0) rspec-instafail (0.5.0)
rspec rspec
rspec-mocks (3.4.1) rspec-mocks (3.4.1)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
@ -728,31 +749,31 @@ GEM
rspec-mocks (~> 3.4.0) rspec-mocks (~> 3.4.0)
rspec-support (~> 3.4.0) rspec-support (~> 3.4.0)
rspec-support (3.4.1) rspec-support (3.4.1)
rubocop (0.35.1) rubocop (0.40.0)
astrolabe (~> 1.3) parser (>= 2.3.1.0, < 3.0)
parser (>= 2.2.3.0, < 3.0)
powerpack (~> 0.1) powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0) rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.7) ruby-progressbar (~> 1.7)
tins (<= 1.6.0) tins (<= 1.6.0)
ruby-oembed (0.9.0) unicode-display_width (~> 1.0, >= 1.0.1)
ruby-progressbar (1.7.5) ruby-oembed (0.10.0)
rubyzip (1.1.7) ruby-progressbar (1.8.0)
rubyzip (1.2.0)
rufus-scheduler (3.2.0) rufus-scheduler (3.2.0)
rugged (0.23.3) rugged (0.24.0)
safe_yaml (1.0.4) safe_yaml (1.0.4)
sass (3.4.21) sass (3.4.22)
sass-rails (5.0.4) sass-rails (5.0.4)
railties (>= 4.0.0, < 5.0) railties (>= 4.0.0, < 5.0)
sass (~> 3.1) sass (~> 3.1)
sprockets (>= 2.8, < 4.0) sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0) sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3) tilt (>= 1.1, < 3)
sawyer (0.6.0) sawyer (0.7.0)
addressable (~> 2.3.5) addressable (>= 2.3.5, < 2.5)
faraday (~> 0.8, < 0.10) faraday (~> 0.8, < 0.10)
scss_lint (0.42.2) scss_lint (0.48.0)
rainbow (~> 2.0) rake (>= 0.9, < 12)
sass (~> 3.4.15) sass (~> 3.4.15)
securecompare (1.0.0) securecompare (1.0.0)
selenium-webdriver (2.47.1) selenium-webdriver (2.47.1)
@ -787,7 +808,7 @@ GEM
sinon-rails (1.15.0) sinon-rails (1.15.0)
railties (>= 3.1) railties (>= 3.1)
slop (3.6.0) slop (3.6.0)
spring (1.6.3) spring (1.7.1)
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)
@ -812,12 +833,12 @@ GEM
systemu (2.6.5) systemu (2.6.5)
temple (0.7.6) temple (0.7.6)
terminal-table (1.5.2) terminal-table (1.5.2)
test_after_commit (0.4.2) test_after_commit (1.0.0)
activerecord (>= 3.2) activerecord (>= 3.2)
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.8.0) timecop (0.8.1)
timers (4.1.1) timers (4.1.1)
hitimes hitimes
tins (1.6.0) tins (1.6.0)
@ -834,21 +855,20 @@ GEM
memoizable (~> 0.4.0) memoizable (~> 0.4.0)
naught (~> 1.0) naught (~> 1.0)
simple_oauth (~> 0.3.0) simple_oauth (~> 0.3.0)
twitter-text (1.13.3) twitter-text (1.13.4)
unf (~> 0.1.0) unf (~> 0.1.0)
typhoeus (1.0.1) typhoeus (1.0.2)
ethon (>= 0.8.0) ethon (>= 0.9.0)
tzinfo (1.2.2) tzinfo (1.2.2)
thread_safe (~> 0.1) thread_safe (~> 0.1)
uglifier (2.7.2) uglifier (3.0.0)
execjs (>= 0.3.0) execjs (>= 0.3.0, < 3)
json (>= 1.8.0)
unf (0.1.4) unf (0.1.4)
unf_ext unf_ext
unf_ext (0.0.7.2) unf_ext (0.0.7.2)
unicorn (5.0.1) unicode-display_width (1.0.5)
unicorn (5.1.0)
kgio (~> 2.6) kgio (~> 2.6)
rack
raindrops (~> 0.7) raindrops (~> 0.7)
unicorn-worker-killer (0.4.4) unicorn-worker-killer (0.4.4)
get_process_mem (~> 0) get_process_mem (~> 0)
@ -877,7 +897,7 @@ GEM
addressable (>= 2.3.6) addressable (>= 2.3.6)
crack (>= 0.3.2) crack (>= 0.3.2)
hashdiff hashdiff
websocket (1.2.2) websocket (1.2.3)
will_paginate (3.1.0) will_paginate (3.1.0)
xml-simple (1.1.5) xml-simple (1.1.5)
xpath (2.0.0) xpath (2.0.0)
@ -888,67 +908,67 @@ PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
active_model_serializers (= 0.9.4) active_model_serializers (= 0.9.5)
activerecord-import (= 0.11.0) activerecord-import (= 0.13.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 (= 6.3.3.1) autoprefixer-rails (= 6.3.6)
backbone-on-rails (= 1.2.0.0) backbone-on-rails (= 1.2.0.0)
bootstrap-sass (= 3.3.6) bootstrap-sass (= 3.3.6)
bootstrap-switch-rails (= 3.3.3) bootstrap-switch-rails (= 3.3.3)
capybara (= 2.6.2) capybara (= 2.7.1)
carrierwave (= 0.10.0) carrierwave (= 0.11.2)
compass-rails (= 2.0.5) compass-rails (= 2.0.5)
configurate (= 0.3.1) configurate (= 0.3.1)
cucumber-api-steps (= 0.13) cucumber-api-steps (= 0.13)
cucumber-rails (= 1.4.3) cucumber-rails (= 1.4.3)
database_cleaner (= 1.5.1) database_cleaner (= 1.5.3)
devise (= 3.5.6) devise (= 3.5.6)
devise-token_authenticatable (~> 0.4.0) devise-token_authenticatable (= 0.4.6)
devise_lastseenable (= 0.0.6) devise_lastseenable (= 0.0.6)
diaspora-prosody-config (~> 0.0.5) diaspora-prosody-config (= 0.0.5)
diaspora_federation-rails (= 0.0.13) diaspora_federation-rails (= 0.0.13)
diaspora_federation-test (= 0.0.13) diaspora_federation-test (= 0.0.13)
entypo-rails (= 3.0.0.pre.rc2) entypo-rails (= 3.0.0.pre.rc2)
eye (= 0.8) eye (= 0.8)
factory_girl_rails (= 4.6.0) factory_girl_rails (= 4.7.0)
faraday (= 0.9.2) faraday (= 0.9.2)
faraday-cookie_jar (= 0.0.6) faraday-cookie_jar (= 0.0.6)
faraday_middleware (= 0.10.0) faraday_middleware (= 0.10.0)
fixture_builder (= 0.4.1) fixture_builder (= 0.4.1)
fog (= 1.37.0) fog (= 1.38.0)
fuubar (= 2.0.0) fuubar (= 2.0.0)
gon (= 6.0.1) gon (= 6.0.1)
guard (= 2.13.0) guard (= 2.13.0)
guard-cucumber (= 1.5.4) guard-cucumber (= 2.1.2)
guard-jshintrb (= 1.1.1) guard-jshintrb (= 1.1.1)
guard-rspec (= 4.6.4) guard-rspec (= 4.6.5)
guard-rubocop (= 1.2.0) guard-rubocop (= 1.2.0)
haml_lint (= 0.15.2) haml_lint (= 0.17.1)
hamlit (= 2.2.1) hamlit (= 2.2.1)
handlebars_assets (= 0.23.0) handlebars_assets (= 0.23.0)
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.4.0) jasmine (= 2.4.0)
jasmine-jquery-rails (= 2.0.3) jasmine-jquery-rails (= 2.0.3)
jquery-rails (= 4.1.0) jquery-rails (= 4.1.1)
jquery-ui-rails (= 5.0.5) jquery-ui-rails (= 5.0.5)
js-routes (= 1.2.4) js-routes (= 1.2.5)
js_image_paths (= 0.1.0) js_image_paths (= 0.1.0)
jshintrb (= 0.3.0) jshintrb (= 0.3.0)
json (= 1.8.3) json (= 1.8.3)
json-schema (= 2.6.0) json-schema (= 2.6.1)
json_spec (= 1.1.4) json_spec (= 1.1.4)
leaflet-rails (= 0.7.4) leaflet-rails (= 0.7.4)
logging-rails (= 0.5.0) logging-rails (= 0.5.0)
markerb (= 1.1.0) markerb (= 1.1.0)
messagebus_ruby_api (= 1.0.3) messagebus_ruby_api (= 1.0.3)
mini_magick (= 4.4.0) mini_magick (= 4.5.1)
minitest minitest
mobile-fu (= 1.3.1) mobile-fu (= 1.3.1)
mysql2 (= 0.4.3) mysql2 (= 0.4.4)
nokogiri (= 1.6.7.2) nokogiri (= 1.6.7.2)
omniauth (= 1.3.1) omniauth (= 1.3.1)
omniauth-facebook (= 3.0.0) omniauth-facebook (= 3.0.0)
@ -958,11 +978,11 @@ DEPENDENCIES
open_graph_reader (= 0.6.1) open_graph_reader (= 0.6.1)
openid_connect (= 0.10.0) openid_connect (= 0.10.0)
pg (= 0.18.4) pg (= 0.18.4)
pronto (= 0.5.3) pronto (= 0.6.0)
pronto-haml (= 0.5.0) pronto-haml (= 0.6.0)
pronto-jshint (= 0.5.0) pronto-jshint (= 0.6.0)
pronto-rubocop (= 0.5.0) pronto-rubocop (= 0.6.2)
pronto-scss (= 0.5.0) pronto-scss (= 0.6.0)
pry pry
pry-byebug pry-byebug
pry-debundle pry-debundle
@ -973,23 +993,23 @@ DEPENDENCIES
rack-protection (= 1.5.3) rack-protection (= 1.5.3)
rack-rewrite (= 1.5.1) rack-rewrite (= 1.5.1)
rack-ssl (= 1.4.1) rack-ssl (= 1.4.1)
rails (= 4.2.5.2) rails (= 4.2.6)
rails-assets-autosize (= 3.0.15)! rails-assets-autosize (= 3.0.15)!
rails-assets-blueimp-gallery (= 2.17.0)! rails-assets-blueimp-gallery (= 2.17.0)!
rails-assets-diaspora_jsxc (~> 0.1.5.develop)! rails-assets-diaspora_jsxc (= 0.1.5.develop.1)!
rails-assets-highlightjs (= 9.1.0)! rails-assets-highlightjs (= 9.2.0)!
rails-assets-jasmine-ajax (= 3.2.0)! rails-assets-jasmine-ajax (= 3.2.0)!
rails-assets-jquery (= 1.12.0)! rails-assets-jquery (= 1.12.0)!
rails-assets-jquery-placeholder (= 2.3.1)! rails-assets-jquery-placeholder (= 2.3.1)!
rails-assets-jquery-textchange (= 0.2.3)! rails-assets-jquery-textchange (= 0.2.3)!
rails-assets-markdown-it (= 6.0.0)! rails-assets-markdown-it (= 6.0.1)!
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-diaspora-mention (= 0.4.0)! rails-assets-markdown-it-diaspora-mention (= 0.4.0)!
rails-assets-markdown-it-hashtag (= 0.4.0)! rails-assets-markdown-it-hashtag (= 0.4.0)!
rails-assets-markdown-it-sanitizer (= 0.4.1)! rails-assets-markdown-it-sanitizer (= 0.4.1)!
rails-assets-markdown-it-sub (= 1.0.0)! rails-assets-markdown-it-sub (= 1.0.0)!
rails-assets-markdown-it-sup (= 1.0.0)! rails-assets-markdown-it-sup (= 1.0.0)!
rails-assets-perfect-scrollbar (= 0.6.10)! rails-assets-perfect-scrollbar (= 0.6.11)!
rails-assets-typeahead.js (= 0.11.1)! rails-assets-typeahead.js (= 0.11.1)!
rails-i18n (= 4.0.8) rails-i18n (= 4.0.8)
rails-timeago (= 2.11.0) rails-timeago (= 2.11.0)
@ -998,13 +1018,13 @@ DEPENDENCIES
rb-inotify (= 0.9.7) rb-inotify (= 0.9.7)
redcarpet (= 3.3.4) redcarpet (= 3.3.4)
remotipart (= 1.2.1) remotipart (= 1.2.1)
responders (= 2.1.1) responders (= 2.2.0)
roxml (= 3.1.6) roxml (= 3.1.6)
rspec-instafail (= 0.4.0) rspec-instafail (= 0.5.0)
rspec-rails (= 3.4.2) rspec-rails (= 3.4.2)
rubocop (= 0.35.1) rubocop (= 0.40.0)
ruby-oembed (= 0.9.0) ruby-oembed (= 0.10.0)
rubyzip (= 1.1.7) rubyzip (= 1.2.0)
sass-rails (= 5.0.4) sass-rails (= 5.0.4)
selenium-webdriver (= 2.47.1) selenium-webdriver (= 2.47.1)
shoulda-matchers (= 3.1.1) shoulda-matchers (= 3.1.1)
@ -1014,17 +1034,17 @@ DEPENDENCIES
simplecov (= 0.11.2) simplecov (= 0.11.2)
sinatra (= 1.4.7) sinatra (= 1.4.7)
sinon-rails (= 1.15.0) sinon-rails (= 1.15.0)
spring (= 1.6.3) spring (= 1.7.1)
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.2) test_after_commit (= 1.0.0)
timecop (= 0.8.0) timecop (= 0.8.1)
turbo_dev_assets (= 0.0.2) turbo_dev_assets (= 0.0.2)
twitter (= 5.16.0) twitter (= 5.16.0)
twitter-text (= 1.13.3) twitter-text (= 1.13.4)
typhoeus (= 1.0.1) typhoeus (= 1.0.2)
uglifier (= 2.7.2) uglifier (= 3.0.0)
unicorn (= 5.0.1) unicorn (= 5.1.0)
unicorn-worker-killer (= 0.4.4) unicorn-worker-killer (= 0.4.4)
uuid (= 2.3.8) uuid (= 2.3.8)
versionist (= 1.4.1) versionist (= 1.4.1)
@ -1032,4 +1052,4 @@ DEPENDENCIES
will_paginate (= 3.1.0) will_paginate (= 3.1.0)
BUNDLED WITH BUNDLED WITH
1.11.2 1.12.3