summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Gemfile32
-rw-r--r--Gemfile.lock132
2 files changed, 88 insertions, 76 deletions
diff --git a/Gemfile b/Gemfile
index 175e441f..910eafbd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,12 +1,12 @@
source 'https://rubygems.org'
-gem 'rails', '4.1.6'
-gem 'sass-rails', '~> 4.0'
-gem 'uglifier', '>= 1.3.0'
-gem 'coffee-rails', '~> 4.0'
+gem 'rails'
+gem 'sass-rails'
+gem 'uglifier'
+gem 'coffee-rails'
gem 'jquery-rails'
gem 'turbolinks'
-gem 'jbuilder', '~> 2.0'
+gem 'jbuilder'
gem 'bcrypt-ruby'
group :doc do
# bundle exec rake doc:rails generates the API under doc/api.
@@ -14,28 +14,28 @@ group :doc do
end
# to remove
-gem 'acts-as-taggable-on', '~> 3.3.0'
+gem 'acts-as-taggable-on'
gem 'jquery-ui-rails', '~> 4.0.0'
gem 'mini_magick'
-gem "kaminari", "~> 0.15.0"
+gem "kaminari"
gem 'bootstrap-sass', '~> 2.3.0'
-gem 'delayed_job', "~> 4.0"
-gem 'delayed_job_active_record', "~> 4.0"
-gem 'daemons', '~> 1.1.9'
+gem 'delayed_job'
+gem 'delayed_job_active_record'
+gem 'daemons'
gem 'dotenv-rails'
gem 'pg'
gem 'asset_sync', '~> 1.0.0'
gem 'unf'
gem 'exception_notification'
-gem 'gibbon', '~> 1.1.2'
-gem 'twitter', '~> 5.9.0'
+gem 'gibbon'
+gem 'twitter'
gem 'spank'
-gem 'exifr', '~> 1.1.3'
+gem 'exifr'
gem 'aws-sdk'
-gem 'mime-types', '~> 1.25.1'
-gem 'ejs', '~> 1.1.1'
-gem 'js-routes', '~> 0.9.8'
+gem 'mime-types'
+gem 'ejs'
+gem 'js-routes'
gem 'geoip'
gem 'rack-attack'
gem 'browser_sniffer'
diff --git a/Gemfile.lock b/Gemfile.lock
index e51e927d..2731b34d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,8 +27,8 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
- acts-as-taggable-on (3.3.0)
- activerecord (>= 3, < 5)
+ acts-as-taggable-on (3.4.2)
+ activerecord (>= 3.2, < 5)
addressable (2.3.6)
arel (5.0.1.20140414130214)
asin (2.0.1)
@@ -40,12 +40,12 @@ GEM
asset_sync (1.0.0)
activemodel
fog (>= 1.8.0)
- aws-sdk (1.53.0)
- aws-sdk-v1 (= 1.53.0)
- aws-sdk-v1 (1.53.0)
+ aws-sdk (1.57.0)
+ aws-sdk-v1 (= 1.57.0)
+ aws-sdk-v1 (1.57.0)
json (~> 1.4)
nokogiri (>= 1.4.4)
- bcrypt (3.1.7)
+ bcrypt (3.1.9)
bcrypt-ruby (3.1.5)
bcrypt (>= 3.1.3)
better_errors (2.0.0)
@@ -59,7 +59,7 @@ GEM
browser_sniffer (1.0.7)
buftok (0.2.0)
builder (3.2.2)
- bullet (4.13.2)
+ bullet (4.14.0)
activesupport (>= 3.0.0)
uniform_notifier (>= 1.6.0)
capistrano (3.2.1)
@@ -75,18 +75,18 @@ GEM
capistrano-rbenv (2.0.2)
capistrano (~> 3.1)
sshkit (~> 1.3)
- capybara (2.4.3)
+ capybara (2.4.4)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
chartkick (1.3.2)
- childprocess (0.5.3)
+ childprocess (0.5.5)
ffi (~> 1.0, >= 1.0.11)
cliver (0.3.2)
coderay (1.1.0)
- coffee-rails (4.0.1)
+ coffee-rails (4.1.0)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
coffee-script (2.3.0)
@@ -102,44 +102,46 @@ GEM
dalli (2.7.2)
database_cleaner (1.3.0)
debug_inspector (0.0.2)
- delayed_job (4.0.3)
+ delayed_job (4.0.4)
activesupport (>= 3.0, < 4.2)
delayed_job_active_record (4.0.2)
activerecord (>= 3.0, < 4.2)
delayed_job (>= 3.0, < 4.1)
diff-lcs (1.2.5)
docile (1.1.5)
- dotenv (0.11.1)
- dotenv-deployment (~> 0.0.2)
- dotenv-deployment (0.0.2)
- dotenv-rails (0.11.1)
- dotenv (= 0.11.1)
+ dotenv (1.0.2)
+ dotenv-deployment (0.2.0)
+ dotenv (~> 1.0)
+ dotenv-rails (1.0.2)
+ dotenv (= 1.0.2)
ejs (1.1.1)
equalizer (0.0.9)
erubis (2.7.0)
exception_notification (4.0.1)
actionmailer (>= 3.0.4)
activesupport (>= 3.0.4)
- excon (0.39.6)
- execjs (2.2.1)
- exifr (1.1.3)
- factory_girl (4.4.0)
+ excon (0.40.0)
+ execjs (2.2.2)
+ exifr (1.2.0)
+ factory_girl (4.5.0)
activesupport (>= 3.0.0)
- factory_girl_rails (4.4.1)
- factory_girl (~> 4.4.0)
+ factory_girl_rails (4.5.0)
+ factory_girl (~> 4.5.0)
railties (>= 3.0.0)
faraday (0.9.0)
multipart-post (>= 1.2, < 3)
ffaker (1.25.0)
- ffi (1.9.3)
- fog (1.23.0)
+ ffi (1.9.6)
+ fog (1.24.0)
fog-brightbox
fog-core (~> 1.23)
fog-json
+ fog-radosgw (>= 0.0.2)
+ fog-sakuracloud (>= 0.0.4)
fog-softlayer
ipaddress (~> 0.5)
nokogiri (~> 1.5, >= 1.5.11)
- fog-brightbox (0.5.1)
+ fog-brightbox (0.6.1)
fog-core (~> 1.22)
fog-json
inflecto
@@ -152,12 +154,22 @@ GEM
net-ssh (>= 2.1.3)
fog-json (1.0.0)
multi_json (~> 1.0)
- fog-softlayer (0.3.17)
+ fog-radosgw (0.0.3)
+ fog-core (>= 1.21.0)
+ fog-json
+ fog-xml (>= 0.0.1)
+ fog-sakuracloud (0.1.1)
+ fog-core
+ fog-json
+ fog-softlayer (0.3.23)
fog-core
fog-json
- foreman (0.75.0)
- dotenv (~> 0.11.1)
- thor (~> 0.19.1)
+ fog-xml (0.1.0)
+ fog-core
+ nokogiri (~> 1.5, >= 1.5.11)
+ foreman (0.63.0)
+ dotenv (>= 0.7)
+ thor (>= 0.13.6)
formatador (0.2.5)
geoip (1.4.0)
gibbon (1.1.3)
@@ -179,7 +191,7 @@ GEM
i18n (0.6.11)
inflecto (0.0.2)
ipaddress (0.8.0)
- jbuilder (2.1.3)
+ jbuilder (2.2.4)
activesupport (>= 3.0.0, < 5)
multi_json (~> 1.2)
jquery-rails (3.1.2)
@@ -191,7 +203,7 @@ GEM
railties (>= 3.2)
sprockets-rails
json (1.8.1)
- kaminari (0.15.1)
+ kaminari (0.16.1)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
kgio (2.9.2)
@@ -204,11 +216,11 @@ GEM
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
method_source (0.8.2)
- mime-types (1.25.1)
+ mime-types (2.4.3)
mini_magick (3.8.1)
subexec (~> 0.2.1)
mini_portile (0.6.0)
- minitest (5.4.1)
+ minitest (5.4.2)
multi_json (1.10.1)
multi_xml (0.5.5)
multipart-post (2.0.0)
@@ -216,7 +228,7 @@ GEM
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (2.9.1)
- newrelic_rpm (3.9.4.245)
+ newrelic_rpm (3.9.6.257)
nokogiri (1.6.3.1)
mini_portile (= 0.6.0)
pg (0.17.1)
@@ -232,7 +244,7 @@ GEM
pry-rails (0.3.2)
pry (>= 0.9.10)
rack (1.5.2)
- rack-attack (4.1.1)
+ rack-attack (4.2.0)
rack
rack-test (0.6.2)
rack (>= 1.0)
@@ -257,12 +269,12 @@ GEM
hashie (~> 2.0.0)
rdoc (4.1.2)
json (~> 1.4)
- rspec-core (3.1.4)
+ rspec-core (3.1.7)
rspec-support (~> 3.1.0)
- rspec-expectations (3.1.1)
+ rspec-expectations (3.1.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.1.0)
- rspec-mocks (3.1.1)
+ rspec-mocks (3.1.3)
rspec-support (~> 3.1.0)
rspec-rails (3.1.0)
actionpack (>= 3.0)
@@ -272,7 +284,7 @@ GEM
rspec-expectations (~> 3.1.0)
rspec-mocks (~> 3.1.0)
rspec-support (~> 3.1.0)
- rspec-support (3.1.0)
+ rspec-support (3.1.2)
rubyzip (1.1.6)
safe_yaml (1.0.4)
sass (3.2.19)
@@ -303,10 +315,10 @@ GEM
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sprockets-rails (2.1.4)
+ sprockets-rails (2.2.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
- sprockets (~> 2.8)
+ sprockets (>= 2.8, < 4.0)
sqlite3 (1.3.9)
sshkit (1.5.1)
colorize
@@ -318,9 +330,9 @@ GEM
thor (0.19.1)
thread_safe (0.3.4)
tilt (1.4.1)
- turbolinks (2.3.0)
+ turbolinks (2.5.1)
coffee-rails
- twitter (5.9.0)
+ twitter (5.11.0)
addressable (~> 2.3)
buftok (~> 0.2.0)
equalizer (~> 0.0.9)
@@ -345,7 +357,7 @@ GEM
raindrops (~> 0.7)
uniform_notifier (1.6.2)
websocket (1.2.1)
- websocket-driver (0.3.4)
+ websocket-driver (0.3.5)
xpath (2.0.0)
nokogiri (~> 1.3)
@@ -353,7 +365,7 @@ PLATFORMS
ruby
DEPENDENCIES
- acts-as-taggable-on (~> 3.3.0)
+ acts-as-taggable-on
asin
asset_sync (~> 1.0.0)
aws-sdk
@@ -369,41 +381,41 @@ DEPENDENCIES
capistrano-rbenv (~> 2.0)
capybara
chartkick
- coffee-rails (~> 4.0)
+ coffee-rails
curb
- daemons (~> 1.1.9)
+ daemons
dalli
database_cleaner
- delayed_job (~> 4.0)
- delayed_job_active_record (~> 4.0)
+ delayed_job
+ delayed_job_active_record
dotenv-deployment
dotenv-rails
- ejs (~> 1.1.1)
+ ejs
exception_notification
- exifr (~> 1.1.3)
+ exifr
factory_girl_rails
ffaker
foreman
geoip
- gibbon (~> 1.1.2)
+ gibbon
github-markdown
groupdate
- jbuilder (~> 2.0)
+ jbuilder
jquery-rails
jquery-ui-rails (~> 4.0.0)
- js-routes (~> 0.9.8)
- kaminari (~> 0.15.0)
+ js-routes
+ kaminari
lol_dba
- mime-types (~> 1.25.1)
+ mime-types
mini_magick
newrelic_rpm
pg
poltergeist
pry-rails
rack-attack
- rails (= 4.1.6)
+ rails
rspec-rails
- sass-rails (~> 4.0)
+ sass-rails
sdoc (~> 0.4.0)
selenium-webdriver
simplecov
@@ -412,7 +424,7 @@ DEPENDENCIES
sqlite3
teaspoon
turbolinks
- twitter (~> 5.9.0)
- uglifier (>= 1.3.0)
+ twitter
+ uglifier
unf
unicorn
generated by cgit v1.2.3 (git 2.39.1) at 2026-02-02 05:09:23 +0000