summaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock7
1 files changed, 3 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 7214d21eb6f..9b33580fcb1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -76,8 +76,7 @@ GEM
bullet (5.3.0)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.10.0)
- climate_control (0.0.3)
- activesupport (>= 3.0)
+ climate_control (0.1.0)
cocaine (0.5.8)
climate_control (>= 0.0.3, < 1.0)
coderay (1.1.1)
@@ -89,7 +88,7 @@ GEM
execjs
coffee-script-source (1.10.0)
colorize (0.8.1)
- concurrent-ruby (1.0.3)
+ concurrent-ruby (1.0.4)
connection_pool (2.2.1)
crack (0.4.3)
safe_yaml (~> 1.0.0)
@@ -437,7 +436,7 @@ DEPENDENCIES
nokogiri
oj
ostatus2
- paperclip (~> 5.0)
+ paperclip (~> 5.1)
paperclip-av-transcoder
pg
pg_search