Commit 9dca1785 authored by Dennis Schubert's avatar Dennis Schubert

Merge branch 'stable' into develop

parents 1ed90444 b1f7a452
......@@ -4,11 +4,11 @@ gem "rails", "4.2.5"
# Legacy Rails features, remove me!
# responders (class level)
gem "responders", "2.1.0"
gem "responders", "2.1.1"
# Appserver
gem "unicorn", "4.9.0", require: false
gem "unicorn", "5.0.1", require: false
# Federation
......@@ -18,11 +18,11 @@ gem "diaspora_federation-rails", "0.0.10"
gem "acts_as_api", "0.4.2"
gem "json", "1.8.3"
gem "json-schema", "2.5.1"
gem "json-schema", "2.5.2"
# Authentication
gem "devise", "3.5.2"
gem "devise", "3.5.3"
gem "devise_lastseenable", "0.0.6"
gem "devise-token_authenticatable", "~> 0.4.0"
......@@ -56,7 +56,7 @@ gem "rack-cors", "0.4.0", require: "rack/cors"
gem "bootstrap-sass", "3.3.5.1"
gem "compass-rails", "2.0.5"
gem "sass-rails", "5.0.4"
gem "autoprefixer-rails", "6.0.3"
gem "autoprefixer-rails", "6.2.2"
gem "bootstrap-switch-rails", "3.3.3"
# Database
......@@ -65,7 +65,7 @@ group :mysql, optional: true do
gem "mysql2", "0.3.20"
end
group :postgresql, optional: true do
gem "pg", "0.18.3"
gem "pg", "0.18.4"
end
gem "activerecord-import", "0.10.0"
......@@ -73,7 +73,7 @@ gem "activerecord-import", "0.10.0"
# File uploading
gem "carrierwave", "0.10.0"
gem "fog", "1.34.0"
gem "fog", "1.37.0"
gem "mini_magick", "4.3.6"
gem "remotipart", "1.2.1"
......@@ -87,11 +87,11 @@ gem "entypo-rails", "3.0.0.pre.rc2"
# JavaScript
gem "backbone-on-rails", "1.2.0.0"
gem "handlebars_assets", "0.21.0"
gem "handlebars_assets", "0.22.0"
gem "jquery-rails", "4.0.5"
gem "jquery-ui-rails", "5.0.5"
gem "js_image_paths", "0.0.2"
gem "js-routes", "1.1.2"
gem "js-routes", "1.2.0"
source "https://rails-assets.org" do
gem "rails-assets-jquery", "1.11.2" # Should be kept in sync with jquery-rails
......@@ -109,9 +109,9 @@ source "https://rails-assets.org" do
# jQuery plugins
gem "rails-assets-jeresig--jquery.hotkeys", "0.2.0"
gem "rails-assets-jquery-placeholder", "2.1.3"
gem "rails-assets-jquery-placeholder", "2.3.1"
gem "rails-assets-jquery-textchange", "0.2.3"
gem "rails-assets-perfect-scrollbar", "0.6.7"
gem "rails-assets-perfect-scrollbar", "0.6.8"
gem "rails-assets-jakobmattsson--jquery-elastic", "1.6.11"
gem "rails-assets-autosize", "3.0.14"
gem "rails-assets-blueimp-gallery", "2.16.0"
......@@ -121,7 +121,7 @@ end
gem "http_accept_language", "2.0.5"
gem "i18n-inflector-rails", "1.0.7"
gem "rails-i18n", "4.0.5"
gem "rails-i18n", "4.0.8"
# Mail
......@@ -134,17 +134,17 @@ gem "leaflet-rails", "0.7.4"
# Parsing
gem "nokogiri", "1.6.7.1"
gem "redcarpet", "3.3.3"
gem "redcarpet", "3.3.4"
gem "twitter-text", "1.13.0"
gem "roxml", "3.1.6"
gem "ruby-oembed", "0.8.14"
gem "ruby-oembed", "0.9.0"
gem "open_graph_reader", "0.6.1"
# Services
gem "omniauth", "1.2.2"
gem "omniauth-facebook", "2.0.1"
gem "omniauth-tumblr", "1.1"
gem "omniauth", "1.3.1"
gem "omniauth-facebook", "3.0.0"
gem "omniauth-tumblr", "1.2"
gem "omniauth-twitter", "1.2.1"
gem "twitter", "5.15.0"
gem "omniauth-wordpress", "0.2.2"
......@@ -202,7 +202,7 @@ gem "minitest"
group :production do # we don"t install these on travis to speed up test runs
# Administration
gem "rails_admin", "0.7.0"
gem "rails_admin", "0.8.1"
# Analytics
......@@ -249,7 +249,7 @@ group :development do
# Preloading environment
gem "spring", "1.4.0"
gem "spring", "1.6.1"
gem "spring-commands-rspec", "1.0.4"
gem "spring-commands-cucumber", "1.0.1"
......@@ -259,7 +259,7 @@ group :development do
gem "pry-byebug"
# test coverage
gem "simplecov", "0.10.0", require: false
gem "simplecov", "0.11.1", require: false
end
group :test do
......@@ -268,7 +268,7 @@ 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.1"
gem "test_after_commit", "0.4.2"
# Cucumber (integration tests)
......@@ -280,8 +280,8 @@ group :test do
gem "factory_girl_rails", "4.5.0"
gem "timecop", "0.8.0"
gem "webmock", "1.22.1", require: false
gem "shoulda-matchers", "3.0.0"
gem "webmock", "1.22.3", require: false
gem "shoulda-matchers", "3.0.1"
gem "diaspora_federation-test", "0.0.10"
end
......@@ -294,7 +294,7 @@ group :development, :test do
gem "cucumber-rails", "1.4.2", require: false
# Jasmine (client side application tests (JS))
gem "jasmine", "2.3.1"
gem "jasmine", "2.4.0"
gem "jasmine-jquery-rails", "2.0.3"
gem "rails-assets-jasmine-ajax", "3.2.0", source: "https://rails-assets.org"
gem "sinon-rails", "1.15.0"
......
This diff is collapsed.
#!/usr/bin/env ruby
begin
load File.expand_path("../spring", __FILE__)
rescue LoadError
load File.expand_path('../spring', __FILE__)
rescue LoadError => e
raise unless e.message.include?('spring')
end
require 'bundler/setup'
load Gem.bin_path('cucumber', 'cucumber')
#!/usr/bin/env ruby
begin
load File.expand_path("../spring", __FILE__)
rescue LoadError
load File.expand_path('../spring', __FILE__)
rescue LoadError => e
raise unless e.message.include?('spring')
end
# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
APP_PATH = File.expand_path('../../config/application', __FILE__)
require_relative '../config/boot'
require File.expand_path('../../config/boot', __FILE__)
require 'rails/commands'
#!/usr/bin/env ruby
begin
load File.expand_path("../spring", __FILE__)
rescue LoadError
load File.expand_path('../spring', __FILE__)
rescue LoadError => e
raise unless e.message.include?('spring')
end
require_relative '../config/boot'
require 'rake'
......
#!/usr/bin/env ruby
begin
load File.expand_path("../spring", __FILE__)
rescue LoadError
load File.expand_path('../spring', __FILE__)
rescue LoadError => e
raise unless e.message.include?('spring')
end
require 'bundler/setup'
load Gem.bin_path('rspec-core', 'rspec')
#!/usr/bin/env ruby
# This file loads spring without using Bundler, in order to be fast
# It gets overwritten when you run the `spring binstub` command
# This file loads spring without using Bundler, in order to be fast.
# It gets overwritten when you run the `spring binstub` command.
unless defined?(Spring)
require "rubygems"
require "bundler"
require 'rubygems'
require 'bundler'
if match = Bundler.default_lockfile.read.match(/^GEM$.*?^ (?: )*spring \((.*?)\)$.*?^$/m)
ENV["GEM_PATH"] = ([Bundler.bundle_path.to_s] + Gem.path).join(File::PATH_SEPARATOR)
ENV["GEM_HOME"] = nil
Gem.paths = ENV
gem "spring", match[1]
require "spring/binstub"
if (match = Bundler.default_lockfile.read.match(/^GEM$.*?^ (?: )*spring \((.*?)\)$.*?^$/m))
Gem.paths = { 'GEM_PATH' => [Bundler.bundle_path.to_s, *Gem.path].uniq }
gem 'spring', match[1]
require 'spring/binstub'
end
end
......@@ -75,7 +75,7 @@ describe StreamsController, :type => :controller do
it "generates a jasmine fixture with a post containing a video", :fixture => true do
stub_request(
:get,
"http://www.youtube.com/oembed?format=json&frame=1&iframe=1&maxheight=420&maxwidth=420&scheme=https&url=http://www.youtube.com/watch?v=UYrkQL1bX4A"
"https://www.youtube.com/oembed?format=json&frame=1&iframe=1&maxheight=420&maxwidth=420&scheme=https&url=http://www.youtube.com/watch?v=UYrkQL1bX4A"
).with(
:headers => {'Accept'=>'*/*'}
).to_return(
......
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