Download as
Browse Code »

Commit 86a7864dc78ed9168df889a5994ee7ef80a29476

Authored by Robert Speicher
1 parent b462a133
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fix various links

Showing 9 changed files with 9 additions and 9 deletions   Show diff stats
app/views/blame/show.html.haml
  Diff comments   View file @86a7864
... ... @@ -19,7 +19,7 @@
19 19 %small blame
20 20 %span.options
21 21 = link_to "raw", project_blob_path(@project, @id), class: "btn very_small", target: "_blank"
22   - = link_to "history", project_commits_path(@project, path: params[:path], ref: @ref), class: "btn very_small"
  22 + = link_to "history", project_commits_path(@project, @id), class: "btn very_small"
23 23 = link_to "source", project_tree_path(@project, @id), class: "btn very_small"
24 24 .file_content.blame
25 25 %table
... ...
app/views/events/_event_last_push.html.haml
  Diff comments   View file @86a7864
... ... @@ -4,7 +4,7 @@
4 4 = image_tag gravatar_icon(event.author_email), class: "avatar"
5 5 %span You pushed to
6 6 = event.ref_type
7   - = link_to project_commits_path(event.project, ref: event.ref_name) do
  7 + = link_to project_commits_path(event.project, event.ref_name) do
8 8 %strong= truncate(event.ref_name, length: 28)
9 9 at
10 10 %strong= link_to event.project.name, event.project
... ...
app/views/events/_event_push.html.haml
  Diff comments   View file @86a7864
... ... @@ -5,7 +5,7 @@
5 5 .event-title
6 6 %strong.author_name #{event.author_name}
7 7 %span.event_label.pushed #{event.push_action_name} #{event.ref_type}
8   - = link_to project_commits_path(event.project, ref: event.ref_name) do
  8 + = link_to project_commits_path(event.project, event.ref_name) do
9 9 %strong= event.ref_name
10 10 at
11 11 %strong= link_to event.project.name, event.project
... ...
app/views/layouts/_head.html.haml
  Diff comments   View file @86a7864
... ... @@ -10,7 +10,7 @@
10 10 - if controller_name == 'projects' && action_name == 'index'
11 11 = auto_discovery_link_tag :atom, projects_url(:atom, private_token: current_user.private_token), title: "Dashboard feed"
12 12 - if @project && !@project.new_record?
13   - - if current_controller?(:tree, :commit, :commits)
  13 + - if current_controller?(:tree, :commits)
14 14 = auto_discovery_link_tag(:atom, project_commits_url(@project, @ref, format: :atom, private_token: current_user.private_token), title: "Recent commits to #{@project.name}:#{@ref}")
15 15 - if current_controller?(:issues)
16 16 = auto_discovery_link_tag(:atom, project_issues_url(@project, :atom, private_token: current_user.private_token), title: "#{@project.name} issues")
... ...
app/views/protected_branches/index.html.haml
  Diff comments   View file @86a7864
... ... @@ -34,7 +34,7 @@
34 34 - @branches.each do |branch|
35 35 %tr
36 36 %td
37   - = link_to project_commits_path(@project, ref: branch.name) do
  37 + = link_to project_commits_path(@project, branch.name) do
38 38 %strong= branch.name
39 39 - if branch.name == @project.root_ref
40 40 %span.label default
... ...
app/views/repositories/_branch.html.haml
  Diff comments   View file @86a7864
... ... @@ -2,7 +2,7 @@
2 2 - commit = CommitDecorator.decorate(commit)
3 3 %tr
4 4 %td
5   - = link_to project_commits_path(@project, ref: branch.name) do
  5 + = link_to project_commits_path(@project, branch.name) do
6 6 %strong= truncate(branch.name, length: 60)
7 7 - if branch.name == @project.root_ref
8 8 %span.label default
... ...
app/views/repositories/_feed.html.haml
  Diff comments   View file @86a7864
... ... @@ -2,7 +2,7 @@
2 2 - commit = CommitDecorator.new(commit)
3 3 %tr
4 4 %td
5   - = link_to project_commits_path(@project, ref: commit.head.name) do
  5 + = link_to project_commits_path(@project, commit.head.name) do
6 6 %strong
7 7 = commit.head.name
8 8 - if commit.head.name == @project.root_ref
... ...
app/views/repositories/tags.html.haml
  Diff comments   View file @86a7864
... ... @@ -12,7 +12,7 @@
12 12 - commit = CommitDecorator.decorate(commit)
13 13 %tr
14 14 %td
15   - %strong= link_to tag.name, project_commits_path(@project, ref: tag.name), class: ""
  15 + %strong= link_to tag.name, project_commits_path(@project, tag.name), class: ""
16 16 %td
17 17 = link_to project_commit_path(@project, commit.id) do
18 18 %code= commit.short_id
... ...
app/views/tree/_tree_file.html.haml
  Diff comments   View file @86a7864
... ... @@ -6,7 +6,7 @@
6 6 %small #{file.mode}
7 7 %span.options
8 8 = link_to "raw", project_blob_path(@project, @id), class: "btn very_small", target: "_blank"
9   - = link_to "history", project_commits_path(@project, path: @path, ref: @ref), class: "btn very_small"
  9 + = link_to "history", project_commits_path(@project, @id), class: "btn very_small"
10 10 = link_to "blame", project_blame_path(@project, @id), class: "btn very_small"
11 11 - if file.text?
12 12 - if gitlab_markdown?(name)
... ...