diff options
| author | Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com> | 2012-06-29 14:25:20 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com> | 2012-06-29 14:25:20 +0300 |
| commit | 318350e34fcd0b0754526fdfb94c484b8bb88837 (patch) | |
| tree | 14c425bf13531aad65f2175ce6ec966a3e29912c /Gemfile.lock | |
| parent | 9eb019045a8c1bb9f1cb6e8d3dfb7338ab2f921a (diff) | |
| parent | 84a3f8fca4e57422267bdd7e07d4f1b90717fbcc (diff) | |
| download | gitlab-ce-318350e34fcd0b0754526fdfb94c484b8bb88837.tar.gz | |
Merge branch 'api' of https://github.com/NARKOZ/gitlabhq
Conflicts:
Gemfile.lock
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 6287b2d4d11..c3a45b59b6e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -169,6 +169,12 @@ GEM gherkin (2.11.0) json (>= 1.4.6) git (1.2.5) + grape (0.2.0) + hashie (~> 1.2) + multi_json + multi_xml + rack + rack-mount haml (3.1.6) haml-rails (0.3.4) actionpack (~> 3.0) @@ -230,6 +236,8 @@ GEM rack (1.4.1) rack-cache (1.2) rack (>= 0.4) + rack-mount (0.8.3) + rack (>= 1.0.0) rack-protection (1.2.0) rack rack-ssl (1.3.2) @@ -381,6 +389,7 @@ DEPENDENCIES git gitolite! grack! + grape grit! haml-rails httparty |