Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>2012-01-23 11:54:47 +0400
committerDmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>2012-01-23 11:54:47 +0400
commit7157305d5e1ecbedbc24e4e62bdd8af0aea323c5 (patch)
tree51a141b28db8efd832db41a0bc5816a446efd0c8
parent98d6492582d232ed86525aa31ccbf280f4cbdaef (diff)
cleaning dashboard & tags
-rw-r--r--app/controllers/tags_controller.rb11
-rw-r--r--app/views/dashboard/_menu.html.haml21
-rw-r--r--app/views/dashboard/index.html.haml1
-rw-r--r--app/views/dashboard/issues.html.haml1
-rw-r--r--app/views/dashboard/merge_requests.html.haml1
-rw-r--r--app/views/tags/index.html.haml10
-rw-r--r--config/routes.rb2
-rw-r--r--db/schema.rb12
8 files changed, 0 insertions, 59 deletions
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
deleted file mode 100644
index 938beb64403..00000000000
--- a/app/controllers/tags_controller.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class TagsController < ApplicationController
- def index
- @tags = Project.tag_counts.order('count DESC')
- @tags = @tags.where('name like ?', "%#{params[:term]}%") unless params[:term].blank?
-
- respond_to do |format|
- format.html
- format.json { render json: @tags.limit(8).map {|t| t.name}}
- end
- end
-end
diff --git a/app/views/dashboard/_menu.html.haml b/app/views/dashboard/_menu.html.haml
deleted file mode 100644
index 73d4149deb3..00000000000
--- a/app/views/dashboard/_menu.html.haml
+++ /dev/null
@@ -1,21 +0,0 @@
--#%h4.dash-tabs
- = link_to "Activities", dashboard_path, :remote => true, :class => "dash-button #{"active" if current_page?(dashboard_path) || current_page?(root_path) }", :id => "activities_slide"
- = link_to "Issues", dashboard_issues_path, :remote => true, :class => "dash-button #{"active" if current_page?(dashboard_issues_path)}", :id => "issues_slide"
- = 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"
- = image_tag "ajax-loader-facebook.gif", :class => "dashboard-loader"
-
-:javascript
- $(function(){
- $(".dash-button").live("click", function() {
- $(".dash-button").removeClass("active");
- $(this).addClass("active");
- });
-
- $(".dash-button").live("ajax:before", function() {
- $(".dashboard-loader").show();
- });
-
- $(".dash-button").live("ajax:complete", function() {
- $(".dashboard-loader").hide();
- });
- });
diff --git a/app/views/dashboard/index.html.haml b/app/views/dashboard/index.html.haml
index 7f6beffb53f..b3de30f2ecd 100644
--- a/app/views/dashboard/index.html.haml
+++ b/app/views/dashboard/index.html.haml
@@ -2,5 +2,4 @@
#dashboard-content.dashboard-content.content
= render "dashboard/sidebar"
- = render "dashboard/menu"
#news-feed.news-feed= render "dashboard/projects_feed"
diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml
index 4b7af96a646..063183ed0d1 100644
--- a/app/views/dashboard/issues.html.haml
+++ b/app/views/dashboard/issues.html.haml
@@ -2,5 +2,4 @@
#dashboard-content.dashboard-content.content
= render "dashboard/sidebar"
- = render "dashboard/menu"
#news-feed.news-feed= render "dashboard/issues_feed"
diff --git a/app/views/dashboard/merge_requests.html.haml b/app/views/dashboard/merge_requests.html.haml
index 3497062c8f6..088577eaf50 100644
--- a/app/views/dashboard/merge_requests.html.haml
+++ b/app/views/dashboard/merge_requests.html.haml
@@ -2,5 +2,4 @@
#dashboard-content.dashboard-content.content
= render "dashboard/sidebar"
- = render "dashboard/menu"
#news-feed.news-feed= render "dashboard/merge_requests_feed"
diff --git a/app/views/tags/index.html.haml b/app/views/tags/index.html.haml
deleted file mode 100644
index b7f422ad2c0..00000000000
--- a/app/views/tags/index.html.haml
+++ /dev/null
@@ -1,10 +0,0 @@
-- content_for(:body_class, "projects-page")
-- content_for(:page_title) do
- .grid_4
- %h2
- Tags
-
- .tags-list
- - @tags.all.each do |tag|
- = link_to "#{tag.name}(#{tag.count})", tag_path(name)
-
diff --git a/config/routes.rb b/config/routes.rb
index b8149f8ff82..bb575356d94 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -4,8 +4,6 @@ Gitlab::Application.routes.draw do
require 'resque/server'
mount Resque::Server.new, at: '/info/resque'
- get 'tags'=> 'tags#index'
- get 'tags/:tag' => 'projects#index'
get 'help' => 'help#index'
namespace :admin do
diff --git a/db/schema.rb b/db/schema.rb
index 3e7866f318a..2d891917fd7 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -13,18 +13,6 @@
ActiveRecord::Schema.define(:version => 20120121122616) do
- create_table "features", :force => true do |t|
- t.string "name"
- t.string "branch_name"
- t.integer "assignee_id"
- t.integer "author_id"
- t.integer "project_id"
- t.datetime "created_at"
- t.datetime "updated_at"
- t.string "version"
- t.integer "status", :default => 0, :null => false
- end
-
create_table "issues", :force => true do |t|
t.string "title"
t.integer "assignee_id"