Unverified Commit b4a63e73 authored by Jonne Haß's avatar Jonne Haß
Browse files

Merge branch 'stable' into develop

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