diff options
| author | Marin Jankovski <maxlazio@gmail.com> | 2015-01-27 09:12:53 +0300 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2015-01-27 09:12:53 +0300 |
| commit | 0da59cb55bfc8b6bb50f45d0ccdb19edc8b0a6e9 (patch) | |
| tree | 52a372f621a96f5261f926968141313f29cf6da3 /app/helpers/projects_helper.rb | |
| parent | 33913f9b8fef1f8df45dc26239faf8fa4cffc982 (diff) | |
| parent | e6b97d09470b01b5b65e87dab339c500f1bac45f (diff) | |
Merge branch 'master' into move_external_issue_tracker_away_from_yml_config
Conflicts:
app/models/project.rb
spec/models/project_spec.rb
Diffstat (limited to 'app/helpers/projects_helper.rb')
| -rw-r--r-- | app/helpers/projects_helper.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 9f2b8277a92..eab9a5d2e14 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -175,7 +175,11 @@ module ProjectsHelper "Issues - " + title end elsif current_controller?(:blob) - "#{@project.path}\/#{@blob.path} at #{@ref} - " + title + if current_action?(:new) || current_action?(:create) + "New file at #{@ref}" + elsif @blob + "Edit file #{@blob.path} at #{@ref}" + end elsif current_controller?(:commits) "Commits at #{@ref} - " + title elsif current_controller?(:merge_requests) |