Download as
Browse Code »

Commit 7157305d5e1ecbedbc24e4e62bdd8af0aea323c5

Authored by Dmitriy Zaporozhets
1 parent 98d64925
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

cleaning dashboard & tags

Showing 8 changed files with 0 additions and 59 deletions   Show diff stats
app/controllers/tags_controller.rb
View file @98d6492
... ... @@ -1,11 +0,0 @@
1   -class TagsController < ApplicationController
2   - def index
3   - @tags = Project.tag_counts.order('count DESC')
4   - @tags = @tags.where('name like ?', "%#{params[:term]}%") unless params[:term].blank?
5   -
6   - respond_to do |format|
7   - format.html
8   - format.json { render json: @tags.limit(8).map {|t| t.name}}
9   - end
10   - end
11   -end
app/views/dashboard/_menu.html.haml
View file @98d6492
... ... @@ -1,21 +0,0 @@
1   --#%h4.dash-tabs
2   - = link_to "Activities", dashboard_path, :remote => true, :class => "dash-button #{"active" if current_page?(dashboard_path) || current_page?(root_path) }", :id => "activities_slide"
3   - = link_to "Issues", dashboard_issues_path, :remote => true, :class => "dash-button #{"active" if current_page?(dashboard_issues_path)}", :id => "issues_slide"
4   - = link_to "Merge Requests", dashboard_merge_requests_path, :remote => true, :class => "dash-button #{"active" if current_page?(dashboard_merge_requests_path)}", :id => "merge_requests_slide"
5   - = image_tag "ajax-loader-facebook.gif", :class => "dashboard-loader"
6   -
7   -:javascript
8   - $(function(){
9   - $(".dash-button").live("click", function() {
10   - $(".dash-button").removeClass("active");
11   - $(this).addClass("active");
12   - });
13   -
14   - $(".dash-button").live("ajax:before", function() {
15   - $(".dashboard-loader").show();
16   - });
17   -
18   - $(".dash-button").live("ajax:complete", function() {
19   - $(".dashboard-loader").hide();
20   - });
21   - });
app/views/dashboard/index.html.haml
  Diff comments   View file @7157305
... ... @@ -2,5 +2,4 @@
2 2  
3 3 #dashboard-content.dashboard-content.content
4 4 = render "dashboard/sidebar"
5   - = render "dashboard/menu"
6 5 #news-feed.news-feed= render "dashboard/projects_feed"
... ...
app/views/dashboard/issues.html.haml
  Diff comments   View file @7157305
... ... @@ -2,5 +2,4 @@
2 2  
3 3 #dashboard-content.dashboard-content.content
4 4 = render "dashboard/sidebar"
5   - = render "dashboard/menu"
6 5 #news-feed.news-feed= render "dashboard/issues_feed"
... ...
app/views/dashboard/merge_requests.html.haml
  Diff comments   View file @7157305
... ... @@ -2,5 +2,4 @@
2 2  
3 3 #dashboard-content.dashboard-content.content
4 4 = render "dashboard/sidebar"
5   - = render "dashboard/menu"
6 5 #news-feed.news-feed= render "dashboard/merge_requests_feed"
... ...
app/views/tags/index.html.haml
View file @98d6492
... ... @@ -1,10 +0,0 @@
1   -- content_for(:body_class, "projects-page")
2   -- content_for(:page_title) do
3   - .grid_4
4   - %h2
5   - Tags
6   -
7   - .tags-list
8   - - @tags.all.each do |tag|
9   - = link_to "#{tag.name}(#{tag.count})", tag_path(name)
10   -
config/routes.rb
  Diff comments   View file @7157305
... ... @@ -4,8 +4,6 @@ Gitlab::Application.routes.draw do
4 4 require 'resque/server'
5 5 mount Resque::Server.new, at: '/info/resque'
6 6  
7   - get 'tags'=> 'tags#index'
8   - get 'tags/:tag' => 'projects#index'
9 7 get 'help' => 'help#index'
10 8  
11 9 namespace :admin do
... ...
db/schema.rb
  Diff comments   View file @7157305
... ... @@ -13,18 +13,6 @@
13 13  
14 14 ActiveRecord::Schema.define(:version => 20120121122616) do
15 15  
16   - create_table "features", :force => true do |t|
17   - t.string "name"
18   - t.string "branch_name"
19   - t.integer "assignee_id"
20   - t.integer "author_id"
21   - t.integer "project_id"
22   - t.datetime "created_at"
23   - t.datetime "updated_at"
24   - t.string "version"
25   - t.integer "status", :default => 0, :null => false
26   - end
27   -
28 16 create_table "issues", :force => true do |t|
29 17 t.string "title"
30 18 t.integer "assignee_id"
... ...