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

Conflicts:
	Gemfile.lock

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
index 7a7153f,65fd6f3..9ee413d
--- 1/Gemfile.lock
--- 2/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)
 -      json
 -    grape (0.2.2)
+     gon (4.0.2)
 +    grape (0.3.1)
+       actionpack (>= 2.3.0)
        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

diff --cc app/views/layouts/project_resource.html.haml
Simple merge