Jonne Haß
commit
9935dc9999
3 changed files with 82 additions and 82 deletions
38
Gemfile
38
Gemfile
|
|
@ -17,11 +17,13 @@ gem 'devise', '2.1.3'
|
|||
|
||||
# Background processing
|
||||
|
||||
gem 'sidekiq', '2.10.0'
|
||||
gem 'sidekiq', '2.10.1'
|
||||
gem 'sinatra', '1.3.3'
|
||||
gem 'slim', '1.3.8'
|
||||
|
||||
# Configuration
|
||||
|
||||
gem 'configurate', '0.0.2'
|
||||
gem 'configurate', '0.0.6'
|
||||
|
||||
# Cross-origin resource sharing
|
||||
|
||||
|
|
@ -32,15 +34,15 @@ gem 'rack-cors', '0.2.7', :require => 'rack/cors'
|
|||
ENV['DB'] ||= 'mysql'
|
||||
|
||||
gem 'mysql2', '0.3.11' if ENV['DB'] == 'all' || ENV['DB'] == 'mysql'
|
||||
gem 'pg', '0.14.1' if ENV['DB'] == 'all' || ENV['DB'] == 'postgres'
|
||||
gem 'pg', '0.15.1' if ENV['DB'] == 'all' || ENV['DB'] == 'postgres'
|
||||
|
||||
gem 'activerecord-import', '0.3.1'
|
||||
gem 'foreigner', '1.4.0'
|
||||
gem 'foreigner', '1.4.1'
|
||||
|
||||
# File uploading
|
||||
|
||||
gem 'carrierwave', '0.8.0'
|
||||
gem 'fog', '1.10.0'
|
||||
gem 'fog', '1.10.1'
|
||||
gem 'mini_magick', '3.5'
|
||||
gem 'remotipart', '1.0.5'
|
||||
|
||||
|
|
@ -65,28 +67,28 @@ gem 'ruby-oembed', '0.8.8'
|
|||
|
||||
# Services
|
||||
|
||||
gem 'omniauth', '1.1.3'
|
||||
gem 'omniauth', '1.1.4'
|
||||
gem 'omniauth-facebook', '1.4.1'
|
||||
gem 'omniauth-tumblr', '1.1'
|
||||
gem 'omniauth-twitter', '0.0.15'
|
||||
gem 'omniauth-twitter', '0.0.16'
|
||||
gem 'twitter', '4.6.2'
|
||||
|
||||
# Tags
|
||||
|
||||
gem 'acts-as-taggable-on', '2.3.3'
|
||||
gem 'acts-as-taggable-on', '2.4.0'
|
||||
|
||||
# URIs and HTTP
|
||||
|
||||
gem 'addressable', '2.3.3', :require => 'addressable/uri'
|
||||
gem 'faraday', '0.8.6'
|
||||
gem 'addressable', '2.3.4', :require => 'addressable/uri'
|
||||
gem 'faraday', '0.8.7'
|
||||
gem 'faraday_middleware', '0.9.0'
|
||||
gem 'typhoeus', '0.3.3'
|
||||
|
||||
# Views
|
||||
|
||||
gem 'client_side_validations', '3.2.2'
|
||||
gem 'gon', '4.0.2'
|
||||
gem 'haml', '4.0.1'
|
||||
gem 'client_side_validations', '3.2.5'
|
||||
gem 'gon', '4.1.0'
|
||||
gem 'haml', '4.0.2'
|
||||
gem 'mobile-fu', '1.1.1'
|
||||
gem 'will_paginate', '3.0.4'
|
||||
|
||||
|
|
@ -103,7 +105,7 @@ group :assets do
|
|||
|
||||
# Compression
|
||||
|
||||
gem 'uglifier', '1.3.0'
|
||||
gem 'uglifier', '2.0.1'
|
||||
|
||||
# JavaScript
|
||||
|
||||
|
|
@ -122,7 +124,7 @@ group :production do # we don't install these on travis to speed up test runs
|
|||
|
||||
# Administration
|
||||
|
||||
gem 'rails_admin', '0.4.6'
|
||||
gem 'rails_admin', '0.4.7'
|
||||
|
||||
# Analytics
|
||||
|
||||
|
|
@ -154,8 +156,8 @@ group :development do
|
|||
|
||||
# Automatic test runs
|
||||
|
||||
gem 'guard-cucumber', '1.3.2'
|
||||
gem 'guard-rspec', '2.5.1'
|
||||
gem 'guard-cucumber', '1.4.0'
|
||||
gem 'guard-rspec', '2.5.3'
|
||||
gem 'rb-fsevent', '0.9.3', :require => false
|
||||
gem 'rb-inotify', '0.9.0', :require => false
|
||||
|
||||
|
|
@ -176,7 +178,7 @@ group :test do
|
|||
|
||||
gem 'capybara', '1.1.3'
|
||||
gem 'database_cleaner', '0.9.1'
|
||||
gem 'selenium-webdriver', '2.31.0'
|
||||
gem 'selenium-webdriver', '2.32.1'
|
||||
|
||||
# General helpers
|
||||
|
||||
|
|
|
|||
124
Gemfile.lock
124
Gemfile.lock
|
|
@ -30,13 +30,13 @@ GEM
|
|||
activesupport (3.2.13)
|
||||
i18n (= 0.6.1)
|
||||
multi_json (~> 1.0)
|
||||
acts-as-taggable-on (2.3.3)
|
||||
acts-as-taggable-on (2.4.0)
|
||||
rails (~> 3.0)
|
||||
acts_as_api (0.4.1)
|
||||
activemodel (>= 3.0.0)
|
||||
activesupport (>= 3.0.0)
|
||||
rack (>= 1.1.0)
|
||||
addressable (2.3.3)
|
||||
addressable (2.3.4)
|
||||
arel (3.0.2)
|
||||
asset_sync (0.5.4)
|
||||
activemodel
|
||||
|
|
@ -60,8 +60,8 @@ GEM
|
|||
timers (>= 1.0.0)
|
||||
childprocess (0.3.9)
|
||||
ffi (~> 1.0, >= 1.0.11)
|
||||
chunky_png (1.2.7)
|
||||
client_side_validations (3.2.2)
|
||||
chunky_png (1.2.8)
|
||||
client_side_validations (3.2.5)
|
||||
coderay (1.0.9)
|
||||
coffee-rails (3.2.2)
|
||||
coffee-script (>= 2.2.0)
|
||||
|
|
@ -76,13 +76,13 @@ GEM
|
|||
sass (~> 3.1)
|
||||
compass-rails (1.0.3)
|
||||
compass (>= 0.12.2, < 0.14)
|
||||
configurate (0.0.2)
|
||||
configurate (0.0.6)
|
||||
connection_pool (1.0.0)
|
||||
crack (0.3.2)
|
||||
cucumber (1.2.3)
|
||||
cucumber (1.2.5)
|
||||
builder (>= 2.1.2)
|
||||
diff-lcs (>= 1.1.3)
|
||||
gherkin (~> 2.11.6)
|
||||
gherkin (~> 2.11.7)
|
||||
multi_json (~> 1.3)
|
||||
cucumber-rails (1.3.1)
|
||||
capybara (>= 1.1.2)
|
||||
|
|
@ -95,28 +95,28 @@ GEM
|
|||
orm_adapter (~> 0.1)
|
||||
railties (~> 3.1)
|
||||
warden (~> 1.2.1)
|
||||
diff-lcs (1.2.1)
|
||||
diff-lcs (1.2.3)
|
||||
erubis (2.7.0)
|
||||
excon (0.20.1)
|
||||
execjs (1.4.0)
|
||||
multi_json (~> 1.0)
|
||||
facter (1.6.18)
|
||||
facter (1.7.0)
|
||||
factory_girl (4.2.0)
|
||||
activesupport (>= 3.0.0)
|
||||
factory_girl_rails (4.2.1)
|
||||
factory_girl (~> 4.2.0)
|
||||
railties (>= 3.0.0)
|
||||
faraday (0.8.6)
|
||||
faraday (0.8.7)
|
||||
multipart-post (~> 1.1)
|
||||
faraday_middleware (0.9.0)
|
||||
faraday (>= 0.7.4, < 0.9)
|
||||
ffi (1.5.0)
|
||||
ffi (1.7.0)
|
||||
fixture_builder (0.3.5)
|
||||
activerecord (>= 2)
|
||||
activesupport (>= 2)
|
||||
fog (1.10.0)
|
||||
fog (1.10.1)
|
||||
builder
|
||||
excon (~> 0.14)
|
||||
excon (~> 0.20)
|
||||
formatador (~> 0.2.0)
|
||||
mime-types
|
||||
multi_json (~> 1.0)
|
||||
|
|
@ -127,7 +127,7 @@ GEM
|
|||
font-awesome-sass-rails (3.0.2.2)
|
||||
railties (>= 3.1.1)
|
||||
sass-rails (>= 3.1.1)
|
||||
foreigner (1.4.0)
|
||||
foreigner (1.4.1)
|
||||
activerecord (>= 3.0.0)
|
||||
foreman (0.62.0)
|
||||
thor (>= 0.13.6)
|
||||
|
|
@ -137,35 +137,35 @@ GEM
|
|||
rspec (~> 2.0)
|
||||
rspec-instafail (~> 0.2.0)
|
||||
ruby-progressbar (~> 1.0.0)
|
||||
gherkin (2.11.6)
|
||||
json (>= 1.7.6)
|
||||
gon (4.0.2)
|
||||
gherkin (2.11.8)
|
||||
multi_json (~> 1.3)
|
||||
gon (4.1.0)
|
||||
actionpack (>= 2.3.0)
|
||||
json
|
||||
guard (1.6.2)
|
||||
guard (1.7.0)
|
||||
formatador (>= 0.2.4)
|
||||
listen (>= 0.6.0)
|
||||
lumberjack (>= 1.0.2)
|
||||
pry (>= 0.9.10)
|
||||
terminal-table (>= 1.4.3)
|
||||
thor (>= 0.14.6)
|
||||
guard-cucumber (1.3.2)
|
||||
guard-cucumber (1.4.0)
|
||||
cucumber (>= 1.2.0)
|
||||
guard (>= 1.1.0)
|
||||
guard-rspec (2.5.1)
|
||||
guard-rspec (2.5.3)
|
||||
guard (>= 1.1)
|
||||
rspec (~> 2.11)
|
||||
guard-spork (1.5.0)
|
||||
childprocess (>= 0.2.3)
|
||||
guard (>= 1.1)
|
||||
spork (>= 0.8.4)
|
||||
haml (4.0.1)
|
||||
haml (4.0.2)
|
||||
tilt
|
||||
handlebars_assets (0.12.0)
|
||||
execjs (>= 1.2.9)
|
||||
sprockets (>= 2.0.3)
|
||||
tilt
|
||||
hashie (1.2.0)
|
||||
hike (1.2.1)
|
||||
hashie (2.0.3)
|
||||
hike (1.2.2)
|
||||
http_accept_language (1.0.2)
|
||||
httpauth (0.2.0)
|
||||
i18n (0.6.1)
|
||||
|
|
@ -205,7 +205,7 @@ GEM
|
|||
redcarpet (>= 2.0)
|
||||
messagebus_ruby_api (1.0.3)
|
||||
method_source (0.8.1)
|
||||
mime-types (1.21)
|
||||
mime-types (1.22)
|
||||
mini_magick (3.5.0)
|
||||
subexec (~> 0.2.1)
|
||||
mobile-fu (1.1.1)
|
||||
|
|
@ -214,20 +214,20 @@ GEM
|
|||
multi_json (1.7.2)
|
||||
multipart-post (1.2.0)
|
||||
mysql2 (0.3.11)
|
||||
nested_form (0.3.1)
|
||||
nested_form (0.3.2)
|
||||
net-scp (1.1.0)
|
||||
net-ssh (>= 2.6.5)
|
||||
net-ssh (2.6.6)
|
||||
net-ssh (2.6.7)
|
||||
nokogiri (1.5.9)
|
||||
oauth (0.4.7)
|
||||
oauth2 (0.8.0)
|
||||
oauth2 (0.8.1)
|
||||
faraday (~> 0.8)
|
||||
httpauth (~> 0.1)
|
||||
jwt (~> 0.1.4)
|
||||
multi_json (~> 1.0)
|
||||
rack (~> 1.2)
|
||||
omniauth (1.1.3)
|
||||
hashie (~> 1.2)
|
||||
omniauth (1.1.4)
|
||||
hashie (>= 1.2, < 3)
|
||||
rack
|
||||
omniauth-facebook (1.4.1)
|
||||
omniauth-oauth2 (~> 1.1.0)
|
||||
|
|
@ -239,7 +239,7 @@ GEM
|
|||
omniauth (~> 1.0)
|
||||
omniauth-tumblr (1.1)
|
||||
omniauth-oauth (~> 1.0)
|
||||
omniauth-twitter (0.0.15)
|
||||
omniauth-twitter (0.0.16)
|
||||
multi_json (~> 1.3)
|
||||
omniauth-oauth (~> 1.0)
|
||||
orm_adapter (0.4.0)
|
||||
|
|
@ -277,7 +277,7 @@ GEM
|
|||
railties (= 3.2.13)
|
||||
rails-i18n (0.7.3)
|
||||
i18n (~> 0.5)
|
||||
rails_admin (0.4.6)
|
||||
rails_admin (0.4.7)
|
||||
bootstrap-sass (~> 2.2)
|
||||
builder (~> 3.0)
|
||||
coffee-rails (~> 3.1)
|
||||
|
|
@ -302,7 +302,7 @@ GEM
|
|||
rdoc (~> 3.4)
|
||||
thor (>= 0.14.6, < 2.0)
|
||||
raindrops (0.10.0)
|
||||
rake (10.0.3)
|
||||
rake (10.0.4)
|
||||
rb-fsevent (0.9.3)
|
||||
rb-inotify (0.9.0)
|
||||
ffi (>= 0.5.0)
|
||||
|
|
@ -325,7 +325,7 @@ GEM
|
|||
rspec-expectations (2.13.0)
|
||||
diff-lcs (>= 1.1.3, < 2.0)
|
||||
rspec-instafail (0.2.4)
|
||||
rspec-mocks (2.13.0)
|
||||
rspec-mocks (2.13.1)
|
||||
rspec-rails (2.13.0)
|
||||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
|
|
@ -337,26 +337,23 @@ GEM
|
|||
ruby-oembed (0.8.8)
|
||||
ruby-progressbar (1.0.2)
|
||||
rubyzip (0.9.9)
|
||||
safe_yaml (0.8.6)
|
||||
safe_yaml (0.9.1)
|
||||
sass (3.2.7)
|
||||
sass-rails (3.2.6)
|
||||
railties (~> 3.2.0)
|
||||
sass (>= 3.1.10)
|
||||
tilt (~> 1.3)
|
||||
selenium-webdriver (2.31.0)
|
||||
selenium-webdriver (2.32.1)
|
||||
childprocess (>= 0.2.5)
|
||||
multi_json (~> 1.0)
|
||||
rubyzip
|
||||
websocket (~> 1.0.4)
|
||||
sidekiq (2.10.0)
|
||||
sidekiq (2.10.1)
|
||||
celluloid (~> 0.12.0)
|
||||
connection_pool (~> 1.0)
|
||||
i18n
|
||||
multi_json (~> 1)
|
||||
redis (~> 3)
|
||||
redis-namespace
|
||||
sinatra
|
||||
slim
|
||||
simple_oauth (0.2.0)
|
||||
sinatra (1.3.3)
|
||||
rack (~> 1.3, >= 1.3.6)
|
||||
|
|
@ -372,11 +369,10 @@ GEM
|
|||
multi_json (~> 1.0)
|
||||
rack (~> 1.0)
|
||||
tilt (~> 1.1, != 1.3.0)
|
||||
subexec (0.2.2)
|
||||
temple (0.6.3)
|
||||
terminal-table (1.4.5)
|
||||
thor (0.17.0)
|
||||
tilt (1.3.6)
|
||||
subexec (0.2.3)
|
||||
temple (0.6.4)
|
||||
thor (0.18.1)
|
||||
tilt (1.3.7)
|
||||
timecop (0.6.1)
|
||||
timers (1.1.0)
|
||||
treetop (1.4.12)
|
||||
|
|
@ -389,7 +385,7 @@ GEM
|
|||
typhoeus (0.3.3)
|
||||
mime-types
|
||||
tzinfo (0.3.37)
|
||||
uglifier (1.3.0)
|
||||
uglifier (2.0.1)
|
||||
execjs (>= 0.3.0)
|
||||
multi_json (~> 1.0, >= 1.0.2)
|
||||
unicorn (4.6.2)
|
||||
|
|
@ -411,32 +407,32 @@ PLATFORMS
|
|||
|
||||
DEPENDENCIES
|
||||
activerecord-import (= 0.3.1)
|
||||
acts-as-taggable-on (= 2.3.3)
|
||||
acts-as-taggable-on (= 2.4.0)
|
||||
acts_as_api (= 0.4.1)
|
||||
addressable (= 2.3.3)
|
||||
addressable (= 2.3.4)
|
||||
asset_sync (= 0.5.4)
|
||||
bootstrap-sass (= 2.2.2.0)
|
||||
capybara (= 1.1.3)
|
||||
carrierwave (= 0.8.0)
|
||||
client_side_validations (= 3.2.2)
|
||||
client_side_validations (= 3.2.5)
|
||||
compass-rails (= 1.0.3)
|
||||
configurate (= 0.0.2)
|
||||
configurate (= 0.0.6)
|
||||
cucumber-rails (= 1.3.1)
|
||||
database_cleaner (= 0.9.1)
|
||||
devise (= 2.1.3)
|
||||
factory_girl_rails (= 4.2.1)
|
||||
faraday (= 0.8.6)
|
||||
faraday (= 0.8.7)
|
||||
faraday_middleware (= 0.9.0)
|
||||
fixture_builder (= 0.3.5)
|
||||
fog (= 1.10.0)
|
||||
foreigner (= 1.4.0)
|
||||
fog (= 1.10.1)
|
||||
foreigner (= 1.4.1)
|
||||
foreman (= 0.62)
|
||||
fuubar (= 1.1.0)
|
||||
gon (= 4.0.2)
|
||||
guard-cucumber (= 1.3.2)
|
||||
guard-rspec (= 2.5.1)
|
||||
gon (= 4.1.0)
|
||||
guard-cucumber (= 1.4.0)
|
||||
guard-rspec (= 2.5.3)
|
||||
guard-spork (= 1.5.0)
|
||||
haml (= 4.0.1)
|
||||
haml (= 4.0.2)
|
||||
handlebars_assets (= 0.12.0)
|
||||
http_accept_language (= 1.0.2)
|
||||
i18n-inflector-rails (~> 1.0)
|
||||
|
|
@ -449,10 +445,10 @@ DEPENDENCIES
|
|||
mobile-fu (= 1.1.1)
|
||||
mysql2 (= 0.3.11)
|
||||
nokogiri (= 1.5.9)
|
||||
omniauth (= 1.1.3)
|
||||
omniauth (= 1.1.4)
|
||||
omniauth-facebook (= 1.4.1)
|
||||
omniauth-tumblr (= 1.1)
|
||||
omniauth-twitter (= 0.0.15)
|
||||
omniauth-twitter (= 0.0.16)
|
||||
rack-cors (= 0.2.7)
|
||||
rack-google-analytics (= 0.11.0)
|
||||
rack-piwik (= 0.2.2)
|
||||
|
|
@ -461,7 +457,7 @@ DEPENDENCIES
|
|||
rack-ssl (= 1.3.3)
|
||||
rails (= 3.2.13)
|
||||
rails-i18n (= 0.7.3)
|
||||
rails_admin (= 0.4.6)
|
||||
rails_admin (= 0.4.7)
|
||||
rails_autolink (= 1.0.9)
|
||||
rb-fsevent (= 0.9.3)
|
||||
rb-inotify (= 0.9.0)
|
||||
|
|
@ -473,13 +469,15 @@ DEPENDENCIES
|
|||
rspec-rails (= 2.13.0)
|
||||
ruby-oembed (= 0.8.8)
|
||||
sass-rails (= 3.2.6)
|
||||
selenium-webdriver (= 2.31.0)
|
||||
sidekiq (= 2.10.0)
|
||||
selenium-webdriver (= 2.32.1)
|
||||
sidekiq (= 2.10.1)
|
||||
sinatra (= 1.3.3)
|
||||
slim (= 1.3.8)
|
||||
spork (= 1.0.0rc3)
|
||||
timecop (= 0.6.1)
|
||||
twitter (= 4.6.2)
|
||||
typhoeus (= 0.3.3)
|
||||
uglifier (= 1.3.0)
|
||||
uglifier (= 2.0.1)
|
||||
unicorn (= 4.6.2)
|
||||
webmock (= 1.8.11)
|
||||
will_paginate (= 3.0.4)
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ AppConfig ||= Configurate::Settings.create do
|
|||
|
||||
extend Configuration::Methods
|
||||
|
||||
if rails_env == "production" &&
|
||||
if rails_env == "production" &&
|
||||
(environment.certificate_authorities.nil? ||
|
||||
environment.certificate_authorities.empty? ||
|
||||
!File.file?(environment.certificate_authorities.get))
|
||||
|
|
|
|||
Loading…
Reference in a new issue