diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-02-24 14:54:32 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-02-24 14:54:39 +0100 |
| commit | 0283fff5914f74d9435ab2097b2770dfdf635941 (patch) | |
| tree | 8bcf91cb5639d3d06a15cabb1d08e408b4ba9d43 /app/models/project.rb | |
| parent | aba12515942d588f1a0aa0b32cc16837e5d04fef (diff) | |
| parent | 7561b1c2a486ae57e9fbebadadbe1269bfdba6a0 (diff) | |
| download | gitlab-ce-0283fff5914f74d9435ab2097b2770dfdf635941.tar.gz | |
Merge branch 'master' into extend_markdown_upload
# Conflicts:
# app/views/projects/issues/_form.html.haml
# app/views/projects/merge_requests/_form.html.haml
# app/views/projects/merge_requests/_new_submit.html.haml
# app/views/projects/milestones/_form.html.haml
# app/views/projects/notes/_form.html.haml
# app/views/projects/wikis/_form.html.haml
# config/routes.rb
# spec/controllers/projects_controller_spec.rb
Diffstat (limited to 'app/models/project.rb')
| -rw-r--r-- | app/models/project.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index e2c7f76eb09..932cfc980a2 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -285,7 +285,7 @@ class Project < ActiveRecord::Base end def to_param - namespace.path + '/' + path + path end def web_url |