Dennis Schubert
commit
488860d2f0
9 changed files with 310 additions and 311 deletions
12
.rubocop.yml
12
.rubocop.yml
|
|
@ -40,7 +40,7 @@ Metrics/BlockLength:
|
|||
|
||||
# No space makes the method definition shorter and differentiates
|
||||
# from a regular assignment.
|
||||
Style/SpaceAroundEqualsInParameterDefault:
|
||||
Layout/SpaceAroundEqualsInParameterDefault:
|
||||
EnforcedStyle: no_space
|
||||
|
||||
# Single quotes being faster is hardly measurable and only affects parse time.
|
||||
|
|
@ -55,7 +55,7 @@ Style/SymbolArray:
|
|||
Enabled: true
|
||||
|
||||
# Most readable form.
|
||||
Style/AlignHash:
|
||||
Layout/AlignHash:
|
||||
EnforcedHashRocketStyle: table
|
||||
EnforcedColonStyle: table
|
||||
|
||||
|
|
@ -92,7 +92,7 @@ Style/RaiseArgs:
|
|||
|
||||
# Indenting the chained dots beneath each other is not supported by this cop,
|
||||
# see https://github.com/bbatsov/rubocop/issues/1633
|
||||
Style/MultilineOperationIndentation:
|
||||
Layout/MultilineOperationIndentation:
|
||||
Enabled: false
|
||||
|
||||
# Fail is an alias of raise. Avoid aliases, it's more cognitive load for no gain.
|
||||
|
|
@ -107,7 +107,7 @@ Style/SignalException:
|
|||
Lint/HandleExceptions:
|
||||
Enabled: false
|
||||
|
||||
Style/SpaceInsideBlockBraces:
|
||||
Layout/SpaceInsideBlockBraces:
|
||||
# The space here provides no real gain in readability while consuming
|
||||
# horizontal space that could be used for a better parameter name.
|
||||
# Also {| differentiates better from a hash than { | does.
|
||||
|
|
@ -115,7 +115,7 @@ Style/SpaceInsideBlockBraces:
|
|||
|
||||
# No trailing space differentiates better from the block:
|
||||
# foo} means hash, foo } means block.
|
||||
Style/SpaceInsideHashLiteralBraces:
|
||||
Layout/SpaceInsideHashLiteralBraces:
|
||||
EnforcedStyle: no_space
|
||||
|
||||
# { ... } for multi-line blocks is okay, follow Weirichs rule instead:
|
||||
|
|
@ -165,7 +165,7 @@ Style/NumericPredicate:
|
|||
EnforcedStyle: comparison
|
||||
|
||||
# Reset some HoundCI changes back to Rubocop defaults
|
||||
Style/DotPosition:
|
||||
Layout/DotPosition:
|
||||
EnforcedStyle: leading
|
||||
|
||||
### backward compatibility
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
language: ruby
|
||||
|
||||
rvm:
|
||||
- 2.3.1
|
||||
- 2.1
|
||||
- 2.3.4
|
||||
- 2.1.10
|
||||
|
||||
env:
|
||||
- DB=postgresql BUILD_TYPE=cucumber
|
||||
|
|
|
|||
115
Gemfile
115
Gemfile
|
|
@ -1,14 +1,14 @@
|
|||
source "https://rubygems.org"
|
||||
|
||||
gem "rails", "4.2.8"
|
||||
gem "rails", "4.2.9"
|
||||
|
||||
# Legacy Rails features, remove me!
|
||||
# responders (class level)
|
||||
gem "responders", "2.3.0"
|
||||
gem "responders", "2.4.0"
|
||||
|
||||
# Appserver
|
||||
|
||||
gem "unicorn", "5.2.0", require: false
|
||||
gem "unicorn", "5.3.0", require: false
|
||||
gem "unicorn-worker-killer", "0.4.4"
|
||||
|
||||
# Federation
|
||||
|
|
@ -18,12 +18,12 @@ gem "diaspora_federation-rails", "0.2.0"
|
|||
# API and JSON
|
||||
|
||||
gem "acts_as_api", "1.0.0"
|
||||
gem "json", "1.8.6"
|
||||
gem "json", "2.1.0"
|
||||
gem "json-schema", "2.8.0"
|
||||
|
||||
# Authentication
|
||||
|
||||
gem "devise", "4.2.0"
|
||||
gem "devise", "4.3.0"
|
||||
gem "devise_lastseenable", "0.0.6"
|
||||
|
||||
# Captcha
|
||||
|
|
@ -32,15 +32,15 @@ gem "simple_captcha2", "0.4.3", require: "simple_captcha"
|
|||
|
||||
# Background processing
|
||||
|
||||
gem "sidekiq", "4.2.9"
|
||||
gem "sidekiq", "4.2.10"
|
||||
|
||||
# Scheduled processing
|
||||
|
||||
gem "sidekiq-cron", "0.4.5"
|
||||
gem "sidekiq-cron", "0.6.3"
|
||||
|
||||
# Compression
|
||||
|
||||
gem "uglifier", "3.1.2"
|
||||
gem "uglifier", "3.2.0"
|
||||
|
||||
# Configuration
|
||||
|
||||
|
|
@ -48,33 +48,34 @@ gem "configurate", "0.3.1"
|
|||
|
||||
# Cross-origin resource sharing
|
||||
|
||||
gem "rack-cors", "0.4.1", require: "rack/cors"
|
||||
gem "rack-cors", "1.0.1", require: "rack/cors"
|
||||
|
||||
# CSS
|
||||
|
||||
gem "autoprefixer-rails", "6.7.6"
|
||||
gem "autoprefixer-rails", "7.1.2.3"
|
||||
gem "bootstrap-sass", "3.3.7"
|
||||
gem "bootstrap-switch-rails", "3.3.3"
|
||||
gem "compass-rails", "2.0.5"
|
||||
gem "compass-rails", "3.0.2"
|
||||
gem "sass-rails", "5.0.6"
|
||||
gem "sprockets", "2.12.4"
|
||||
|
||||
# Database
|
||||
|
||||
group :mysql, optional: true do
|
||||
gem "mysql2", "0.4.5"
|
||||
gem "mysql2", "0.4.8"
|
||||
end
|
||||
group :postgresql, optional: true do
|
||||
gem "pg", "0.19.0"
|
||||
gem "pg", "0.21.0"
|
||||
end
|
||||
|
||||
|
||||
gem "activerecord-import", "0.17.1"
|
||||
gem "activerecord-import", "0.19.1"
|
||||
|
||||
# File uploading
|
||||
|
||||
gem "fog-aws", "1.2.1"
|
||||
gem "carrierwave", "0.11.2"
|
||||
gem "mini_magick", "4.6.1"
|
||||
gem "carrierwave", "1.1.0"
|
||||
gem "fog-aws", "1.4.0"
|
||||
gem "mini_magick", "4.8.0"
|
||||
|
||||
# GUID generation
|
||||
gem "uuid", "2.3.8"
|
||||
|
|
@ -85,17 +86,17 @@ gem "entypo-rails", "3.0.0"
|
|||
|
||||
# JavaScript
|
||||
|
||||
gem "handlebars_assets", "0.23.1"
|
||||
gem "jquery-rails", "4.2.2"
|
||||
gem "jquery-ui-rails", "5.0.5"
|
||||
gem "handlebars_assets", "0.23.2"
|
||||
gem "jquery-rails", "4.3.1"
|
||||
gem "js-routes", "1.3.3"
|
||||
gem "js_image_paths", "0.1.0"
|
||||
|
||||
source "https://rails-assets.org" do
|
||||
gem "rails-assets-jquery", "3.1.1" # Should be kept in sync with jquery-rails
|
||||
gem "rails-assets-jquery", "3.2.1" # Should be kept in sync with jquery-rails
|
||||
gem "rails-assets-jquery.ui", "1.11.4"
|
||||
|
||||
gem "rails-assets-highlightjs", "9.9.0"
|
||||
gem "rails-assets-markdown-it", "8.3.0"
|
||||
gem "rails-assets-highlightjs", "9.12.0"
|
||||
gem "rails-assets-markdown-it", "8.3.1"
|
||||
gem "rails-assets-markdown-it-hashtag", "0.4.0"
|
||||
gem "rails-assets-markdown-it-diaspora-mention", "1.2.0"
|
||||
gem "rails-assets-markdown-it-sanitizer", "0.4.3"
|
||||
|
|
@ -110,8 +111,8 @@ source "https://rails-assets.org" do
|
|||
|
||||
# jQuery plugins
|
||||
|
||||
gem "rails-assets-autosize", "3.0.20"
|
||||
gem "rails-assets-blueimp-gallery", "2.25.0"
|
||||
gem "rails-assets-autosize", "4.0.0"
|
||||
gem "rails-assets-blueimp-gallery", "2.25.2"
|
||||
gem "rails-assets-jquery.are-you-sure", "1.9.0"
|
||||
gem "rails-assets-jquery-placeholder", "2.3.1"
|
||||
gem "rails-assets-jquery-textchange", "0.2.3"
|
||||
|
|
@ -120,24 +121,24 @@ end
|
|||
|
||||
# Localization
|
||||
|
||||
gem "http_accept_language", "2.1.0"
|
||||
gem "http_accept_language", "2.1.1"
|
||||
gem "i18n-inflector-rails", "1.0.7"
|
||||
gem "rails-i18n", "4.0.8"
|
||||
gem "rails-i18n", "4.0.9"
|
||||
|
||||
# Mail
|
||||
|
||||
gem "markerb", "1.1.0"
|
||||
|
||||
# Map
|
||||
gem "leaflet-rails", "0.7.7"
|
||||
gem "leaflet-rails", "1.1.0"
|
||||
|
||||
# Parsing
|
||||
|
||||
gem "nokogiri", "1.7.2"
|
||||
gem "nokogiri", "1.8.0"
|
||||
gem "open_graph_reader", "0.6.2" # also update User-Agent in features/support/webmock.rb
|
||||
gem "redcarpet", "3.4.0"
|
||||
gem "ruby-oembed", "0.10.1"
|
||||
gem "twitter-text", "1.14.5"
|
||||
gem "ruby-oembed", "0.12.0"
|
||||
gem "twitter-text", "1.14.7"
|
||||
|
||||
# RTL support
|
||||
|
||||
|
|
@ -145,11 +146,11 @@ gem "string-direction", "1.2.0"
|
|||
|
||||
# Security Headers
|
||||
|
||||
gem "secure_headers", "3.6.1"
|
||||
gem "secure_headers", "3.6.7"
|
||||
|
||||
# Services
|
||||
|
||||
gem "omniauth", "1.4.2"
|
||||
gem "omniauth", "1.6.1"
|
||||
gem "omniauth-facebook", "4.0.0"
|
||||
gem "omniauth-tumblr", "1.2"
|
||||
gem "omniauth-twitter", "1.4.0"
|
||||
|
|
@ -157,11 +158,11 @@ gem "twitter", "6.1.0"
|
|||
gem "omniauth-wordpress", "0.2.2"
|
||||
|
||||
# OpenID Connect
|
||||
gem "openid_connect", "0.12.0"
|
||||
gem "openid_connect", "1.1.2"
|
||||
|
||||
# Serializers
|
||||
|
||||
gem "active_model_serializers", "0.9.5"
|
||||
gem "active_model_serializers", "0.9.7"
|
||||
|
||||
# XMPP chat dependencies
|
||||
gem "diaspora-prosody-config", "0.0.7"
|
||||
|
|
@ -173,7 +174,7 @@ gem "acts-as-taggable-on", "3.5.0"
|
|||
|
||||
# URIs and HTTP
|
||||
|
||||
gem "addressable", "2.5.0", require: "addressable/uri"
|
||||
gem "addressable", "2.5.1", require: "addressable/uri"
|
||||
gem "faraday", "0.11.0" # also update User-Agent in OpenID specs
|
||||
gem "faraday_middleware", "0.11.0.1"
|
||||
gem "faraday-cookie_jar", "0.0.6"
|
||||
|
|
@ -182,14 +183,14 @@ gem "typhoeus", "1.1.2"
|
|||
# Views
|
||||
|
||||
gem "gon", "6.1.0"
|
||||
gem "hamlit", "2.8.0"
|
||||
gem "hamlit", "2.8.4"
|
||||
gem "mobile-fu", "1.3.1"
|
||||
gem "rails-timeago", "2.16.0"
|
||||
gem "will_paginate", "3.1.5"
|
||||
gem "will_paginate", "3.1.6"
|
||||
|
||||
# Logging
|
||||
|
||||
gem "logging-rails", "0.5.0", require: "logging/rails"
|
||||
gem "logging-rails", "0.6.0", require: "logging/rails"
|
||||
|
||||
# Reading and writing zip files
|
||||
|
||||
|
|
@ -225,7 +226,7 @@ group :production do # we don"t install these on travis to speed up test runs
|
|||
|
||||
# Process management
|
||||
|
||||
gem "eye", "0.9.1"
|
||||
gem "eye", "0.9.2"
|
||||
|
||||
# Redirects
|
||||
|
||||
|
|
@ -234,7 +235,7 @@ group :production do # we don"t install these on travis to speed up test runs
|
|||
|
||||
# Third party asset hosting
|
||||
|
||||
gem "asset_sync", "2.0.0", require: false
|
||||
gem "asset_sync", "2.2.0", require: false
|
||||
end
|
||||
|
||||
group :development do
|
||||
|
|
@ -242,22 +243,22 @@ group :development do
|
|||
gem "guard", "2.14.1", require: false
|
||||
gem "guard-cucumber", "2.1.2", require: false
|
||||
gem "guard-rspec", "4.7.3", require: false
|
||||
gem "guard-rubocop", "1.2.0", require: false
|
||||
gem "rb-fsevent", "0.9.8", require: false
|
||||
gem "rb-inotify", "0.9.8", require: false
|
||||
gem "guard-rubocop", "1.3.0", require: false
|
||||
gem "rb-fsevent", "0.10.2", require: false
|
||||
gem "rb-inotify", "0.9.10", require: false
|
||||
|
||||
# Linters
|
||||
gem "haml_lint", "0.24.0", require: false
|
||||
gem "pronto", "0.9.3", require: false
|
||||
gem "haml_lint", "0.26.0", require: false
|
||||
gem "pronto", "0.9.4", require: false
|
||||
gem "pronto-eslint", "0.9.1", require: false
|
||||
gem "pronto-haml", "0.9.0", require: false
|
||||
gem "pronto-rubocop", "0.9.0", require: false
|
||||
gem "pronto-scss", "0.9.1", require: false
|
||||
gem "rubocop", "0.48.1", require: false
|
||||
gem "rubocop", "0.49.1", require: false
|
||||
|
||||
# Preloading environment
|
||||
|
||||
gem "spring", "2.0.1"
|
||||
gem "spring", "2.0.2"
|
||||
gem "spring-commands-rspec", "1.0.4"
|
||||
gem "spring-commands-cucumber", "1.0.1"
|
||||
|
||||
|
|
@ -274,24 +275,24 @@ end
|
|||
group :test do
|
||||
# RSpec (unit tests, some integration tests)
|
||||
|
||||
gem "fixture_builder", "0.4.1"
|
||||
gem "fixture_builder", "0.5.0"
|
||||
gem "fuubar", "2.2.0"
|
||||
gem "test_after_commit", "1.1.0"
|
||||
|
||||
# Cucumber (integration tests)
|
||||
|
||||
gem "capybara", "2.12.1"
|
||||
gem "database_cleaner", "1.5.3"
|
||||
gem "poltergeist", "1.13.0"
|
||||
gem "capybara", "2.14.4"
|
||||
gem "database_cleaner", "1.6.1"
|
||||
gem "poltergeist", "1.15.0"
|
||||
|
||||
gem "cucumber-api-steps", "0.13", require: false
|
||||
|
||||
# General helpers
|
||||
|
||||
gem "factory_girl_rails", "4.8.0"
|
||||
gem "timecop", "0.8.1"
|
||||
gem "webmock", "2.3.2", require: false
|
||||
gem "shoulda-matchers", "3.1.1"
|
||||
gem "shoulda-matchers", "3.1.2"
|
||||
gem "timecop", "0.9.1"
|
||||
gem "webmock", "3.0.1", require: false
|
||||
|
||||
gem "diaspora_federation-test", "0.2.0"
|
||||
|
||||
|
|
@ -301,10 +302,10 @@ end
|
|||
|
||||
group :development, :test do
|
||||
# RSpec (unit tests, some integration tests)
|
||||
gem "rspec-rails", "3.5.2"
|
||||
gem "rspec-rails", "3.6.0"
|
||||
|
||||
# Cucumber (integration tests)
|
||||
gem "cucumber-rails", "1.4.5", require: false
|
||||
gem "cucumber-rails", "1.5.0", require: false
|
||||
|
||||
# Jasmine (client side application tests (JS))
|
||||
gem "jasmine", "2.5.2"
|
||||
|
|
|
|||
462
Gemfile.lock
462
Gemfile.lock
|
|
@ -2,40 +2,41 @@ GEM
|
|||
remote: https://rubygems.org/
|
||||
remote: https://rails-assets.org/
|
||||
specs:
|
||||
actionmailer (4.2.8)
|
||||
actionpack (= 4.2.8)
|
||||
actionview (= 4.2.8)
|
||||
activejob (= 4.2.8)
|
||||
actionmailer (4.2.9)
|
||||
actionpack (= 4.2.9)
|
||||
actionview (= 4.2.9)
|
||||
activejob (= 4.2.9)
|
||||
mail (~> 2.5, >= 2.5.4)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||
actionpack (4.2.8)
|
||||
actionview (= 4.2.8)
|
||||
activesupport (= 4.2.8)
|
||||
actionpack (4.2.9)
|
||||
actionview (= 4.2.9)
|
||||
activesupport (= 4.2.9)
|
||||
rack (~> 1.6)
|
||||
rack-test (~> 0.6.2)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||
actionview (4.2.8)
|
||||
activesupport (= 4.2.8)
|
||||
actionview (4.2.9)
|
||||
activesupport (= 4.2.9)
|
||||
builder (~> 3.1)
|
||||
erubis (~> 2.7.0)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.3)
|
||||
active_model_serializers (0.9.5)
|
||||
active_model_serializers (0.9.7)
|
||||
activemodel (>= 3.2)
|
||||
activejob (4.2.8)
|
||||
activesupport (= 4.2.8)
|
||||
concurrent-ruby (~> 1.0)
|
||||
activejob (4.2.9)
|
||||
activesupport (= 4.2.9)
|
||||
globalid (>= 0.3.0)
|
||||
activemodel (4.2.8)
|
||||
activesupport (= 4.2.8)
|
||||
activemodel (4.2.9)
|
||||
activesupport (= 4.2.9)
|
||||
builder (~> 3.1)
|
||||
activerecord (4.2.8)
|
||||
activemodel (= 4.2.8)
|
||||
activesupport (= 4.2.8)
|
||||
activerecord (4.2.9)
|
||||
activemodel (= 4.2.9)
|
||||
activesupport (= 4.2.9)
|
||||
arel (~> 6.0)
|
||||
activerecord-import (0.17.1)
|
||||
activerecord-import (0.19.1)
|
||||
activerecord (>= 3.2)
|
||||
activesupport (4.2.8)
|
||||
activesupport (4.2.9)
|
||||
i18n (~> 0.7)
|
||||
minitest (~> 5.1)
|
||||
thread_safe (~> 0.3, >= 0.3.4)
|
||||
|
|
@ -46,20 +47,20 @@ GEM
|
|||
activemodel (>= 3.0.0)
|
||||
activesupport (>= 3.0.0)
|
||||
rack (>= 1.1.0)
|
||||
addressable (2.5.0)
|
||||
addressable (2.5.1)
|
||||
public_suffix (~> 2.0, >= 2.0.2)
|
||||
arel (6.0.4)
|
||||
asset_sync (2.0.0)
|
||||
activemodel
|
||||
asset_sync (2.2.0)
|
||||
activemodel (>= 4.1.0)
|
||||
fog-core
|
||||
mime-types
|
||||
mime-types (>= 2.99)
|
||||
unf
|
||||
ast (2.3.0)
|
||||
attr_required (1.0.1)
|
||||
autoprefixer-rails (6.7.6)
|
||||
autoprefixer-rails (7.1.2.3)
|
||||
execjs
|
||||
bcrypt (3.1.11)
|
||||
bindata (2.3.5)
|
||||
bindata (2.4.0)
|
||||
bootstrap-sass (3.3.7)
|
||||
autoprefixer-rails (>= 5.2.1)
|
||||
sass (>= 3.3.4)
|
||||
|
|
@ -67,19 +68,17 @@ GEM
|
|||
buftok (0.2.0)
|
||||
builder (3.2.3)
|
||||
byebug (9.0.6)
|
||||
capybara (2.12.1)
|
||||
capybara (2.14.4)
|
||||
addressable
|
||||
mime-types (>= 1.16)
|
||||
nokogiri (>= 1.3.3)
|
||||
rack (>= 1.0.0)
|
||||
rack-test (>= 0.5.4)
|
||||
xpath (~> 2.0)
|
||||
carrierwave (0.11.2)
|
||||
activemodel (>= 3.2.0)
|
||||
activesupport (>= 3.2.0)
|
||||
json (>= 1.7)
|
||||
carrierwave (1.1.0)
|
||||
activemodel (>= 4.0.0)
|
||||
activesupport (>= 4.0.0)
|
||||
mime-types (>= 1.16)
|
||||
mimemagic (>= 0.3.0)
|
||||
celluloid (0.17.3)
|
||||
celluloid-essentials
|
||||
celluloid-extras
|
||||
|
|
@ -116,10 +115,10 @@ GEM
|
|||
sass (>= 3.3.0, < 3.5)
|
||||
compass-import-once (1.0.5)
|
||||
sass (>= 3.2, < 3.5)
|
||||
compass-rails (2.0.5)
|
||||
compass-rails (3.0.2)
|
||||
compass (~> 1.0.0)
|
||||
sass-rails (< 5.1)
|
||||
sprockets (< 2.13)
|
||||
sprockets (< 4.0)
|
||||
concurrent-ruby (1.0.5)
|
||||
configurate (0.3.1)
|
||||
connection_pool (2.2.1)
|
||||
|
|
@ -145,18 +144,18 @@ GEM
|
|||
rspec (>= 2.12.0)
|
||||
cucumber-core (1.5.0)
|
||||
gherkin (~> 4.0)
|
||||
cucumber-rails (1.4.5)
|
||||
cucumber-rails (1.5.0)
|
||||
capybara (>= 1.1.2, < 3)
|
||||
cucumber (>= 1.3.8, < 4)
|
||||
mime-types (>= 1.16, < 4)
|
||||
mime-types (>= 1.17, < 4)
|
||||
nokogiri (~> 1.5)
|
||||
railties (>= 3, < 5.1)
|
||||
railties (>= 4, < 5.2)
|
||||
cucumber-wire (0.0.1)
|
||||
database_cleaner (1.5.3)
|
||||
devise (4.2.0)
|
||||
database_cleaner (1.6.1)
|
||||
devise (4.3.0)
|
||||
bcrypt (~> 3.0)
|
||||
orm_adapter (~> 0.1)
|
||||
railties (>= 4.1.0, < 5.1)
|
||||
railties (>= 4.1.0, < 5.2)
|
||||
responders
|
||||
warden (~> 1.2.3)
|
||||
devise_lastseenable (0.0.6)
|
||||
|
|
@ -178,7 +177,7 @@ GEM
|
|||
uuid (~> 2.3.8)
|
||||
diff-lcs (1.3)
|
||||
docile (1.1.5)
|
||||
domain_name (0.5.20170223)
|
||||
domain_name (0.5.20170404)
|
||||
unf (>= 0.0.5, < 1.0.0)
|
||||
entypo-rails (3.0.0)
|
||||
railties (>= 4.1, < 6)
|
||||
|
|
@ -188,11 +187,13 @@ GEM
|
|||
execjs
|
||||
multi_json (>= 1.3)
|
||||
rake
|
||||
et-orbi (1.0.5)
|
||||
tzinfo
|
||||
ethon (0.10.1)
|
||||
ffi (>= 1.3.0)
|
||||
excon (0.55.0)
|
||||
excon (0.57.1)
|
||||
execjs (2.7.0)
|
||||
eye (0.9.1)
|
||||
eye (0.9.2)
|
||||
celluloid (~> 0.17.3)
|
||||
celluloid-io (~> 0.17.0)
|
||||
sigar (~> 0.7.3)
|
||||
|
|
@ -212,35 +213,35 @@ GEM
|
|||
faraday_middleware (0.11.0.1)
|
||||
faraday (>= 0.7.4, < 1.0)
|
||||
ffi (1.9.18)
|
||||
fixture_builder (0.4.1)
|
||||
fixture_builder (0.5.0)
|
||||
activerecord (>= 2)
|
||||
activesupport (>= 2)
|
||||
fog-aws (1.2.1)
|
||||
fog-aws (1.4.0)
|
||||
fog-core (~> 1.38)
|
||||
fog-json (~> 1.0)
|
||||
fog-xml (~> 0.1)
|
||||
ipaddress (~> 0.8)
|
||||
fog-core (1.43.0)
|
||||
fog-core (1.44.3)
|
||||
builder
|
||||
excon (~> 0.49)
|
||||
formatador (~> 0.2)
|
||||
fog-json (1.0.2)
|
||||
fog-core (~> 1.0)
|
||||
multi_json (~> 1.10)
|
||||
fog-xml (0.1.2)
|
||||
fog-xml (0.1.3)
|
||||
fog-core
|
||||
nokogiri (~> 1.5, >= 1.5.11)
|
||||
nokogiri (>= 1.5.11, < 2.0.0)
|
||||
formatador (0.2.5)
|
||||
fuubar (2.2.0)
|
||||
rspec-core (~> 3.0)
|
||||
ruby-progressbar (~> 1.4)
|
||||
get_process_mem (0.2.1)
|
||||
gherkin (4.0.0)
|
||||
gitlab (4.0.0)
|
||||
gherkin (4.1.3)
|
||||
gitlab (4.2.0)
|
||||
httparty
|
||||
terminal-table (= 1.7.1)
|
||||
globalid (0.3.7)
|
||||
activesupport (>= 4.1.0)
|
||||
terminal-table
|
||||
globalid (0.4.0)
|
||||
activesupport (>= 4.2.0)
|
||||
gon (6.1.0)
|
||||
actionpack (>= 3.0)
|
||||
json
|
||||
|
|
@ -264,44 +265,44 @@ GEM
|
|||
guard (~> 2.1)
|
||||
guard-compat (~> 1.1)
|
||||
rspec (>= 2.99.0, < 4.0)
|
||||
guard-rubocop (1.2.0)
|
||||
guard-rubocop (1.3.0)
|
||||
guard (~> 2.0)
|
||||
rubocop (~> 0.20)
|
||||
haml (4.0.7)
|
||||
haml (5.0.1)
|
||||
temple (>= 0.8.0)
|
||||
tilt
|
||||
haml_lint (0.24.0)
|
||||
haml_lint (0.26.0)
|
||||
haml (>= 4.0, < 5.1)
|
||||
rainbow
|
||||
rake (>= 10, < 13)
|
||||
rubocop (>= 0.47.0)
|
||||
rubocop (>= 0.49.0)
|
||||
sysexits (~> 1.1)
|
||||
hamlit (2.8.0)
|
||||
hamlit (2.8.4)
|
||||
temple (>= 0.8.0)
|
||||
thor
|
||||
tilt
|
||||
handlebars_assets (0.23.1)
|
||||
handlebars_assets (0.23.2)
|
||||
execjs (~> 2.0)
|
||||
multi_json (~> 1.0)
|
||||
sprockets (>= 2.0.0)
|
||||
tilt (>= 1.2)
|
||||
hashdiff (0.3.2)
|
||||
hashie (3.5.5)
|
||||
hashdiff (0.3.4)
|
||||
hashie (3.5.6)
|
||||
hike (1.2.3)
|
||||
hitimes (1.2.4)
|
||||
http (2.2.1)
|
||||
hitimes (1.2.5)
|
||||
http (2.2.2)
|
||||
addressable (~> 2.3)
|
||||
http-cookie (~> 1.0)
|
||||
http-form_data (~> 1.0.1)
|
||||
http_parser.rb (~> 0.6.0)
|
||||
http-cookie (1.0.3)
|
||||
domain_name (~> 0.5)
|
||||
http-form_data (1.0.1)
|
||||
http_accept_language (2.1.0)
|
||||
http-form_data (1.0.3)
|
||||
http_accept_language (2.1.1)
|
||||
http_parser.rb (0.6.0)
|
||||
httparty (0.14.0)
|
||||
multi_xml (>= 0.5.2)
|
||||
httpclient (2.8.3)
|
||||
i18n (0.8.1)
|
||||
i18n (0.8.6)
|
||||
i18n-inflector (2.6.7)
|
||||
i18n (>= 0.4.1)
|
||||
i18n-inflector-rails (1.0.7)
|
||||
|
|
@ -316,19 +317,17 @@ GEM
|
|||
rake
|
||||
jasmine-core (2.5.2)
|
||||
jasmine-jquery-rails (2.0.3)
|
||||
jquery-rails (4.2.2)
|
||||
jquery-rails (4.3.1)
|
||||
rails-dom-testing (>= 1, < 3)
|
||||
railties (>= 4.2.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
jquery-ui-rails (5.0.5)
|
||||
railties (>= 3.2.16)
|
||||
js-routes (1.3.3)
|
||||
railties (>= 3.2)
|
||||
sprockets-rails
|
||||
js_image_paths (0.1.0)
|
||||
rails (~> 4.0)
|
||||
json (1.8.6)
|
||||
json-jwt (1.7.1)
|
||||
json (2.1.0)
|
||||
json-jwt (1.7.2)
|
||||
activesupport
|
||||
bindata
|
||||
multi_json (>= 1.3)
|
||||
|
|
@ -336,27 +335,28 @@ GEM
|
|||
url_safe_base64
|
||||
json-schema (2.8.0)
|
||||
addressable (>= 2.4)
|
||||
jsonpath (0.5.8)
|
||||
jsonpath (0.8.5)
|
||||
multi_json
|
||||
jwt (1.5.6)
|
||||
kgio (2.11.0)
|
||||
leaflet-rails (0.7.7)
|
||||
leaflet-rails (1.1.0)
|
||||
rails (>= 4.2.0)
|
||||
listen (3.1.5)
|
||||
rb-fsevent (~> 0.9, >= 0.9.4)
|
||||
rb-inotify (~> 0.9, >= 0.9.7)
|
||||
ruby_dep (~> 1.2)
|
||||
little-plugger (1.1.4)
|
||||
logging (2.1.0)
|
||||
logging (2.2.2)
|
||||
little-plugger (~> 1.1)
|
||||
multi_json (~> 1.10)
|
||||
logging-rails (0.5.0)
|
||||
logging-rails (0.6.0)
|
||||
logging (>= 1.8)
|
||||
loofah (2.0.3)
|
||||
nokogiri (>= 1.5.9)
|
||||
lumberjack (1.0.11)
|
||||
lumberjack (1.0.12)
|
||||
macaddr (1.7.1)
|
||||
systemu (~> 2.6.2)
|
||||
mail (2.6.4)
|
||||
mail (2.6.6)
|
||||
mime-types (>= 1.16, < 4)
|
||||
markerb (1.1.0)
|
||||
memoizable (0.4.2)
|
||||
|
|
@ -365,10 +365,9 @@ GEM
|
|||
mime-types (3.1)
|
||||
mime-types-data (~> 3.2015)
|
||||
mime-types-data (3.2016.0521)
|
||||
mimemagic (0.3.2)
|
||||
mini_magick (4.6.1)
|
||||
mini_portile2 (2.1.0)
|
||||
minitest (5.10.1)
|
||||
mini_magick (4.8.0)
|
||||
mini_portile2 (2.2.0)
|
||||
minitest (5.10.3)
|
||||
mobile-fu (1.3.1)
|
||||
rack-mobile-detect
|
||||
rails
|
||||
|
|
@ -376,27 +375,27 @@ GEM
|
|||
multi_test (0.1.2)
|
||||
multi_xml (0.6.0)
|
||||
multipart-post (2.0.0)
|
||||
mysql2 (0.4.5)
|
||||
mysql2 (0.4.8)
|
||||
naught (1.1.0)
|
||||
nenv (0.3.0)
|
||||
nio4r (2.0.0)
|
||||
nokogiri (1.7.2)
|
||||
mini_portile2 (~> 2.1.0)
|
||||
nio4r (2.1.0)
|
||||
nokogiri (1.8.0)
|
||||
mini_portile2 (~> 2.2.0)
|
||||
notiffany (0.1.1)
|
||||
nenv (~> 0.1)
|
||||
shellany (~> 0.0)
|
||||
oauth (0.5.1)
|
||||
oauth2 (1.3.1)
|
||||
faraday (>= 0.8, < 0.12)
|
||||
oauth (0.5.3)
|
||||
oauth2 (1.4.0)
|
||||
faraday (>= 0.8, < 0.13)
|
||||
jwt (~> 1.0)
|
||||
multi_json (~> 1.3)
|
||||
multi_xml (~> 0.5)
|
||||
rack (>= 1.2, < 3)
|
||||
octokit (4.7.0)
|
||||
sawyer (~> 0.8.0, >= 0.5.3)
|
||||
omniauth (1.4.2)
|
||||
hashie (>= 1.2, < 4)
|
||||
rack (>= 1.0, < 3)
|
||||
omniauth (1.6.1)
|
||||
hashie (>= 3.4.6, < 3.6.0)
|
||||
rack (>= 1.6.2, < 3)
|
||||
omniauth-facebook (4.0.0)
|
||||
omniauth-oauth2 (~> 1.2)
|
||||
omniauth-oauth (1.1.0)
|
||||
|
|
@ -416,28 +415,29 @@ GEM
|
|||
open_graph_reader (0.6.2)
|
||||
faraday (>= 0.9.0)
|
||||
nokogiri (~> 1.6)
|
||||
openid_connect (0.12.0)
|
||||
openid_connect (1.1.2)
|
||||
activemodel
|
||||
attr_required (>= 1.0.0)
|
||||
json (>= 1.4.3)
|
||||
json-jwt (>= 1.5.0)
|
||||
rack-oauth2 (>= 1.3.1)
|
||||
rack-oauth2 (>= 1.6.1)
|
||||
swd (>= 1.0.0)
|
||||
tzinfo
|
||||
validate_email
|
||||
validate_url
|
||||
webfinger (>= 1.0.1)
|
||||
orm_adapter (0.5.0)
|
||||
parallel (1.11.2)
|
||||
parser (2.4.0.0)
|
||||
ast (~> 2.2)
|
||||
pg (0.19.0)
|
||||
pg (0.21.0)
|
||||
phantomjs (2.1.1.0)
|
||||
poltergeist (1.13.0)
|
||||
poltergeist (1.15.0)
|
||||
capybara (~> 2.1)
|
||||
cliver (~> 0.3.1)
|
||||
websocket-driver (>= 0.2.0)
|
||||
powerpack (0.1.1)
|
||||
pronto (0.9.3)
|
||||
pronto (0.9.4)
|
||||
gitlab (~> 4.0, >= 4.0.0)
|
||||
httparty (>= 0.13.7, < 0.15)
|
||||
octokit (~> 4.7, >= 4.7.0)
|
||||
|
|
@ -466,42 +466,42 @@ GEM
|
|||
public_suffix (2.0.5)
|
||||
quiet_assets (1.1.0)
|
||||
railties (>= 3.1, < 5.0)
|
||||
rack (1.6.5)
|
||||
rack-cors (0.4.1)
|
||||
rack (1.6.8)
|
||||
rack-cors (1.0.1)
|
||||
rack-google-analytics (1.2.0)
|
||||
actionpack
|
||||
activesupport
|
||||
rack-mobile-detect (0.4.0)
|
||||
rack
|
||||
rack-oauth2 (1.5.1)
|
||||
rack-oauth2 (1.6.2)
|
||||
activesupport (>= 2.3)
|
||||
attr_required (>= 0.0.5)
|
||||
httpclient (>= 2.4)
|
||||
multi_json (>= 1.3.6)
|
||||
rack (>= 1.1)
|
||||
rack-piwik (0.3.0)
|
||||
rack-protection (1.5.3)
|
||||
rack-protection (2.0.0)
|
||||
rack
|
||||
rack-rewrite (1.5.1)
|
||||
rack-ssl (1.4.1)
|
||||
rack
|
||||
rack-test (0.6.3)
|
||||
rack (>= 1.0)
|
||||
rails (4.2.8)
|
||||
actionmailer (= 4.2.8)
|
||||
actionpack (= 4.2.8)
|
||||
actionview (= 4.2.8)
|
||||
activejob (= 4.2.8)
|
||||
activemodel (= 4.2.8)
|
||||
activerecord (= 4.2.8)
|
||||
activesupport (= 4.2.8)
|
||||
rails (4.2.9)
|
||||
actionmailer (= 4.2.9)
|
||||
actionpack (= 4.2.9)
|
||||
actionview (= 4.2.9)
|
||||
activejob (= 4.2.9)
|
||||
activemodel (= 4.2.9)
|
||||
activerecord (= 4.2.9)
|
||||
activesupport (= 4.2.9)
|
||||
bundler (>= 1.3.0, < 2.0)
|
||||
railties (= 4.2.8)
|
||||
railties (= 4.2.9)
|
||||
sprockets-rails
|
||||
rails-assets-autosize (3.0.20)
|
||||
rails-assets-autosize (4.0.0)
|
||||
rails-assets-backbone (1.3.3)
|
||||
rails-assets-underscore (>= 1.8.3)
|
||||
rails-assets-blueimp-gallery (2.25.0)
|
||||
rails-assets-blueimp-gallery (2.25.2)
|
||||
rails-assets-bootstrap (3.3.7)
|
||||
rails-assets-jquery (>= 1.9.1, < 4)
|
||||
rails-assets-bootstrap-markdown (2.10.0)
|
||||
|
|
@ -518,11 +518,11 @@ GEM
|
|||
rails-assets-emojione (2.0.1)
|
||||
rails-assets-favico.js (0.3.10)
|
||||
rails-assets-fine-uploader (5.13.0)
|
||||
rails-assets-highlightjs (9.9.0)
|
||||
rails-assets-jasmine (2.5.2)
|
||||
rails-assets-highlightjs (9.12.0)
|
||||
rails-assets-jasmine (2.6.4)
|
||||
rails-assets-jasmine-ajax (3.3.1)
|
||||
rails-assets-jasmine (~> 2)
|
||||
rails-assets-jquery (3.1.1)
|
||||
rails-assets-jquery (3.2.1)
|
||||
rails-assets-jquery-colorbox (1.6.4)
|
||||
rails-assets-jquery (>= 1.3.2)
|
||||
rails-assets-jquery-fullscreen-plugin (0.5.0)
|
||||
|
|
@ -536,7 +536,7 @@ GEM
|
|||
rails-assets-jquery.ui (1.11.4)
|
||||
rails-assets-jquery (>= 1.6)
|
||||
rails-assets-markdown-it--markdown-it-for-inline (0.1.1)
|
||||
rails-assets-markdown-it (8.3.0)
|
||||
rails-assets-markdown-it (8.3.1)
|
||||
rails-assets-markdown-it-diaspora-mention (1.2.0)
|
||||
rails-assets-markdown-it-hashtag (0.4.0)
|
||||
rails-assets-markdown-it-sanitizer (0.4.3)
|
||||
|
|
@ -552,67 +552,67 @@ GEM
|
|||
rails-deprecated_sanitizer (>= 1.0.1)
|
||||
rails-html-sanitizer (1.0.3)
|
||||
loofah (~> 2.0)
|
||||
rails-i18n (4.0.8)
|
||||
rails-i18n (4.0.9)
|
||||
i18n (~> 0.7)
|
||||
railties (~> 4.0)
|
||||
rails-timeago (2.16.0)
|
||||
actionpack (>= 3.1)
|
||||
activesupport (>= 3.1)
|
||||
railties (4.2.8)
|
||||
actionpack (= 4.2.8)
|
||||
activesupport (= 4.2.8)
|
||||
railties (4.2.9)
|
||||
actionpack (= 4.2.9)
|
||||
activesupport (= 4.2.9)
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rainbow (2.2.2)
|
||||
rake
|
||||
raindrops (0.17.0)
|
||||
raindrops (0.18.0)
|
||||
rake (12.0.0)
|
||||
rb-fsevent (0.9.8)
|
||||
rb-inotify (0.9.8)
|
||||
ffi (>= 0.5.0)
|
||||
rb-fsevent (0.10.2)
|
||||
rb-inotify (0.9.10)
|
||||
ffi (>= 0.5.0, < 2)
|
||||
redcarpet (3.4.0)
|
||||
redis (3.3.3)
|
||||
redis-namespace (1.5.3)
|
||||
redis (~> 3.0, >= 3.0.4)
|
||||
request_store (1.3.2)
|
||||
responders (2.3.0)
|
||||
railties (>= 4.2.0, < 5.1)
|
||||
rspec (3.5.0)
|
||||
rspec-core (~> 3.5.0)
|
||||
rspec-expectations (~> 3.5.0)
|
||||
rspec-mocks (~> 3.5.0)
|
||||
rspec-core (3.5.4)
|
||||
rspec-support (~> 3.5.0)
|
||||
rspec-expectations (3.5.0)
|
||||
responders (2.4.0)
|
||||
actionpack (>= 4.2.0, < 5.3)
|
||||
railties (>= 4.2.0, < 5.3)
|
||||
rspec (3.6.0)
|
||||
rspec-core (~> 3.6.0)
|
||||
rspec-expectations (~> 3.6.0)
|
||||
rspec-mocks (~> 3.6.0)
|
||||
rspec-core (3.6.0)
|
||||
rspec-support (~> 3.6.0)
|
||||
rspec-expectations (3.6.0)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.5.0)
|
||||
rspec-mocks (3.5.0)
|
||||
rspec-support (~> 3.6.0)
|
||||
rspec-mocks (3.6.0)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.5.0)
|
||||
rspec-rails (3.5.2)
|
||||
rspec-support (~> 3.6.0)
|
||||
rspec-rails (3.6.0)
|
||||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
railties (>= 3.0)
|
||||
rspec-core (~> 3.5.0)
|
||||
rspec-expectations (~> 3.5.0)
|
||||
rspec-mocks (~> 3.5.0)
|
||||
rspec-support (~> 3.5.0)
|
||||
rspec-support (3.5.0)
|
||||
rubocop (0.48.1)
|
||||
rspec-core (~> 3.6.0)
|
||||
rspec-expectations (~> 3.6.0)
|
||||
rspec-mocks (~> 3.6.0)
|
||||
rspec-support (~> 3.6.0)
|
||||
rspec-support (3.6.0)
|
||||
rubocop (0.49.1)
|
||||
parallel (~> 1.10)
|
||||
parser (>= 2.3.3.1, < 3.0)
|
||||
powerpack (~> 0.1)
|
||||
rainbow (>= 1.99.1, < 3.0)
|
||||
ruby-progressbar (~> 1.7)
|
||||
unicode-display_width (~> 1.0, >= 1.0.1)
|
||||
ruby-oembed (0.10.1)
|
||||
ruby-oembed (0.12.0)
|
||||
ruby-progressbar (1.8.1)
|
||||
ruby_dep (1.5.0)
|
||||
rubyzip (1.2.1)
|
||||
rufus-scheduler (3.3.4)
|
||||
tzinfo
|
||||
rugged (0.25.1.1)
|
||||
rufus-scheduler (3.4.2)
|
||||
et-orbi (~> 1.0)
|
||||
rugged (0.26.0)
|
||||
safe_yaml (1.0.4)
|
||||
sass (3.4.23)
|
||||
sass (3.4.25)
|
||||
sass-rails (5.0.6)
|
||||
railties (>= 4.0.0, < 6)
|
||||
sass (~> 3.1)
|
||||
|
|
@ -622,23 +622,22 @@ GEM
|
|||
sawyer (0.8.1)
|
||||
addressable (>= 2.3.5, < 2.6)
|
||||
faraday (~> 0.8, < 1.0)
|
||||
scss_lint (0.53.0)
|
||||
scss_lint (0.54.0)
|
||||
rake (>= 0.9, < 13)
|
||||
sass (~> 3.4.20)
|
||||
secure_headers (3.6.1)
|
||||
secure_headers (3.6.7)
|
||||
useragent
|
||||
securecompare (1.0.0)
|
||||
shellany (0.0.1)
|
||||
shoulda-matchers (3.1.1)
|
||||
shoulda-matchers (3.1.2)
|
||||
activesupport (>= 4.0.0)
|
||||
sidekiq (4.2.9)
|
||||
sidekiq (4.2.10)
|
||||
concurrent-ruby (~> 1.0)
|
||||
connection_pool (~> 2.2, >= 2.2.0)
|
||||
rack-protection (>= 1.5.0)
|
||||
redis (~> 3.2, >= 3.2.1)
|
||||
sidekiq-cron (0.4.5)
|
||||
redis-namespace (>= 1.5.2)
|
||||
rufus-scheduler (>= 2.0.24)
|
||||
sidekiq-cron (0.6.3)
|
||||
rufus-scheduler (>= 3.3.0)
|
||||
sidekiq (>= 4.2.1)
|
||||
sigar (0.7.3)
|
||||
simple_captcha2 (0.4.3)
|
||||
|
|
@ -648,11 +647,11 @@ GEM
|
|||
docile (~> 1.1.0)
|
||||
json (>= 1.8, < 3)
|
||||
simplecov-html (~> 0.10.0)
|
||||
simplecov-html (0.10.0)
|
||||
simplecov-html (0.10.1)
|
||||
sinon-rails (1.15.0)
|
||||
railties (>= 3.1)
|
||||
slop (3.6.0)
|
||||
spring (2.0.1)
|
||||
spring (2.0.2)
|
||||
activesupport (>= 4.2)
|
||||
spring-commands-cucumber (1.0.1)
|
||||
spring (>= 0.9.1)
|
||||
|
|
@ -667,7 +666,7 @@ GEM
|
|||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
sprockets (>= 2.8, < 4.0)
|
||||
state_machines (0.4.0)
|
||||
state_machines (0.5.0)
|
||||
string-direction (1.2.0)
|
||||
yard (~> 0.8)
|
||||
swd (1.0.1)
|
||||
|
|
@ -679,19 +678,19 @@ GEM
|
|||
sysexits (1.2.0)
|
||||
systemu (2.6.5)
|
||||
temple (0.8.0)
|
||||
term-ansicolor (1.4.0)
|
||||
term-ansicolor (1.6.0)
|
||||
tins (~> 1.0)
|
||||
terminal-table (1.7.1)
|
||||
unicode-display_width (~> 1.1.1)
|
||||
terminal-table (1.8.0)
|
||||
unicode-display_width (~> 1.1, >= 1.1.1)
|
||||
test_after_commit (1.1.0)
|
||||
activerecord (>= 3.2)
|
||||
thor (0.19.1)
|
||||
thread_safe (0.3.6)
|
||||
tilt (1.4.1)
|
||||
timecop (0.8.1)
|
||||
timecop (0.9.1)
|
||||
timers (4.1.2)
|
||||
hitimes
|
||||
tins (1.13.2)
|
||||
tins (1.15.0)
|
||||
turbo_dev_assets (0.0.2)
|
||||
twitter (6.1.0)
|
||||
addressable (~> 2.5)
|
||||
|
|
@ -703,19 +702,19 @@ GEM
|
|||
memoizable (~> 0.4.2)
|
||||
naught (~> 1.1)
|
||||
simple_oauth (~> 0.3.1)
|
||||
twitter-text (1.14.5)
|
||||
twitter-text (1.14.7)
|
||||
unf (~> 0.1.0)
|
||||
typhoeus (1.1.2)
|
||||
ethon (>= 0.9.0)
|
||||
tzinfo (1.2.3)
|
||||
thread_safe (~> 0.1)
|
||||
uglifier (3.1.2)
|
||||
uglifier (3.2.0)
|
||||
execjs (>= 0.3.0, < 3)
|
||||
unf (0.1.4)
|
||||
unf_ext
|
||||
unf_ext (0.0.7.2)
|
||||
unicode-display_width (1.1.3)
|
||||
unicorn (5.2.0)
|
||||
unf_ext (0.0.7.4)
|
||||
unicode-display_width (1.3.0)
|
||||
unicorn (5.3.0)
|
||||
kgio (~> 2.6)
|
||||
raindrops (~> 0.7)
|
||||
unicorn-worker-killer (0.4.4)
|
||||
|
|
@ -742,89 +741,88 @@ GEM
|
|||
activesupport
|
||||
httpclient (>= 2.4)
|
||||
multi_json
|
||||
webmock (2.3.2)
|
||||
webmock (3.0.1)
|
||||
addressable (>= 2.3.6)
|
||||
crack (>= 0.3.2)
|
||||
hashdiff
|
||||
websocket-driver (0.6.5)
|
||||
websocket-extensions (>= 0.1.0)
|
||||
websocket-extensions (0.1.2)
|
||||
will_paginate (3.1.5)
|
||||
xpath (2.0.0)
|
||||
will_paginate (3.1.6)
|
||||
xpath (2.1.0)
|
||||
nokogiri (~> 1.3)
|
||||
yard (0.9.8)
|
||||
yard (0.9.9)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
active_model_serializers (= 0.9.5)
|
||||
activerecord-import (= 0.17.1)
|
||||
active_model_serializers (= 0.9.7)
|
||||
activerecord-import (= 0.19.1)
|
||||
acts-as-taggable-on (= 3.5.0)
|
||||
acts_as_api (= 1.0.0)
|
||||
addressable (= 2.5.0)
|
||||
asset_sync (= 2.0.0)
|
||||
autoprefixer-rails (= 6.7.6)
|
||||
addressable (= 2.5.1)
|
||||
asset_sync (= 2.2.0)
|
||||
autoprefixer-rails (= 7.1.2.3)
|
||||
bootstrap-sass (= 3.3.7)
|
||||
bootstrap-switch-rails (= 3.3.3)
|
||||
capybara (= 2.12.1)
|
||||
carrierwave (= 0.11.2)
|
||||
compass-rails (= 2.0.5)
|
||||
capybara (= 2.14.4)
|
||||
carrierwave (= 1.1.0)
|
||||
compass-rails (= 3.0.2)
|
||||
configurate (= 0.3.1)
|
||||
coveralls
|
||||
cucumber-api-steps (= 0.13)
|
||||
cucumber-rails (= 1.4.5)
|
||||
database_cleaner (= 1.5.3)
|
||||
devise (= 4.2.0)
|
||||
cucumber-rails (= 1.5.0)
|
||||
database_cleaner (= 1.6.1)
|
||||
devise (= 4.3.0)
|
||||
devise_lastseenable (= 0.0.6)
|
||||
diaspora-prosody-config (= 0.0.7)
|
||||
diaspora_federation-rails (= 0.2.0)
|
||||
diaspora_federation-test (= 0.2.0)
|
||||
entypo-rails (= 3.0.0)
|
||||
eye (= 0.9.1)
|
||||
eye (= 0.9.2)
|
||||
factory_girl_rails (= 4.8.0)
|
||||
faraday (= 0.11.0)
|
||||
faraday-cookie_jar (= 0.0.6)
|
||||
faraday_middleware (= 0.11.0.1)
|
||||
fixture_builder (= 0.4.1)
|
||||
fog-aws (= 1.2.1)
|
||||
fixture_builder (= 0.5.0)
|
||||
fog-aws (= 1.4.0)
|
||||
fuubar (= 2.2.0)
|
||||
gon (= 6.1.0)
|
||||
guard (= 2.14.1)
|
||||
guard-cucumber (= 2.1.2)
|
||||
guard-rspec (= 4.7.3)
|
||||
guard-rubocop (= 1.2.0)
|
||||
haml_lint (= 0.24.0)
|
||||
hamlit (= 2.8.0)
|
||||
handlebars_assets (= 0.23.1)
|
||||
http_accept_language (= 2.1.0)
|
||||
guard-rubocop (= 1.3.0)
|
||||
haml_lint (= 0.26.0)
|
||||
hamlit (= 2.8.4)
|
||||
handlebars_assets (= 0.23.2)
|
||||
http_accept_language (= 2.1.1)
|
||||
i18n-inflector-rails (= 1.0.7)
|
||||
jasmine (= 2.5.2)
|
||||
jasmine-jquery-rails (= 2.0.3)
|
||||
jquery-rails (= 4.2.2)
|
||||
jquery-ui-rails (= 5.0.5)
|
||||
jquery-rails (= 4.3.1)
|
||||
js-routes (= 1.3.3)
|
||||
js_image_paths (= 0.1.0)
|
||||
json (= 1.8.6)
|
||||
json (= 2.1.0)
|
||||
json-schema (= 2.8.0)
|
||||
leaflet-rails (= 0.7.7)
|
||||
logging-rails (= 0.5.0)
|
||||
leaflet-rails (= 1.1.0)
|
||||
logging-rails (= 0.6.0)
|
||||
markerb (= 1.1.0)
|
||||
mini_magick (= 4.6.1)
|
||||
mini_magick (= 4.8.0)
|
||||
minitest
|
||||
mobile-fu (= 1.3.1)
|
||||
mysql2 (= 0.4.5)
|
||||
nokogiri (= 1.7.2)
|
||||
omniauth (= 1.4.2)
|
||||
mysql2 (= 0.4.8)
|
||||
nokogiri (= 1.8.0)
|
||||
omniauth (= 1.6.1)
|
||||
omniauth-facebook (= 4.0.0)
|
||||
omniauth-tumblr (= 1.2)
|
||||
omniauth-twitter (= 1.4.0)
|
||||
omniauth-wordpress (= 0.2.2)
|
||||
open_graph_reader (= 0.6.2)
|
||||
openid_connect (= 0.12.0)
|
||||
pg (= 0.19.0)
|
||||
poltergeist (= 1.13.0)
|
||||
pronto (= 0.9.3)
|
||||
openid_connect (= 1.1.2)
|
||||
pg (= 0.21.0)
|
||||
poltergeist (= 1.15.0)
|
||||
pronto (= 0.9.4)
|
||||
pronto-eslint (= 0.9.1)
|
||||
pronto-haml (= 0.9.0)
|
||||
pronto-rubocop (= 0.9.0)
|
||||
|
|
@ -832,26 +830,27 @@ DEPENDENCIES
|
|||
pry
|
||||
pry-byebug
|
||||
quiet_assets (= 1.1.0)
|
||||
rack-cors (= 0.4.1)
|
||||
rack-cors (= 1.0.1)
|
||||
rack-google-analytics (= 1.2.0)
|
||||
rack-piwik (= 0.3.0)
|
||||
rack-rewrite (= 1.5.1)
|
||||
rack-ssl (= 1.4.1)
|
||||
rails (= 4.2.8)
|
||||
rails-assets-autosize (= 3.0.20)!
|
||||
rails (= 4.2.9)
|
||||
rails-assets-autosize (= 4.0.0)!
|
||||
rails-assets-backbone (= 1.3.3)!
|
||||
rails-assets-blueimp-gallery (= 2.25.0)!
|
||||
rails-assets-blueimp-gallery (= 2.25.2)!
|
||||
rails-assets-bootstrap-markdown (= 2.10.0)!
|
||||
rails-assets-corejs-typeahead (= 1.1.1)!
|
||||
rails-assets-diaspora_jsxc (= 0.1.5.develop.7)!
|
||||
rails-assets-fine-uploader (= 5.13.0)!
|
||||
rails-assets-highlightjs (= 9.9.0)!
|
||||
rails-assets-highlightjs (= 9.12.0)!
|
||||
rails-assets-jasmine-ajax (= 3.3.1)!
|
||||
rails-assets-jquery (= 3.1.1)!
|
||||
rails-assets-jquery (= 3.2.1)!
|
||||
rails-assets-jquery-placeholder (= 2.3.1)!
|
||||
rails-assets-jquery-textchange (= 0.2.3)!
|
||||
rails-assets-jquery.are-you-sure (= 1.9.0)!
|
||||
rails-assets-markdown-it (= 8.3.0)!
|
||||
rails-assets-jquery.ui (= 1.11.4)!
|
||||
rails-assets-markdown-it (= 8.3.1)!
|
||||
rails-assets-markdown-it--markdown-it-for-inline (= 0.1.1)!
|
||||
rails-assets-markdown-it-diaspora-mention (= 1.2.0)!
|
||||
rails-assets-markdown-it-hashtag (= 0.4.0)!
|
||||
|
|
@ -859,42 +858,43 @@ DEPENDENCIES
|
|||
rails-assets-markdown-it-sub (= 1.0.0)!
|
||||
rails-assets-markdown-it-sup (= 1.0.0)!
|
||||
rails-assets-perfect-scrollbar (= 0.6.16)!
|
||||
rails-i18n (= 4.0.8)
|
||||
rails-i18n (= 4.0.9)
|
||||
rails-timeago (= 2.16.0)
|
||||
rb-fsevent (= 0.9.8)
|
||||
rb-inotify (= 0.9.8)
|
||||
rb-fsevent (= 0.10.2)
|
||||
rb-inotify (= 0.9.10)
|
||||
redcarpet (= 3.4.0)
|
||||
responders (= 2.3.0)
|
||||
rspec-rails (= 3.5.2)
|
||||
rubocop (= 0.48.1)
|
||||
ruby-oembed (= 0.10.1)
|
||||
responders (= 2.4.0)
|
||||
rspec-rails (= 3.6.0)
|
||||
rubocop (= 0.49.1)
|
||||
ruby-oembed (= 0.12.0)
|
||||
rubyzip (= 1.2.1)
|
||||
sass-rails (= 5.0.6)
|
||||
secure_headers (= 3.6.1)
|
||||
shoulda-matchers (= 3.1.1)
|
||||
sidekiq (= 4.2.9)
|
||||
sidekiq-cron (= 0.4.5)
|
||||
secure_headers (= 3.6.7)
|
||||
shoulda-matchers (= 3.1.2)
|
||||
sidekiq (= 4.2.10)
|
||||
sidekiq-cron (= 0.6.3)
|
||||
simple_captcha2 (= 0.4.3)
|
||||
simplecov (= 0.12.0)
|
||||
sinon-rails (= 1.15.0)
|
||||
spring (= 2.0.1)
|
||||
spring (= 2.0.2)
|
||||
spring-commands-cucumber (= 1.0.1)
|
||||
spring-commands-rspec (= 1.0.4)
|
||||
sprockets (= 2.12.4)
|
||||
string-direction (= 1.2.0)
|
||||
test_after_commit (= 1.1.0)
|
||||
thor (= 0.19.1)
|
||||
timecop (= 0.8.1)
|
||||
timecop (= 0.9.1)
|
||||
turbo_dev_assets (= 0.0.2)
|
||||
twitter (= 6.1.0)
|
||||
twitter-text (= 1.14.5)
|
||||
twitter-text (= 1.14.7)
|
||||
typhoeus (= 1.1.2)
|
||||
uglifier (= 3.1.2)
|
||||
unicorn (= 5.2.0)
|
||||
uglifier (= 3.2.0)
|
||||
unicorn (= 5.3.0)
|
||||
unicorn-worker-killer (= 0.4.4)
|
||||
uuid (= 2.3.8)
|
||||
versionist (= 1.5.0)
|
||||
webmock (= 2.3.2)
|
||||
will_paginate (= 3.1.5)
|
||||
webmock (= 3.0.1)
|
||||
will_paginate (= 3.1.6)
|
||||
|
||||
BUNDLED WITH
|
||||
1.14.6
|
||||
1.15.3
|
||||
|
|
|
|||
|
|
@ -10,10 +10,10 @@
|
|||
//= require charcount
|
||||
//= require jquery-placeholder
|
||||
//= require jquery.timeago
|
||||
//= require jquery-ui/core
|
||||
//= require jquery-ui/widget
|
||||
//= require jquery-ui/mouse
|
||||
//= require jquery-ui/sortable
|
||||
//= require jquery.ui/ui/core
|
||||
//= require jquery.ui/ui/widget
|
||||
//= require jquery.ui/ui/mouse
|
||||
//= require jquery.ui/ui/sortable
|
||||
//= require keycodes
|
||||
//= require jquery.autoSuggest.custom
|
||||
//= require fine-uploader/fine-uploader.core
|
||||
|
|
|
|||
|
|
@ -3,17 +3,15 @@
|
|||
# the COPYRIGHT file.
|
||||
|
||||
class ExportedUser < SecureUploader
|
||||
|
||||
def store_dir
|
||||
"uploads/users"
|
||||
end
|
||||
|
||||
def extension_white_list
|
||||
%w(gz)
|
||||
def extension_whitelist
|
||||
%w[gz]
|
||||
end
|
||||
|
||||
def filename
|
||||
"#{model.username}_diaspora_data_#{secure_token}.json.gz"
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ class ProcessedImage < CarrierWave::Uploader::Base
|
|||
"uploads/images"
|
||||
end
|
||||
|
||||
def extension_white_list
|
||||
%w(jpg jpeg png gif tiff)
|
||||
def extension_whitelist
|
||||
%w[jpg jpeg png gif tiff]
|
||||
end
|
||||
|
||||
def filename
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ class UnprocessedImage < CarrierWave::Uploader::Base
|
|||
include CarrierWave::MiniMagick
|
||||
|
||||
attr_accessor :strip_exif
|
||||
|
||||
|
||||
def strip_exif
|
||||
@strip_exif || false
|
||||
end
|
||||
|
|
@ -15,8 +15,8 @@ class UnprocessedImage < CarrierWave::Uploader::Base
|
|||
"uploads/images"
|
||||
end
|
||||
|
||||
def extension_white_list
|
||||
%w(jpg jpeg png gif)
|
||||
def extension_whitelist
|
||||
%w[jpg jpeg png gif]
|
||||
end
|
||||
|
||||
def filename
|
||||
|
|
@ -38,7 +38,7 @@ class UnprocessedImage < CarrierWave::Uploader::Base
|
|||
version :thumb_medium
|
||||
version :thumb_large
|
||||
version :scaled_full do
|
||||
process :get_version_dimensions
|
||||
process :get_version_dimensions
|
||||
end
|
||||
|
||||
def get_version_dimensions
|
||||
|
|
|
|||
|
|
@ -178,7 +178,7 @@ describe Photo, :type => :model do
|
|||
file = File.open(@fail_fixture_name)
|
||||
expect {
|
||||
@photo.unprocessed_image.store! file
|
||||
}.to raise_error CarrierWave::IntegrityError, 'You are not allowed to upload "xml" files, allowed types: jpg, jpeg, png, gif'
|
||||
}.to raise_error CarrierWave::IntegrityError
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in a new issue