Merge branch 'master' into simplify_controllers2
Conflicts: app/controllers/commits_controller.rb app/controllers/refs_controller.rb
This commit is contained in:
Cyril
commit
e563e948bb
108 changed files with 1762 additions and 652 deletions
|
|
@ -1,19 +0,0 @@
|
|||
%ul.main_menu
|
||||
%li.home{class: tab_class(:root)}
|
||||
= link_to "Home", root_path, title: "Home"
|
||||
|
||||
%li{class: tab_class(:dash_issues)}
|
||||
= link_to dashboard_issues_path do
|
||||
Issues
|
||||
%span.count= current_user.assigned_issues.opened.count
|
||||
|
||||
%li{class: tab_class(:dash_mr)}
|
||||
= link_to dashboard_merge_requests_path do
|
||||
Merge Requests
|
||||
%span.count= current_user.cared_merge_requests.count
|
||||
|
||||
%li{class: tab_class(:search)}
|
||||
= link_to "Search", search_path
|
||||
|
||||
%li{class: tab_class(:help)}
|
||||
= link_to "Help", help_path
|
||||
|
|
@ -10,8 +10,8 @@
|
|||
- if controller_name == 'projects' && action_name == 'index'
|
||||
= auto_discovery_link_tag :atom, projects_url(:atom, private_token: current_user.private_token), title: "Dashboard feed"
|
||||
- if @project && !@project.new_record?
|
||||
- if current_page?(tree_project_ref_path(@project, @project.root_ref)) || current_page?(project_commits_path(@project))
|
||||
= auto_discovery_link_tag(:atom, project_commits_url(@project, :atom, ref: @ref, private_token: current_user.private_token), title: "Recent commits to #{@project.name}:#{@ref}")
|
||||
- if request.path == project_issues_path(@project)
|
||||
- if current_controller?(:tree, :commits)
|
||||
= 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}")
|
||||
- if current_controller?(:issues)
|
||||
= auto_discovery_link_tag(:atom, project_issues_url(@project, :atom, private_token: current_user.private_token), title: "#{@project.name} issues")
|
||||
= csrf_meta_tags
|
||||
|
|
|
|||
|
|
@ -1,37 +0,0 @@
|
|||
%ul.main_menu
|
||||
%li.home{class: project_tab_class}
|
||||
= link_to @project.code, project_path(@project), title: "Project"
|
||||
|
||||
- if @project.repo_exists?
|
||||
- if can? current_user, :download_code, @project
|
||||
%li{class: tree_tab_class}
|
||||
= link_to tree_project_ref_path(@project, @project.root_ref) do
|
||||
Files
|
||||
%li{class: commit_tab_class}
|
||||
= link_to "Commits", project_commits_path(@project)
|
||||
|
||||
%li{class: tab_class(:network)}
|
||||
= link_to "Network", graph_project_path(@project)
|
||||
|
||||
- if @project.issues_enabled
|
||||
%li{class: tab_class(:issues)}
|
||||
= link_to project_issues_filter_path(@project) do
|
||||
Issues
|
||||
%span.count.issue_counter= @project.issues.opened.count
|
||||
|
||||
- if @project.repo_exists?
|
||||
- if @project.merge_requests_enabled
|
||||
%li{class: tab_class(:merge_requests)}
|
||||
= link_to project_merge_requests_path(@project) do
|
||||
Merge Requests
|
||||
%span.count.merge_counter= @project.merge_requests.opened.count
|
||||
|
||||
- if @project.wall_enabled
|
||||
%li{class: tab_class(:wall)}
|
||||
= link_to wall_project_path(@project) do
|
||||
Wall
|
||||
|
||||
- if @project.wiki_enabled
|
||||
%li{class: tab_class(:wiki)}
|
||||
= link_to project_wiki_path(@project, :index) do
|
||||
Wiki
|
||||
|
|
@ -6,17 +6,17 @@
|
|||
= render "layouts/head_panel", title: "Admin area"
|
||||
.container
|
||||
%ul.main_menu
|
||||
%li.home{class: tab_class(:admin_root)}
|
||||
= nav_link(controller: :dashboard, html_options: {class: 'home'}) do
|
||||
= link_to "Stats", admin_root_path
|
||||
%li{class: tab_class(:admin_projects)}
|
||||
= nav_link(controller: :projects) do
|
||||
= link_to "Projects", admin_projects_path
|
||||
%li{class: tab_class(:admin_users)}
|
||||
= nav_link(controller: :users) do
|
||||
= link_to "Users", admin_users_path
|
||||
%li{class: tab_class(:admin_logs)}
|
||||
= nav_link(controller: :logs) do
|
||||
= link_to "Logs", admin_logs_path
|
||||
%li{class: tab_class(:admin_hooks)}
|
||||
= nav_link(controller: :hooks) do
|
||||
= link_to "Hooks", admin_hooks_path
|
||||
%li{class: tab_class(:admin_resque)}
|
||||
= nav_link(controller: :resque) do
|
||||
= link_to "Resque", admin_resque_path
|
||||
|
||||
.content= yield
|
||||
|
|
|
|||
|
|
@ -5,6 +5,20 @@
|
|||
= render "layouts/flash"
|
||||
= render "layouts/head_panel", title: "Dashboard"
|
||||
.container
|
||||
= render partial: "layouts/app_menu"
|
||||
.content
|
||||
= yield
|
||||
%ul.main_menu
|
||||
= nav_link(path: 'dashboard#index', html_options: {class: 'home'}) do
|
||||
= link_to "Home", root_path, title: "Home"
|
||||
= nav_link(path: 'dashboard#issues') do
|
||||
= link_to dashboard_issues_path do
|
||||
Issues
|
||||
%span.count= current_user.assigned_issues.opened.count
|
||||
= nav_link(path: 'dashboard#merge_requests') do
|
||||
= link_to dashboard_merge_requests_path do
|
||||
Merge Requests
|
||||
%span.count= current_user.cared_merge_requests.count
|
||||
= nav_link(path: 'search#show') do
|
||||
= link_to "Search", search_path
|
||||
= nav_link(path: 'help#index') do
|
||||
= link_to "Help", help_path
|
||||
|
||||
.content= yield
|
||||
|
|
|
|||
|
|
@ -6,23 +6,17 @@
|
|||
= render "layouts/head_panel", title: "Profile"
|
||||
.container
|
||||
%ul.main_menu
|
||||
%li.home{class: tab_class(:profile)}
|
||||
= nav_link(path: 'profile#show', html_options: {class: 'home'}) do
|
||||
= link_to "Profile", profile_path
|
||||
|
||||
%li{class: tab_class(:account)}
|
||||
= nav_link(path: 'profile#account') do
|
||||
= link_to "Account", profile_account_path
|
||||
|
||||
%li{class: tab_class(:ssh_keys)}
|
||||
= nav_link(controller: :keys) do
|
||||
= link_to keys_path do
|
||||
SSH Keys
|
||||
%span.count= current_user.keys.count
|
||||
|
||||
%li{class: tab_class(:design)}
|
||||
= nav_link(path: 'profile#design') do
|
||||
= link_to "Design", profile_design_path
|
||||
|
||||
%li{class: tab_class(:history)}
|
||||
= nav_link(path: 'profile#history') do
|
||||
= link_to "History", profile_history_path
|
||||
|
||||
|
||||
.content
|
||||
= yield
|
||||
.content= yield
|
||||
|
|
|
|||
|
|
@ -5,7 +5,37 @@
|
|||
= render "layouts/flash"
|
||||
= render "layouts/head_panel", title: @project.name
|
||||
.container
|
||||
= render partial: "layouts/project_menu"
|
||||
.content
|
||||
= yield
|
||||
%ul.main_menu
|
||||
= nav_link(html_options: {class: "home #{project_tab_class}"}) do
|
||||
= link_to @project.code, project_path(@project), title: "Project"
|
||||
|
||||
- if @project.repo_exists?
|
||||
- if can? current_user, :download_code, @project
|
||||
= nav_link(controller: %w(tree blob blame)) do
|
||||
= link_to 'Files', project_tree_path(@project, @ref || @project.root_ref)
|
||||
= nav_link(controller: %w(commit commits compare repositories protected_branches)) do
|
||||
= link_to "Commits", project_commits_path(@project, @ref || @project.root_ref)
|
||||
= nav_link(path: 'projects#graph') do
|
||||
= link_to "Network", graph_project_path(@project)
|
||||
|
||||
- if @project.issues_enabled
|
||||
= nav_link(controller: %w(issues milestones labels)) do
|
||||
= link_to project_issues_filter_path(@project) do
|
||||
Issues
|
||||
%span.count.issue_counter= @project.issues.opened.count
|
||||
|
||||
- if @project.repo_exists? && @project.merge_requests_enabled
|
||||
= nav_link(controller: :merge_requests) do
|
||||
= link_to project_merge_requests_path(@project) do
|
||||
Merge Requests
|
||||
%span.count.merge_counter= @project.merge_requests.opened.count
|
||||
|
||||
- if @project.wall_enabled
|
||||
= nav_link(path: 'projects#wall') do
|
||||
= link_to 'Wall', wall_project_path(@project)
|
||||
|
||||
- if @project.wiki_enabled
|
||||
= nav_link(controller: :wikis) do
|
||||
= link_to 'Wiki', project_wiki_path(@project, :index)
|
||||
|
||||
.content= yield
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue