Commit e82ac219 authored by Benjamin Neff's avatar Benjamin Neff

Merge branch 'next-minor' into develop

parents e1bf447a 612455d4
......@@ -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
......@@ -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
......
This diff is collapsed.
......@@ -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",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment