summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorJulian Pawlowski <julian.pawlowski@gmail.com>2013-01-28 14:17:52 +0100
committerJulian Pawlowski <julian.pawlowski@gmail.com>2013-01-28 14:17:52 +0100
commit8aa7de2636dcd22781b623d5c9270f5ecf8b85c2 (patch)
tree1bb5dc36fb28c96ad9be9a2357d380c2c24ee31e /Gemfile.lock
parent39aa7132ceed3d4beab3a9b828e571bbfc67c07e (diff)
parent600574759573e48da9f5f82d4ff8a863b6830c95 (diff)
Merge branch 'develop'5.1-beta2
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock7
1 files changed, 7 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 79c6339..a1ee949 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -32,6 +32,10 @@ GEM
addressable (2.3.2)
arel (3.0.2)
bcrypt-ruby (3.0.1)
+ better_errors (0.3.2)
+ coderay (>= 1.0.0)
+ erubis (>= 2.7.0)
+ binding_of_caller (0.6.8)
breadcrumbs_on_rails (2.3.0)
builder (3.0.4)
cache_digests (0.2.0)
@@ -41,6 +45,7 @@ GEM
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
chunky_png (1.2.7)
+ coderay (1.0.8)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
@@ -197,6 +202,8 @@ PLATFORMS
DEPENDENCIES
acts_as_list
bcrypt-ruby
+ better_errors
+ binding_of_caller
breadcrumbs_on_rails
cache_digests
cancan (= 1.6.7)