From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 28 Feb 2013 15:02:20 +0000 (+0200)
Subject: Merge branch 'link-to-issue-tracker' of https://github.com/Undev/gitlabhq into Undev... 
X-Git-Tag: v5.0.0~182^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e1f77b9be071fac9f57e85b2f3853d2f333aeaab;p=wvm%2Fgitlab.git

Merge branch 'link-to-issue-tracker' of https://github.com/Undev/gitlabhq into Undev-link-to-issue-tracker

Conflicts:
	Gemfile.lock
---

e1f77b9be071fac9f57e85b2f3853d2f333aeaab
diff --cc Gemfile.lock
index 7a7153fcd,65fd6f363..9ee413d47
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -184,10 -184,12 +186,13 @@@ GE
        pyu-ruby-sasl (~> 0.0.3.1)
        rubyntlm (~> 0.1.1)
      gitlab_yaml_db (1.0.0)
+     gon (4.0.2)
 +    grape (0.3.1)
+       actionpack (>= 2.3.0)
 -      json
 -    grape (0.2.2)
        activesupport
 +      grape-entity (~> 0.2.0)
        hashie (~> 1.2)
++      json
        multi_json (>= 1.3.2)
        multi_xml
        rack
@@@ -484,9 -486,9 +490,10 @@@ DEPENDENCIE
    gitlab_meta (= 5.0)
    gitlab_omniauth-ldap (= 1.0.2)
    gitlab_yaml_db (= 1.0.0)
+   gon
    grack!
 -  grape (~> 0.2.1)
 +  grape (~> 0.3.1)
 +  grape-entity (~> 0.2.0)
    grit!
    grit_ext!
    growl