diff options
author | gitlabhq <m@gitlabhq.com> | 2011-10-11 00:07:40 +0300 |
---|---|---|
committer | gitlabhq <m@gitlabhq.com> | 2011-10-11 00:07:40 +0300 |
commit | 162c4b044ee0890e774c30b19d17c0c5988c82d3 (patch) | |
tree | 9188264269727e9eca5ad0a2c352b2797e1c472a /Gemfile.lock | |
parent | 25c9cbff89878482b1b9a8fa853fc2c426751178 (diff) | |
download | gitlab-ce-162c4b044ee0890e774c30b19d17c0c5988c82d3.tar.gz |
issue #94
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index dd97bd671d6..5a737549c4f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -14,6 +14,15 @@ GIT activesupport (~> 3.1.0.rc4) GIT + remote: git://github.com/mojombo/grit.git + revision: ff015074ef35bd94cba943f9c0f98e161ab5851c + specs: + grit (2.4.1) + diff-lcs (~> 1.1) + mime-types (~> 1.15) + posix-spawn (~> 0.3.6) + +GIT remote: git://github.com/randx/albino.git revision: 118380924969f3a856659f86ea1f40c1ba7bfcb1 specs: @@ -98,9 +107,6 @@ GEM i18n (~> 0.4) ffi (1.0.9) git (1.2.5) - grit (2.4.1) - diff-lcs (~> 1.1) - mime-types (~> 1.15) haml (3.1.3) haml-rails (0.3.4) actionpack (~> 3.0) @@ -247,7 +253,7 @@ DEPENDENCIES devise (= 1.4.7) faker git - grit + grit! haml-rails inifile jquery-rails |