Merge branch 'next-minor' into develop
This commit is contained in:
Benjamin Neff
commit
e82ac2199f
9 changed files with 306 additions and 274 deletions
24
.rubocop.yml
24
.rubocop.yml
|
|
@ -25,6 +25,15 @@ Metrics/ModuleLength:
|
|||
Metrics/AbcSize:
|
||||
Max: 20
|
||||
|
||||
# Some blocks are longer.
|
||||
Metrics/BlockLength:
|
||||
ExcludedMethods:
|
||||
- "namespace"
|
||||
- "create_table"
|
||||
Exclude:
|
||||
- "config/**/*.rb"
|
||||
- "spec/**/*.rb"
|
||||
|
||||
# No space makes the method definition shorter and differentiates
|
||||
# from a regular assignment.
|
||||
Style/SpaceAroundEqualsInParameterDefault:
|
||||
|
|
@ -51,7 +60,7 @@ Style/HashSyntax:
|
|||
EnforcedStyle: ruby19_no_mixed_keys
|
||||
|
||||
# has_key? and has_value? are far more readable than key? and value?
|
||||
Style/DeprecatedHashMethods:
|
||||
Style/PreferredHashMethods:
|
||||
Enabled: false
|
||||
|
||||
# String#% is by far the least verbose and only object oriented variant.
|
||||
|
|
@ -147,7 +156,20 @@ Style/OpMethod:
|
|||
Lint/Debugger:
|
||||
Enabled: false
|
||||
|
||||
# We used comparison everywhere.
|
||||
Style/NumericPredicate:
|
||||
EnforcedStyle: comparison
|
||||
|
||||
# Reset some HoundCI changes back to Rubocop defaults
|
||||
Style/DotPosition:
|
||||
EnforcedStyle: leading
|
||||
|
||||
### backward compatibility
|
||||
|
||||
# only with ruby >= 2.3
|
||||
Style/FrozenStringLiteralComment:
|
||||
Enabled: false
|
||||
|
||||
# only with ruby >= 2.4
|
||||
Performance/RegexpMatch:
|
||||
Enabled: false
|
||||
|
|
|
|||
122
Gemfile
122
Gemfile
|
|
@ -8,18 +8,18 @@ gem "responders", "2.3.0"
|
|||
|
||||
# Appserver
|
||||
|
||||
gem "unicorn", "5.1.0", require: false
|
||||
gem "unicorn", "5.2.0", require: false
|
||||
gem "unicorn-worker-killer", "0.4.4"
|
||||
|
||||
# Federation
|
||||
|
||||
gem "diaspora_federation-rails", "0.1.7"
|
||||
gem "diaspora_federation-rails", "0.1.8"
|
||||
|
||||
# API and JSON
|
||||
|
||||
gem "acts_as_api", "0.4.3"
|
||||
gem "acts_as_api", "1.0.0"
|
||||
gem "json", "1.8.6"
|
||||
gem "json-schema", "2.7.0"
|
||||
gem "json-schema", "2.8.0"
|
||||
|
||||
# Authentication
|
||||
|
||||
|
|
@ -28,19 +28,19 @@ gem "devise_lastseenable", "0.0.6"
|
|||
|
||||
# Captcha
|
||||
|
||||
gem "simple_captcha2", "0.4.0", require: "simple_captcha"
|
||||
gem "simple_captcha2", "0.4.3", require: "simple_captcha"
|
||||
|
||||
# Background processing
|
||||
|
||||
gem "sidekiq", "4.2.2"
|
||||
gem "sidekiq", "4.2.9"
|
||||
|
||||
# Scheduled processing
|
||||
|
||||
gem "sidekiq-cron", "0.4.4"
|
||||
gem "sidekiq-cron", "0.4.5"
|
||||
|
||||
# Compression
|
||||
|
||||
gem "uglifier", "3.0.2"
|
||||
gem "uglifier", "3.1.2"
|
||||
|
||||
# Configuration
|
||||
|
||||
|
|
@ -48,78 +48,78 @@ gem "configurate", "0.3.1"
|
|||
|
||||
# Cross-origin resource sharing
|
||||
|
||||
gem "rack-cors", "0.4.0", require: "rack/cors"
|
||||
gem "rack-cors", "0.4.1", require: "rack/cors"
|
||||
|
||||
# CSS
|
||||
|
||||
gem "bootstrap-sass", "3.3.7"
|
||||
gem "compass-rails", "2.0.5"
|
||||
gem "sass-rails", "5.0.6"
|
||||
gem "autoprefixer-rails", "6.5.1"
|
||||
gem "autoprefixer-rails", "6.7.6"
|
||||
gem "bootstrap-sass", "3.3.7"
|
||||
gem "bootstrap-switch-rails", "3.3.3"
|
||||
gem "compass-rails", "2.0.5"
|
||||
gem "sass-rails", "5.0.6"
|
||||
|
||||
# Database
|
||||
|
||||
group :mysql, optional: true do
|
||||
gem "mysql2", "0.4.4"
|
||||
gem "mysql2", "0.4.5"
|
||||
end
|
||||
group :postgresql, optional: true do
|
||||
gem "pg", "0.19.0"
|
||||
end
|
||||
|
||||
|
||||
gem "activerecord-import", "0.15.0"
|
||||
gem "activerecord-import", "0.17.1"
|
||||
|
||||
# File uploading
|
||||
|
||||
gem "fog-aws", "1.2.0"
|
||||
gem "fog-aws", "1.2.1"
|
||||
gem "carrierwave", "0.11.2"
|
||||
gem "mini_magick", "4.5.1"
|
||||
gem "mini_magick", "4.6.1"
|
||||
|
||||
# GUID generation
|
||||
gem "uuid", "2.3.8"
|
||||
|
||||
# Icons
|
||||
|
||||
gem "entypo-rails", "3.0.0.pre.rc2"
|
||||
gem "entypo-rails", "3.0.0"
|
||||
|
||||
# JavaScript
|
||||
|
||||
gem "handlebars_assets", "0.23.1"
|
||||
gem "jquery-rails", "4.2.1"
|
||||
gem "jquery-ui-rails", "5.0.5"
|
||||
gem "js-routes", "1.3.3"
|
||||
gem "js_image_paths", "0.1.0"
|
||||
gem "js-routes", "1.2.9"
|
||||
|
||||
source "https://rails-assets.org" do
|
||||
gem "rails-assets-jquery", "2.2.4" # Should be kept in sync with jquery-rails
|
||||
|
||||
gem "rails-assets-markdown-it", "8.2.2"
|
||||
gem "rails-assets-highlightjs", "9.9.0"
|
||||
gem "rails-assets-markdown-it", "8.3.0"
|
||||
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"
|
||||
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", "9.7.0"
|
||||
|
||||
gem "rails-assets-backbone", "1.3.3"
|
||||
gem "rails-assets-bootstrap-markdown", "2.10.0"
|
||||
gem "rails-assets-corejs-typeahead", "1.0.1"
|
||||
gem "rails-assets-fineuploader-dist", "5.11.0"
|
||||
gem "rails-assets-corejs-typeahead", "1.1.1"
|
||||
gem "rails-assets-fine-uploader", "5.13.0"
|
||||
|
||||
# jQuery plugins
|
||||
|
||||
gem "rails-assets-jquery-placeholder", "2.3.1"
|
||||
gem "rails-assets-jquery-textchange", "0.2.3"
|
||||
gem "rails-assets-perfect-scrollbar", "0.6.12"
|
||||
gem "rails-assets-autosize", "3.0.20"
|
||||
gem "rails-assets-blueimp-gallery", "2.21.3"
|
||||
gem "rails-assets-autosize", "3.0.20"
|
||||
gem "rails-assets-blueimp-gallery", "2.25.0"
|
||||
gem "rails-assets-jquery-placeholder", "2.3.1"
|
||||
gem "rails-assets-jquery-textchange", "0.2.3"
|
||||
gem "rails-assets-perfect-scrollbar", "0.6.16"
|
||||
end
|
||||
|
||||
# Localization
|
||||
|
||||
gem "http_accept_language", "2.0.5"
|
||||
gem "http_accept_language", "2.1.0"
|
||||
gem "i18n-inflector-rails", "1.0.7"
|
||||
gem "rails-i18n", "4.0.8"
|
||||
|
||||
|
|
@ -132,11 +132,11 @@ gem "leaflet-rails", "0.7.7"
|
|||
|
||||
# Parsing
|
||||
|
||||
gem "nokogiri", "1.6.8.1"
|
||||
gem "redcarpet", "3.3.4"
|
||||
gem "twitter-text", "1.14.0"
|
||||
gem "nokogiri", "1.7.0.1"
|
||||
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 "open_graph_reader", "0.6.1"
|
||||
gem "twitter-text", "1.14.5"
|
||||
|
||||
# RTL support
|
||||
|
||||
|
|
@ -144,15 +144,15 @@ gem "string-direction", "1.2.0"
|
|||
|
||||
# Security Headers
|
||||
|
||||
gem "secure_headers", "3.5.0"
|
||||
gem "secure_headers", "3.6.1"
|
||||
|
||||
# Services
|
||||
|
||||
gem "omniauth", "1.3.1"
|
||||
gem "omniauth", "1.4.2"
|
||||
gem "omniauth-facebook", "4.0.0"
|
||||
gem "omniauth-tumblr", "1.2"
|
||||
gem "omniauth-twitter", "1.2.1"
|
||||
gem "twitter", "5.16.0"
|
||||
gem "omniauth-twitter", "1.4.0"
|
||||
gem "twitter", "6.1.0"
|
||||
gem "omniauth-wordpress", "0.2.2"
|
||||
|
||||
# OpenID Connect
|
||||
|
|
@ -172,16 +172,16 @@ gem "acts-as-taggable-on", "3.5.0"
|
|||
|
||||
# URIs and HTTP
|
||||
|
||||
gem "addressable", "2.4.0", require: "addressable/uri"
|
||||
gem "faraday", "0.9.2"
|
||||
gem "faraday_middleware", "0.10.0"
|
||||
gem "addressable", "2.5.0", 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"
|
||||
gem "typhoeus", "1.1.0"
|
||||
gem "typhoeus", "1.1.2"
|
||||
|
||||
# Views
|
||||
|
||||
gem "gon", "6.1.0"
|
||||
gem "hamlit", "2.7.5"
|
||||
gem "hamlit", "2.8.0"
|
||||
gem "mobile-fu", "1.3.1"
|
||||
gem "will_paginate", "3.1.5"
|
||||
gem "rails-timeago", "2.11.0"
|
||||
|
|
@ -192,7 +192,7 @@ gem "logging-rails", "0.5.0", require: "logging/rails"
|
|||
|
||||
# Reading and writing zip files
|
||||
|
||||
gem "rubyzip", "1.2.0", require: "zip"
|
||||
gem "rubyzip", "1.2.1", require: "zip"
|
||||
|
||||
# Prevent occasions where minitest is not bundled in
|
||||
# packaged versions of ruby. See following issues/prs:
|
||||
|
|
@ -222,7 +222,7 @@ group :production do # we don"t install these on travis to speed up test runs
|
|||
|
||||
# Process management
|
||||
|
||||
gem "eye", "0.8.1"
|
||||
gem "eye", "0.9.1"
|
||||
|
||||
# Redirects
|
||||
|
||||
|
|
@ -236,25 +236,25 @@ end
|
|||
|
||||
group :development do
|
||||
# Automatic test runs
|
||||
gem "guard", "2.14.0", require: false
|
||||
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.7", require: false
|
||||
gem "rb-inotify", "0.9.7", require: false
|
||||
gem "rb-fsevent", "0.9.8", require: false
|
||||
gem "rb-inotify", "0.9.8", require: false
|
||||
|
||||
# Linters
|
||||
gem "rubocop", "0.40.0"
|
||||
gem "haml_lint", "0.18.2"
|
||||
gem "pronto", "0.7.1"
|
||||
gem "pronto-eslint", "0.7.0"
|
||||
gem "pronto-rubocop", "0.7.0"
|
||||
gem "pronto-haml", "0.7.0"
|
||||
gem "pronto-scss", "0.7.0", require: false
|
||||
gem "haml_lint", "0.21.0"
|
||||
gem "pronto", "0.8.2"
|
||||
gem "pronto-eslint", "0.8.0"
|
||||
gem "pronto-haml", "0.8.0"
|
||||
gem "pronto-rubocop", "0.8.0"
|
||||
gem "pronto-scss", "0.8.0", require: false
|
||||
gem "rubocop", "0.47.1"
|
||||
|
||||
# Preloading environment
|
||||
|
||||
gem "spring", "2.0.0"
|
||||
gem "spring", "2.0.1"
|
||||
gem "spring-commands-rspec", "1.0.4"
|
||||
gem "spring-commands-cucumber", "1.0.1"
|
||||
|
||||
|
|
@ -277,21 +277,21 @@ group :test do
|
|||
|
||||
# Cucumber (integration tests)
|
||||
|
||||
gem "capybara", "2.10.1"
|
||||
gem "capybara", "2.12.1"
|
||||
gem "database_cleaner", "1.5.3"
|
||||
gem "poltergeist", "1.11.0"
|
||||
gem "poltergeist", "1.13.0"
|
||||
|
||||
gem "cucumber-api-steps", "0.13", require: false
|
||||
gem "json_spec", "1.1.4"
|
||||
|
||||
# General helpers
|
||||
|
||||
gem "factory_girl_rails", "4.7.0"
|
||||
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 "diaspora_federation-test", "0.1.7"
|
||||
gem "diaspora_federation-test", "0.1.8"
|
||||
|
||||
# Coverage
|
||||
gem 'coveralls', require: false
|
||||
|
|
@ -305,9 +305,9 @@ group :development, :test do
|
|||
gem "cucumber-rails", "1.4.5", require: false
|
||||
|
||||
# Jasmine (client side application tests (JS))
|
||||
gem "jasmine", "2.5.1"
|
||||
gem "jasmine", "2.5.2"
|
||||
gem "jasmine-jquery-rails", "2.0.3"
|
||||
gem "rails-assets-jasmine-ajax", "3.2.0", source: "https://rails-assets.org"
|
||||
gem "rails-assets-jasmine-ajax", "3.3.1", source: "https://rails-assets.org"
|
||||
gem "sinon-rails", "1.15.0"
|
||||
|
||||
# silence assets
|
||||
|
|
|
|||
403
Gemfile.lock
403
Gemfile.lock
|
|
@ -33,7 +33,7 @@ GEM
|
|||
activemodel (= 4.2.8)
|
||||
activesupport (= 4.2.8)
|
||||
arel (~> 6.0)
|
||||
activerecord-import (0.15.0)
|
||||
activerecord-import (0.17.1)
|
||||
activerecord (>= 3.2)
|
||||
activesupport (4.2.8)
|
||||
i18n (~> 0.7)
|
||||
|
|
@ -42,11 +42,12 @@ GEM
|
|||
tzinfo (~> 1.1)
|
||||
acts-as-taggable-on (3.5.0)
|
||||
activerecord (>= 3.2, < 5)
|
||||
acts_as_api (0.4.3)
|
||||
acts_as_api (1.0.0)
|
||||
activemodel (>= 3.0.0)
|
||||
activesupport (>= 3.0.0)
|
||||
rack (>= 1.1.0)
|
||||
addressable (2.4.0)
|
||||
addressable (2.5.0)
|
||||
public_suffix (~> 2.0, >= 2.0.2)
|
||||
arel (6.0.4)
|
||||
asset_sync (2.0.0)
|
||||
activemodel
|
||||
|
|
@ -55,18 +56,18 @@ GEM
|
|||
unf
|
||||
ast (2.3.0)
|
||||
attr_required (1.0.1)
|
||||
autoprefixer-rails (6.5.1)
|
||||
autoprefixer-rails (6.7.6)
|
||||
execjs
|
||||
bcrypt (3.1.11)
|
||||
bindata (2.3.1)
|
||||
bindata (2.3.5)
|
||||
bootstrap-sass (3.3.7)
|
||||
autoprefixer-rails (>= 5.2.1)
|
||||
sass (>= 3.3.4)
|
||||
bootstrap-switch-rails (3.3.3)
|
||||
buftok (0.2.0)
|
||||
builder (3.2.3)
|
||||
byebug (9.0.5)
|
||||
capybara (2.10.1)
|
||||
byebug (9.0.6)
|
||||
capybara (2.12.1)
|
||||
addressable
|
||||
mime-types (>= 1.16)
|
||||
nokogiri (>= 1.3.3)
|
||||
|
|
@ -100,7 +101,7 @@ GEM
|
|||
timers (>= 4.1.1)
|
||||
celluloid-supervision (0.20.6)
|
||||
timers (>= 4.1.1)
|
||||
chunky_png (1.3.6)
|
||||
chunky_png (1.3.8)
|
||||
cliver (0.3.2)
|
||||
coderay (1.1.1)
|
||||
coffee-rails (4.2.1)
|
||||
|
|
@ -109,7 +110,7 @@ GEM
|
|||
coffee-script (2.4.1)
|
||||
coffee-script-source
|
||||
execjs
|
||||
coffee-script-source (1.10.0)
|
||||
coffee-script-source (1.12.2)
|
||||
compass (1.0.3)
|
||||
chunky_png (~> 1.2)
|
||||
compass-core (~> 1.0.2)
|
||||
|
|
@ -126,15 +127,15 @@ GEM
|
|||
compass (~> 1.0.0)
|
||||
sass-rails (< 5.1)
|
||||
sprockets (< 2.13)
|
||||
concurrent-ruby (1.0.2)
|
||||
concurrent-ruby (1.0.5)
|
||||
configurate (0.3.1)
|
||||
connection_pool (2.2.0)
|
||||
coveralls (0.8.15)
|
||||
connection_pool (2.2.1)
|
||||
coveralls (0.8.19)
|
||||
json (>= 1.8, < 3)
|
||||
simplecov (~> 0.12.0)
|
||||
term-ansicolor (~> 1.3)
|
||||
thor (~> 0.19.1)
|
||||
tins (>= 1.6.0, < 2)
|
||||
tins (~> 1.6)
|
||||
crack (0.4.3)
|
||||
safe_yaml (~> 1.0.0)
|
||||
cucumber (2.4.0)
|
||||
|
|
@ -169,25 +170,26 @@ GEM
|
|||
devise
|
||||
rails (>= 3.0.4)
|
||||
diaspora-prosody-config (0.0.7)
|
||||
diaspora_federation (0.1.7)
|
||||
faraday (>= 0.9.0, < 0.11.0)
|
||||
faraday_middleware (~> 0.10.0)
|
||||
diaspora_federation (0.1.8)
|
||||
faraday (>= 0.9.0, < 0.12.0)
|
||||
faraday_middleware (>= 0.10.0, < 0.12.0)
|
||||
nokogiri (~> 1.6, >= 1.6.8)
|
||||
typhoeus (~> 1.0)
|
||||
valid (~> 1.0)
|
||||
diaspora_federation-rails (0.1.7)
|
||||
diaspora_federation (= 0.1.7)
|
||||
diaspora_federation-rails (0.1.8)
|
||||
diaspora_federation (= 0.1.8)
|
||||
rails (>= 4.2, < 6)
|
||||
diaspora_federation-test (0.1.7)
|
||||
diaspora_federation (= 0.1.7)
|
||||
diaspora_federation-test (0.1.8)
|
||||
diaspora_federation (= 0.1.8)
|
||||
factory_girl (~> 4.7)
|
||||
diff-lcs (1.2.5)
|
||||
uuid (~> 2.3.8)
|
||||
diff-lcs (1.3)
|
||||
docile (1.1.5)
|
||||
domain_name (0.5.20160615)
|
||||
domain_name (0.5.20170223)
|
||||
unf (>= 0.0.5, < 1.0.0)
|
||||
entypo-rails (3.0.0.pre.rc2)
|
||||
railties (>= 4.1, <= 5)
|
||||
equalizer (0.0.10)
|
||||
entypo-rails (3.0.0)
|
||||
railties (>= 4.1, < 6)
|
||||
equalizer (0.0.11)
|
||||
erubis (2.7.0)
|
||||
eslintrb (2.1.0)
|
||||
execjs
|
||||
|
|
@ -195,31 +197,31 @@ GEM
|
|||
rake
|
||||
ethon (0.10.1)
|
||||
ffi (>= 1.3.0)
|
||||
excon (0.54.0)
|
||||
excon (0.55.0)
|
||||
execjs (2.7.0)
|
||||
eye (0.8.1)
|
||||
eye (0.9.1)
|
||||
celluloid (~> 0.17.3)
|
||||
celluloid-io (~> 0.17.0)
|
||||
sigar (~> 0.7.3)
|
||||
state_machine
|
||||
state_machines
|
||||
thor
|
||||
factory_girl (4.7.0)
|
||||
factory_girl (4.8.0)
|
||||
activesupport (>= 3.0.0)
|
||||
factory_girl_rails (4.7.0)
|
||||
factory_girl (~> 4.7.0)
|
||||
factory_girl_rails (4.8.0)
|
||||
factory_girl (~> 4.8.0)
|
||||
railties (>= 3.0.0)
|
||||
faraday (0.9.2)
|
||||
faraday (0.11.0)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
faraday-cookie_jar (0.0.6)
|
||||
faraday (>= 0.7.4)
|
||||
http-cookie (~> 1.0.0)
|
||||
faraday_middleware (0.10.0)
|
||||
faraday (>= 0.7.4, < 0.10)
|
||||
ffi (1.9.14)
|
||||
faraday_middleware (0.11.0.1)
|
||||
faraday (>= 0.7.4, < 1.0)
|
||||
ffi (1.9.17)
|
||||
fixture_builder (0.4.1)
|
||||
activerecord (>= 2)
|
||||
activesupport (>= 2)
|
||||
fog-aws (1.2.0)
|
||||
fog-aws (1.2.1)
|
||||
fog-core (~> 1.38)
|
||||
fog-json (~> 1.0)
|
||||
fog-xml (~> 0.1)
|
||||
|
|
@ -234,7 +236,7 @@ GEM
|
|||
fog-xml (0.1.2)
|
||||
fog-core
|
||||
nokogiri (~> 1.5, >= 1.5.11)
|
||||
font-awesome-rails (4.6.3.1)
|
||||
font-awesome-rails (4.7.0.1)
|
||||
railties (>= 3.2, < 5.1)
|
||||
formatador (0.2.5)
|
||||
fuubar (2.2.0)
|
||||
|
|
@ -252,7 +254,7 @@ GEM
|
|||
json
|
||||
multi_json
|
||||
request_store (>= 1.0)
|
||||
guard (2.14.0)
|
||||
guard (2.14.1)
|
||||
formatador (>= 0.2.4)
|
||||
listen (>= 2.7, < 4.0)
|
||||
lumberjack (~> 1.0)
|
||||
|
|
@ -275,13 +277,13 @@ GEM
|
|||
rubocop (~> 0.20)
|
||||
haml (4.0.7)
|
||||
tilt
|
||||
haml_lint (0.18.2)
|
||||
haml_lint (0.21.0)
|
||||
haml (~> 4.0)
|
||||
rake (>= 10, < 12)
|
||||
rubocop (>= 0.36.0)
|
||||
rake (>= 10, < 13)
|
||||
rubocop (>= 0.47.0)
|
||||
sysexits (~> 1.1)
|
||||
hamlit (2.7.5)
|
||||
temple (~> 0.7.6)
|
||||
hamlit (2.8.0)
|
||||
temple (>= 0.8.0)
|
||||
thor
|
||||
tilt
|
||||
handlebars_assets (0.23.1)
|
||||
|
|
@ -290,23 +292,23 @@ GEM
|
|||
sprockets (>= 2.0.0)
|
||||
tilt (>= 1.2)
|
||||
hashdiff (0.3.2)
|
||||
hashie (3.4.4)
|
||||
hashie (3.5.5)
|
||||
hike (1.2.3)
|
||||
hitimes (1.2.4)
|
||||
http (1.0.4)
|
||||
http (2.2.1)
|
||||
addressable (~> 2.3)
|
||||
http-cookie (~> 1.0)
|
||||
http-form_data (~> 1.0.1)
|
||||
http_parser.rb (~> 0.6.0)
|
||||
http-cookie (1.0.2)
|
||||
http-cookie (1.0.3)
|
||||
domain_name (~> 0.5)
|
||||
http-form_data (1.0.1)
|
||||
http_accept_language (2.0.5)
|
||||
http_accept_language (2.1.0)
|
||||
http_parser.rb (0.6.0)
|
||||
httparty (0.13.7)
|
||||
json (~> 1.8)
|
||||
multi_xml (>= 0.5.2)
|
||||
httpclient (2.8.1)
|
||||
httpclient (2.8.3)
|
||||
i18n (0.8.1)
|
||||
i18n-inflector (2.6.7)
|
||||
i18n (>= 0.4.1)
|
||||
|
|
@ -315,7 +317,7 @@ GEM
|
|||
i18n-inflector (~> 2.6)
|
||||
railties (>= 3.0.0)
|
||||
ipaddress (0.8.3)
|
||||
jasmine (2.5.1)
|
||||
jasmine (2.5.2)
|
||||
jasmine-core (>= 2.5.1, < 3.0.0)
|
||||
phantomjs
|
||||
rack (>= 1.2.1)
|
||||
|
|
@ -328,30 +330,30 @@ GEM
|
|||
thor (>= 0.14, < 2.0)
|
||||
jquery-ui-rails (5.0.5)
|
||||
railties (>= 3.2.16)
|
||||
js-routes (1.2.9)
|
||||
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.6.3)
|
||||
json-jwt (1.7.1)
|
||||
activesupport
|
||||
bindata
|
||||
multi_json (>= 1.3)
|
||||
securecompare
|
||||
url_safe_base64
|
||||
json-schema (2.7.0)
|
||||
json-schema (2.8.0)
|
||||
addressable (>= 2.4)
|
||||
json_spec (1.1.4)
|
||||
multi_json (~> 1.0)
|
||||
rspec (>= 2.0, < 4.0)
|
||||
jsonpath (0.5.8)
|
||||
multi_json
|
||||
jwt (1.5.4)
|
||||
kaminari (0.16.3)
|
||||
jwt (1.5.6)
|
||||
kaminari (0.17.0)
|
||||
actionpack (>= 3.0.0)
|
||||
activesupport (>= 3.0.0)
|
||||
kgio (2.10.0)
|
||||
kgio (2.11.0)
|
||||
leaflet-rails (0.7.7)
|
||||
listen (3.1.5)
|
||||
rb-fsevent (~> 0.9, >= 0.9.4)
|
||||
|
|
@ -365,7 +367,7 @@ GEM
|
|||
logging (>= 1.8)
|
||||
loofah (2.0.3)
|
||||
nokogiri (>= 1.5.9)
|
||||
lumberjack (1.0.10)
|
||||
lumberjack (1.0.11)
|
||||
macaddr (1.7.1)
|
||||
systemu (~> 2.6.2)
|
||||
mail (2.6.4)
|
||||
|
|
@ -377,8 +379,8 @@ GEM
|
|||
mime-types (3.1)
|
||||
mime-types-data (~> 3.2015)
|
||||
mime-types-data (3.2016.0521)
|
||||
mimemagic (0.3.1)
|
||||
mini_magick (4.5.1)
|
||||
mimemagic (0.3.2)
|
||||
mini_magick (4.6.1)
|
||||
mini_portile2 (2.1.0)
|
||||
minitest (5.10.1)
|
||||
mobile-fu (1.3.1)
|
||||
|
|
@ -386,28 +388,28 @@ GEM
|
|||
rails
|
||||
multi_json (1.12.1)
|
||||
multi_test (0.1.2)
|
||||
multi_xml (0.5.5)
|
||||
multi_xml (0.6.0)
|
||||
multipart-post (2.0.0)
|
||||
mysql2 (0.4.4)
|
||||
mysql2 (0.4.5)
|
||||
naught (1.1.0)
|
||||
nenv (0.3.0)
|
||||
nested_form (0.3.2)
|
||||
nio4r (1.2.1)
|
||||
nokogiri (1.6.8.1)
|
||||
nio4r (2.0.0)
|
||||
nokogiri (1.7.0.1)
|
||||
mini_portile2 (~> 2.1.0)
|
||||
notiffany (0.1.1)
|
||||
nenv (~> 0.1)
|
||||
shellany (~> 0.0)
|
||||
oauth (0.5.1)
|
||||
oauth2 (1.2.0)
|
||||
faraday (>= 0.8, < 0.10)
|
||||
oauth2 (1.3.1)
|
||||
faraday (>= 0.8, < 0.12)
|
||||
jwt (~> 1.0)
|
||||
multi_json (~> 1.3)
|
||||
multi_xml (~> 0.5)
|
||||
rack (>= 1.2, < 3)
|
||||
octokit (4.3.0)
|
||||
sawyer (~> 0.7.0, >= 0.5.3)
|
||||
omniauth (1.3.1)
|
||||
octokit (4.6.2)
|
||||
sawyer (~> 0.8.0, >= 0.5.3)
|
||||
omniauth (1.4.2)
|
||||
hashie (>= 1.2, < 4)
|
||||
rack (>= 1.0, < 3)
|
||||
omniauth-facebook (4.0.0)
|
||||
|
|
@ -421,13 +423,13 @@ GEM
|
|||
omniauth-tumblr (1.2)
|
||||
multi_json
|
||||
omniauth-oauth (~> 1.0)
|
||||
omniauth-twitter (1.2.1)
|
||||
json (~> 1.3)
|
||||
omniauth-twitter (1.4.0)
|
||||
omniauth-oauth (~> 1.1)
|
||||
rack
|
||||
omniauth-wordpress (0.2.2)
|
||||
omniauth-oauth2 (>= 1.1.0)
|
||||
open_graph_reader (0.6.1)
|
||||
faraday (~> 0.9.0)
|
||||
open_graph_reader (0.6.2)
|
||||
faraday (>= 0.9.0)
|
||||
nokogiri (~> 1.6)
|
||||
openid_connect (0.12.0)
|
||||
activemodel
|
||||
|
|
@ -441,51 +443,52 @@ GEM
|
|||
validate_url
|
||||
webfinger (>= 1.0.1)
|
||||
orm_adapter (0.5.0)
|
||||
parser (2.3.1.4)
|
||||
parser (2.4.0.0)
|
||||
ast (~> 2.2)
|
||||
pg (0.19.0)
|
||||
phantomjs (2.1.1.0)
|
||||
poltergeist (1.11.0)
|
||||
poltergeist (1.13.0)
|
||||
capybara (~> 2.1)
|
||||
cliver (~> 0.3.1)
|
||||
websocket-driver (>= 0.2.0)
|
||||
powerpack (0.1.1)
|
||||
pronto (0.7.1)
|
||||
pronto (0.8.2)
|
||||
gitlab (~> 3.6, >= 3.4.0)
|
||||
httparty (~> 0.13.7)
|
||||
httparty (>= 0.13.7, < 0.15)
|
||||
octokit (~> 4.3, >= 4.1.0)
|
||||
rainbow (~> 2.1)
|
||||
rugged (~> 0.24, >= 0.23.0)
|
||||
thor (~> 0.19.0)
|
||||
pronto-eslint (0.7.0)
|
||||
pronto-eslint (0.8.0)
|
||||
eslintrb (~> 2.0, >= 2.0.0)
|
||||
pronto (~> 0.7.0)
|
||||
pronto-haml (0.7.0)
|
||||
pronto (~> 0.8.0)
|
||||
pronto-haml (0.8.0)
|
||||
haml_lint (~> 0.16, >= 0.15.0)
|
||||
pronto (~> 0.7.0)
|
||||
pronto-rubocop (0.7.0)
|
||||
pronto (~> 0.7.0)
|
||||
pronto (~> 0.8.0)
|
||||
pronto-rubocop (0.8.0)
|
||||
pronto (~> 0.8.0)
|
||||
rubocop (~> 0.38, >= 0.35.0)
|
||||
pronto-scss (0.7.0)
|
||||
pronto (~> 0.7.0)
|
||||
pronto-scss (0.8.0)
|
||||
pronto (~> 0.8.0)
|
||||
scss_lint (~> 0.43, >= 0.43.0)
|
||||
pry (0.10.4)
|
||||
coderay (~> 1.1.0)
|
||||
method_source (~> 0.8.1)
|
||||
slop (~> 3.4)
|
||||
pry-byebug (3.4.0)
|
||||
pry-byebug (3.4.2)
|
||||
byebug (~> 9.0)
|
||||
pry (~> 0.10)
|
||||
public_suffix (2.0.5)
|
||||
quiet_assets (1.1.0)
|
||||
railties (>= 3.1, < 5.0)
|
||||
rack (1.6.5)
|
||||
rack-cors (0.4.0)
|
||||
rack-cors (0.4.1)
|
||||
rack-google-analytics (1.2.0)
|
||||
actionpack
|
||||
activesupport
|
||||
rack-mobile-detect (0.4.0)
|
||||
rack
|
||||
rack-oauth2 (1.4.0)
|
||||
rack-oauth2 (1.5.1)
|
||||
activesupport (>= 2.3)
|
||||
attr_required (>= 0.0.5)
|
||||
httpclient (>= 2.4)
|
||||
|
|
@ -516,13 +519,13 @@ GEM
|
|||
rails-assets-autosize (3.0.20)
|
||||
rails-assets-backbone (1.3.3)
|
||||
rails-assets-underscore (>= 1.8.3)
|
||||
rails-assets-blueimp-gallery (2.21.3)
|
||||
rails-assets-blueimp-gallery (2.25.0)
|
||||
rails-assets-bootstrap (3.3.7)
|
||||
rails-assets-jquery (>= 1.9.1, < 4)
|
||||
rails-assets-bootstrap-markdown (2.10.0)
|
||||
rails-assets-bootstrap (~> 3)
|
||||
rails-assets-corejs-typeahead (1.0.1)
|
||||
rails-assets-jquery (>= 1.7)
|
||||
rails-assets-corejs-typeahead (1.1.1)
|
||||
rails-assets-jquery (>= 1.11)
|
||||
rails-assets-diaspora_jsxc (0.1.5.develop.7)
|
||||
rails-assets-emojione (~> 2.0.1)
|
||||
rails-assets-favico.js (>= 0.3.10, < 0.4)
|
||||
|
|
@ -532,10 +535,10 @@ GEM
|
|||
rails-assets-jquery.ui (~> 1.11.4)
|
||||
rails-assets-emojione (2.0.1)
|
||||
rails-assets-favico.js (0.3.10)
|
||||
rails-assets-fineuploader-dist (5.11.0)
|
||||
rails-assets-highlightjs (9.7.0)
|
||||
rails-assets-jasmine (2.4.1)
|
||||
rails-assets-jasmine-ajax (3.2.0)
|
||||
rails-assets-fine-uploader (5.13.0)
|
||||
rails-assets-highlightjs (9.9.0)
|
||||
rails-assets-jasmine (2.5.2)
|
||||
rails-assets-jasmine-ajax (3.3.1)
|
||||
rails-assets-jasmine (~> 2)
|
||||
rails-assets-jquery (2.2.4)
|
||||
rails-assets-jquery-colorbox (1.6.4)
|
||||
|
|
@ -549,13 +552,13 @@ 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.2.2)
|
||||
rails-assets-markdown-it (8.3.0)
|
||||
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)
|
||||
rails-assets-markdown-it-sub (1.0.0)
|
||||
rails-assets-markdown-it-sup (1.0.0)
|
||||
rails-assets-perfect-scrollbar (0.6.12)
|
||||
rails-assets-perfect-scrollbar (0.6.16)
|
||||
rails-assets-underscore (1.8.3)
|
||||
rails-deprecated_sanitizer (1.0.3)
|
||||
activesupport (>= 4.2.0.alpha)
|
||||
|
|
@ -590,18 +593,18 @@ GEM
|
|||
activesupport (= 4.2.8)
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rainbow (2.1.0)
|
||||
raindrops (0.16.0)
|
||||
rake (11.3.0)
|
||||
rb-fsevent (0.9.7)
|
||||
rb-inotify (0.9.7)
|
||||
rainbow (2.2.1)
|
||||
raindrops (0.17.0)
|
||||
rake (12.0.0)
|
||||
rb-fsevent (0.9.8)
|
||||
rb-inotify (0.9.8)
|
||||
ffi (>= 0.5.0)
|
||||
redcarpet (3.3.4)
|
||||
redis (3.3.1)
|
||||
redis-namespace (1.5.2)
|
||||
redcarpet (3.4.0)
|
||||
redis (3.3.3)
|
||||
redis-namespace (1.5.3)
|
||||
redis (~> 3.0, >= 3.0.4)
|
||||
remotipart (1.2.1)
|
||||
request_store (1.3.1)
|
||||
remotipart (1.3.1)
|
||||
request_store (1.3.2)
|
||||
responders (2.3.0)
|
||||
railties (>= 4.2.0, < 5.1)
|
||||
rspec (3.5.0)
|
||||
|
|
@ -625,49 +628,50 @@ GEM
|
|||
rspec-mocks (~> 3.5.0)
|
||||
rspec-support (~> 3.5.0)
|
||||
rspec-support (3.5.0)
|
||||
rubocop (0.40.0)
|
||||
parser (>= 2.3.1.0, < 3.0)
|
||||
rubocop (0.47.1)
|
||||
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-progressbar (1.8.1)
|
||||
ruby_dep (1.3.1)
|
||||
rubyzip (1.2.0)
|
||||
rufus-scheduler (3.2.2)
|
||||
rugged (0.24.0)
|
||||
ruby_dep (1.5.0)
|
||||
rubyzip (1.2.1)
|
||||
rufus-scheduler (3.3.4)
|
||||
tzinfo
|
||||
rugged (0.25.1.1)
|
||||
safe_yaml (1.0.4)
|
||||
sass (3.4.22)
|
||||
sass (3.4.23)
|
||||
sass-rails (5.0.6)
|
||||
railties (>= 4.0.0, < 6)
|
||||
sass (~> 3.1)
|
||||
sprockets (>= 2.8, < 4.0)
|
||||
sprockets-rails (>= 2.0, < 4.0)
|
||||
tilt (>= 1.1, < 3)
|
||||
sawyer (0.7.0)
|
||||
addressable (>= 2.3.5, < 2.5)
|
||||
faraday (~> 0.8, < 0.10)
|
||||
scss_lint (0.49.0)
|
||||
rake (>= 0.9, < 12)
|
||||
sawyer (0.8.1)
|
||||
addressable (>= 2.3.5, < 2.6)
|
||||
faraday (~> 0.8, < 1.0)
|
||||
scss_lint (0.52.0)
|
||||
rake (>= 0.9, < 13)
|
||||
sass (~> 3.4.20)
|
||||
secure_headers (3.5.0)
|
||||
secure_headers (3.6.1)
|
||||
useragent
|
||||
securecompare (1.0.0)
|
||||
shellany (0.0.1)
|
||||
shoulda-matchers (3.1.1)
|
||||
activesupport (>= 4.0.0)
|
||||
sidekiq (4.2.2)
|
||||
sidekiq (4.2.9)
|
||||
concurrent-ruby (~> 1.0)
|
||||
connection_pool (~> 2.2, >= 2.2.0)
|
||||
rack-protection (~> 1.5)
|
||||
rack-protection (>= 1.5.0)
|
||||
redis (~> 3.2, >= 3.2.1)
|
||||
sidekiq-cron (0.4.4)
|
||||
sidekiq-cron (0.4.5)
|
||||
redis-namespace (>= 1.5.2)
|
||||
rufus-scheduler (>= 2.0.24)
|
||||
sidekiq (>= 4.2.1)
|
||||
sigar (0.7.3)
|
||||
simple_captcha2 (0.4.0)
|
||||
simple_captcha2 (0.4.3)
|
||||
rails (>= 4.1)
|
||||
simple_oauth (0.3.1)
|
||||
simplecov (0.12.0)
|
||||
|
|
@ -678,7 +682,7 @@ GEM
|
|||
sinon-rails (1.15.0)
|
||||
railties (>= 3.1)
|
||||
slop (3.6.0)
|
||||
spring (2.0.0)
|
||||
spring (2.0.1)
|
||||
activesupport (>= 4.2)
|
||||
spring-commands-cucumber (1.0.1)
|
||||
spring (>= 0.9.1)
|
||||
|
|
@ -693,7 +697,7 @@ GEM
|
|||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
sprockets (>= 2.8, < 4.0)
|
||||
state_machine (1.2.0)
|
||||
state_machines (0.4.0)
|
||||
string-direction (1.2.0)
|
||||
yard (~> 0.8)
|
||||
swd (1.0.1)
|
||||
|
|
@ -704,8 +708,8 @@ GEM
|
|||
json (>= 1.4.3)
|
||||
sysexits (1.2.0)
|
||||
systemu (2.6.5)
|
||||
temple (0.7.7)
|
||||
term-ansicolor (1.3.2)
|
||||
temple (0.8.0)
|
||||
term-ansicolor (1.4.0)
|
||||
tins (~> 1.0)
|
||||
terminal-table (1.7.3)
|
||||
unicode-display_width (~> 1.1.1)
|
||||
|
|
@ -715,34 +719,33 @@ GEM
|
|||
thread_safe (0.3.6)
|
||||
tilt (1.4.1)
|
||||
timecop (0.8.1)
|
||||
timers (4.1.1)
|
||||
timers (4.1.2)
|
||||
hitimes
|
||||
tins (1.12.0)
|
||||
tins (1.13.2)
|
||||
turbo_dev_assets (0.0.2)
|
||||
twitter (5.16.0)
|
||||
addressable (~> 2.3)
|
||||
twitter (6.1.0)
|
||||
addressable (~> 2.5)
|
||||
buftok (~> 0.2.0)
|
||||
equalizer (= 0.0.10)
|
||||
faraday (~> 0.9.0)
|
||||
http (~> 1.0)
|
||||
equalizer (= 0.0.11)
|
||||
faraday (~> 0.11.0)
|
||||
http (~> 2.1)
|
||||
http_parser.rb (~> 0.6.0)
|
||||
json (~> 1.8)
|
||||
memoizable (~> 0.4.0)
|
||||
naught (~> 1.0)
|
||||
simple_oauth (~> 0.3.0)
|
||||
twitter-text (1.14.0)
|
||||
memoizable (~> 0.4.2)
|
||||
naught (~> 1.1)
|
||||
simple_oauth (~> 0.3.1)
|
||||
twitter-text (1.14.5)
|
||||
unf (~> 0.1.0)
|
||||
typhoeus (1.1.0)
|
||||
typhoeus (1.1.2)
|
||||
ethon (>= 0.9.0)
|
||||
tzinfo (1.2.2)
|
||||
thread_safe (~> 0.1)
|
||||
uglifier (3.0.2)
|
||||
uglifier (3.1.2)
|
||||
execjs (>= 0.3.0, < 3)
|
||||
unf (0.1.4)
|
||||
unf_ext
|
||||
unf_ext (0.0.7.2)
|
||||
unicode-display_width (1.1.1)
|
||||
unicorn (5.1.0)
|
||||
unicode-display_width (1.1.3)
|
||||
unicorn (5.2.0)
|
||||
kgio (~> 2.6)
|
||||
raindrops (~> 0.7)
|
||||
unicorn-worker-killer (0.4.4)
|
||||
|
|
@ -763,7 +766,7 @@ GEM
|
|||
activesupport (>= 3)
|
||||
railties (>= 3)
|
||||
yard (~> 0.7)
|
||||
warden (1.2.6)
|
||||
warden (1.2.7)
|
||||
rack (>= 1.0)
|
||||
webfinger (1.0.2)
|
||||
activesupport
|
||||
|
|
@ -773,28 +776,28 @@ GEM
|
|||
addressable (>= 2.3.6)
|
||||
crack (>= 0.3.2)
|
||||
hashdiff
|
||||
websocket-driver (0.6.4)
|
||||
websocket-driver (0.6.5)
|
||||
websocket-extensions (>= 0.1.0)
|
||||
websocket-extensions (0.1.2)
|
||||
will_paginate (3.1.5)
|
||||
xpath (2.0.0)
|
||||
nokogiri (~> 1.3)
|
||||
yard (0.8.7.6)
|
||||
yard (0.9.8)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
active_model_serializers (= 0.9.5)
|
||||
activerecord-import (= 0.15.0)
|
||||
activerecord-import (= 0.17.1)
|
||||
acts-as-taggable-on (= 3.5.0)
|
||||
acts_as_api (= 0.4.3)
|
||||
addressable (= 2.4.0)
|
||||
acts_as_api (= 1.0.0)
|
||||
addressable (= 2.5.0)
|
||||
asset_sync (= 2.0.0)
|
||||
autoprefixer-rails (= 6.5.1)
|
||||
autoprefixer-rails (= 6.7.6)
|
||||
bootstrap-sass (= 3.3.7)
|
||||
bootstrap-switch-rails (= 3.3.3)
|
||||
capybara (= 2.10.1)
|
||||
capybara (= 2.12.1)
|
||||
carrierwave (= 0.11.2)
|
||||
compass-rails (= 2.0.5)
|
||||
configurate (= 0.3.1)
|
||||
|
|
@ -805,62 +808,62 @@ DEPENDENCIES
|
|||
devise (= 4.2.0)
|
||||
devise_lastseenable (= 0.0.6)
|
||||
diaspora-prosody-config (= 0.0.7)
|
||||
diaspora_federation-rails (= 0.1.7)
|
||||
diaspora_federation-test (= 0.1.7)
|
||||
entypo-rails (= 3.0.0.pre.rc2)
|
||||
eye (= 0.8.1)
|
||||
factory_girl_rails (= 4.7.0)
|
||||
faraday (= 0.9.2)
|
||||
diaspora_federation-rails (= 0.1.8)
|
||||
diaspora_federation-test (= 0.1.8)
|
||||
entypo-rails (= 3.0.0)
|
||||
eye (= 0.9.1)
|
||||
factory_girl_rails (= 4.8.0)
|
||||
faraday (= 0.11.0)
|
||||
faraday-cookie_jar (= 0.0.6)
|
||||
faraday_middleware (= 0.10.0)
|
||||
faraday_middleware (= 0.11.0.1)
|
||||
fixture_builder (= 0.4.1)
|
||||
fog-aws (= 1.2.0)
|
||||
fog-aws (= 1.2.1)
|
||||
fuubar (= 2.2.0)
|
||||
gon (= 6.1.0)
|
||||
guard (= 2.14.0)
|
||||
guard (= 2.14.1)
|
||||
guard-cucumber (= 2.1.2)
|
||||
guard-rspec (= 4.7.3)
|
||||
guard-rubocop (= 1.2.0)
|
||||
haml_lint (= 0.18.2)
|
||||
hamlit (= 2.7.5)
|
||||
haml_lint (= 0.21.0)
|
||||
hamlit (= 2.8.0)
|
||||
handlebars_assets (= 0.23.1)
|
||||
http_accept_language (= 2.0.5)
|
||||
http_accept_language (= 2.1.0)
|
||||
i18n-inflector-rails (= 1.0.7)
|
||||
jasmine (= 2.5.1)
|
||||
jasmine (= 2.5.2)
|
||||
jasmine-jquery-rails (= 2.0.3)
|
||||
jquery-rails (= 4.2.1)
|
||||
jquery-ui-rails (= 5.0.5)
|
||||
js-routes (= 1.2.9)
|
||||
js-routes (= 1.3.3)
|
||||
js_image_paths (= 0.1.0)
|
||||
json (= 1.8.6)
|
||||
json-schema (= 2.7.0)
|
||||
json-schema (= 2.8.0)
|
||||
json_spec (= 1.1.4)
|
||||
leaflet-rails (= 0.7.7)
|
||||
logging-rails (= 0.5.0)
|
||||
markerb (= 1.1.0)
|
||||
mini_magick (= 4.5.1)
|
||||
mini_magick (= 4.6.1)
|
||||
minitest
|
||||
mobile-fu (= 1.3.1)
|
||||
mysql2 (= 0.4.4)
|
||||
nokogiri (= 1.6.8.1)
|
||||
omniauth (= 1.3.1)
|
||||
mysql2 (= 0.4.5)
|
||||
nokogiri (= 1.7.0.1)
|
||||
omniauth (= 1.4.2)
|
||||
omniauth-facebook (= 4.0.0)
|
||||
omniauth-tumblr (= 1.2)
|
||||
omniauth-twitter (= 1.2.1)
|
||||
omniauth-twitter (= 1.4.0)
|
||||
omniauth-wordpress (= 0.2.2)
|
||||
open_graph_reader (= 0.6.1)
|
||||
open_graph_reader (= 0.6.2)
|
||||
openid_connect (= 0.12.0)
|
||||
pg (= 0.19.0)
|
||||
poltergeist (= 1.11.0)
|
||||
pronto (= 0.7.1)
|
||||
pronto-eslint (= 0.7.0)
|
||||
pronto-haml (= 0.7.0)
|
||||
pronto-rubocop (= 0.7.0)
|
||||
pronto-scss (= 0.7.0)
|
||||
poltergeist (= 1.13.0)
|
||||
pronto (= 0.8.2)
|
||||
pronto-eslint (= 0.8.0)
|
||||
pronto-haml (= 0.8.0)
|
||||
pronto-rubocop (= 0.8.0)
|
||||
pronto-scss (= 0.8.0)
|
||||
pry
|
||||
pry-byebug
|
||||
quiet_assets (= 1.1.0)
|
||||
rack-cors (= 0.4.0)
|
||||
rack-cors (= 0.4.1)
|
||||
rack-google-analytics (= 1.2.0)
|
||||
rack-piwik (= 0.3.0)
|
||||
rack-rewrite (= 1.5.1)
|
||||
|
|
@ -868,55 +871,55 @@ DEPENDENCIES
|
|||
rails (= 4.2.8)
|
||||
rails-assets-autosize (= 3.0.20)!
|
||||
rails-assets-backbone (= 1.3.3)!
|
||||
rails-assets-blueimp-gallery (= 2.21.3)!
|
||||
rails-assets-blueimp-gallery (= 2.25.0)!
|
||||
rails-assets-bootstrap-markdown (= 2.10.0)!
|
||||
rails-assets-corejs-typeahead (= 1.0.1)!
|
||||
rails-assets-corejs-typeahead (= 1.1.1)!
|
||||
rails-assets-diaspora_jsxc (= 0.1.5.develop.7)!
|
||||
rails-assets-fineuploader-dist (= 5.11.0)!
|
||||
rails-assets-highlightjs (= 9.7.0)!
|
||||
rails-assets-jasmine-ajax (= 3.2.0)!
|
||||
rails-assets-fine-uploader (= 5.13.0)!
|
||||
rails-assets-highlightjs (= 9.9.0)!
|
||||
rails-assets-jasmine-ajax (= 3.3.1)!
|
||||
rails-assets-jquery (= 2.2.4)!
|
||||
rails-assets-jquery-placeholder (= 2.3.1)!
|
||||
rails-assets-jquery-textchange (= 0.2.3)!
|
||||
rails-assets-markdown-it (= 8.2.2)!
|
||||
rails-assets-markdown-it (= 8.3.0)!
|
||||
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)!
|
||||
rails-assets-markdown-it-sanitizer (= 0.4.3)!
|
||||
rails-assets-markdown-it-sub (= 1.0.0)!
|
||||
rails-assets-markdown-it-sup (= 1.0.0)!
|
||||
rails-assets-perfect-scrollbar (= 0.6.12)!
|
||||
rails-assets-perfect-scrollbar (= 0.6.16)!
|
||||
rails-i18n (= 4.0.8)
|
||||
rails-timeago (= 2.11.0)
|
||||
rails_admin (= 0.8.1)
|
||||
rb-fsevent (= 0.9.7)
|
||||
rb-inotify (= 0.9.7)
|
||||
redcarpet (= 3.3.4)
|
||||
rb-fsevent (= 0.9.8)
|
||||
rb-inotify (= 0.9.8)
|
||||
redcarpet (= 3.4.0)
|
||||
responders (= 2.3.0)
|
||||
rspec-rails (= 3.5.2)
|
||||
rubocop (= 0.40.0)
|
||||
rubocop (= 0.47.1)
|
||||
ruby-oembed (= 0.10.1)
|
||||
rubyzip (= 1.2.0)
|
||||
rubyzip (= 1.2.1)
|
||||
sass-rails (= 5.0.6)
|
||||
secure_headers (= 3.5.0)
|
||||
secure_headers (= 3.6.1)
|
||||
shoulda-matchers (= 3.1.1)
|
||||
sidekiq (= 4.2.2)
|
||||
sidekiq-cron (= 0.4.4)
|
||||
simple_captcha2 (= 0.4.0)
|
||||
sidekiq (= 4.2.9)
|
||||
sidekiq-cron (= 0.4.5)
|
||||
simple_captcha2 (= 0.4.3)
|
||||
simplecov (= 0.12.0)
|
||||
sinon-rails (= 1.15.0)
|
||||
spring (= 2.0.0)
|
||||
spring (= 2.0.1)
|
||||
spring-commands-cucumber (= 1.0.1)
|
||||
spring-commands-rspec (= 1.0.4)
|
||||
string-direction (= 1.2.0)
|
||||
test_after_commit (= 1.1.0)
|
||||
timecop (= 0.8.1)
|
||||
turbo_dev_assets (= 0.0.2)
|
||||
twitter (= 5.16.0)
|
||||
twitter-text (= 1.14.0)
|
||||
typhoeus (= 1.1.0)
|
||||
uglifier (= 3.0.2)
|
||||
unicorn (= 5.1.0)
|
||||
twitter (= 6.1.0)
|
||||
twitter-text (= 1.14.5)
|
||||
typhoeus (= 1.1.2)
|
||||
uglifier (= 3.1.2)
|
||||
unicorn (= 5.2.0)
|
||||
unicorn-worker-killer (= 0.4.4)
|
||||
uuid (= 2.3.8)
|
||||
versionist (= 1.5.0)
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
//= require handlebars.runtime
|
||||
//= require templates
|
||||
//= require main
|
||||
//= require fineuploader-dist/dist/fine-uploader.core
|
||||
//= require fine-uploader/fine-uploader.core
|
||||
//= require mobile/mobile
|
||||
//= require jquery.autoSuggest.custom
|
||||
//= require contact-list
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
//= require jquery-ui/sortable
|
||||
//= require keycodes
|
||||
//= require jquery.autoSuggest.custom
|
||||
//= require fineuploader-dist/dist/fine-uploader.core
|
||||
//= require fine-uploader/fine-uploader.core
|
||||
//= require handlebars.runtime
|
||||
//= require posix-bracket-expressions
|
||||
//= require markdown-it
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
//= require autosize
|
||||
//= require keycodes
|
||||
//= require jquery.autoSuggest.custom
|
||||
//= require fineuploader-dist/dist/fine-uploader.core
|
||||
//= require fine-uploader/fine-uploader.core
|
||||
//= require rails-timeago
|
||||
//= require underscore
|
||||
//= require bootstrap
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ Before do
|
|||
stub_request(:head, /.+/).with(
|
||||
headers: {
|
||||
"Accept" => "text/html",
|
||||
"User-Agent" => "OpenGraphReader/0.6.1 (+https://github.com/jhass/open_graph_reader)"
|
||||
"User-Agent" => "OpenGraphReader/0.6.2 (+https://github.com/jhass/open_graph_reader)"
|
||||
}
|
||||
).to_return(status: 200, body: "", headers: {"Content-Type" => "text/plain"})
|
||||
end
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ module NodeInfo
|
|||
SCHEMAS = {}
|
||||
private_constant :VERSIONS, :SCHEMAS
|
||||
|
||||
# rubocop:disable Metrics/BlockLength
|
||||
Document = Struct.new(:version, :software, :protocols, :services, :open_registrations, :usage, :metadata) do
|
||||
Software = Struct.new(:name, :version) do
|
||||
def initialize(name=nil, version=nil)
|
||||
|
|
@ -132,6 +133,7 @@ module NodeInfo
|
|||
end
|
||||
end
|
||||
end
|
||||
# rubocop:enable Metrics/BlockLength
|
||||
|
||||
def self.schema(version)
|
||||
SCHEMAS[version] ||= JSON.parse(
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ describe Api::OpenidConnect::ClientsController, type: :controller, suppress_csrf
|
|||
.with(headers: {
|
||||
"Accept" => "*/*",
|
||||
"Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3",
|
||||
"User-Agent" => "Faraday v0.9.2"
|
||||
"User-Agent" => "Faraday v0.11.0"
|
||||
})
|
||||
.to_return(status: 200, body: "[\"http://localhost\"]", headers: {})
|
||||
post :create, redirect_uris: ["http://localhost"], client_name: "diaspora client",
|
||||
|
|
@ -26,7 +26,8 @@ describe Api::OpenidConnect::ClientsController, type: :controller, suppress_csrf
|
|||
.with(headers: {
|
||||
"Accept" => "*/*",
|
||||
"Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3",
|
||||
"User-Agent" => "Faraday v0.9.2"})
|
||||
"User-Agent" => "Faraday v0.11.0"
|
||||
})
|
||||
.to_return(status: 200, body: "[\"http://localhost\"]", headers: {})
|
||||
post :create, redirect_uris: ["http://localhost"], client_name: "diaspora client",
|
||||
response_types: [], grant_types: [], application_type: "web", contacts: [],
|
||||
|
|
@ -83,14 +84,18 @@ describe Api::OpenidConnect::ClientsController, type: :controller, suppress_csrf
|
|||
context "when valid parameters with jwks_uri is passed" do
|
||||
it "should return a client id" do
|
||||
stub_request(:get, "http://example.com/uris")
|
||||
.with(headers: {"Accept" => "*/*",
|
||||
"Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3",
|
||||
"User-Agent" => "Faraday v0.9.2"})
|
||||
.with(headers: {
|
||||
"Accept" => "*/*",
|
||||
"Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3",
|
||||
"User-Agent" => "Faraday v0.11.0"
|
||||
})
|
||||
.to_return(status: 200, body: "[\"http://localhost\"]", headers: {})
|
||||
stub_request(:get, "https://kentshikama.com/api/openid_connect/jwks.json")
|
||||
.with(headers: {"Accept" => "*/*",
|
||||
"Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3",
|
||||
"User-Agent" => "Faraday v0.9.2"})
|
||||
.with(headers: {
|
||||
"Accept" => "*/*",
|
||||
"Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3",
|
||||
"User-Agent" => "Faraday v0.11.0"
|
||||
})
|
||||
.to_return(status: 200,
|
||||
body: "{\"keys\":[{\"kty\":\"RSA\",\"e\":\"AQAB\",\"n\":\"qpW\",\"use\":\"sig\"}]}", headers: {})
|
||||
post :create, redirect_uris: ["http://localhost"], client_name: "diaspora client",
|
||||
|
|
|
|||
Loading…
Reference in a new issue