remove yaml_db gem, Replace team members index route with team_index

diff --git a/Gemfile b/Gemfile
index 075c4d9..b7fe779 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -32,9 +32,6 @@ gem 'gitlab-grack', '~> 1.0.0', require: 'grack'
 # LDAP Auth
 gem 'gitlab_omniauth-ldap', '1.0.2', require: "omniauth-ldap"
 
-# Dump db to yml file. Mostly used to migrate from sqlite to mysql
-gem 'gitlab_yaml_db', '1.0.0', require: "yaml_db"
-
 # Syntax highlighter
 gem "gitlab-pygments.rb", '~> 0.3.2', require: 'pygments.rb'
 

diff --git a/Gemfile.lock b/Gemfile.lock
index 41d24c6..dc7bbcd 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -181,7 +181,6 @@ GEM
       omniauth (~> 1.0)
       pyu-ruby-sasl (~> 0.0.3.1)
       rubyntlm (~> 0.1.1)
-    gitlab_yaml_db (1.0.0)
     gon (4.0.2)
     grape (0.3.2)
       activesupport
@@ -521,7 +520,6 @@ DEPENDENCIES
   gitlab-pygments.rb (~> 0.3.2)
   gitlab_meta (= 5.0)
   gitlab_omniauth-ldap (= 1.0.2)
-  gitlab_yaml_db (= 1.0.0)
   gollum (~> 2.4.0)!
   gon
   grape (~> 0.3.1)

diff --git a/app/controllers/team_members_controller.rb b/app/controllers/team_members_controller.rb
index ba55648..35aa315 100644 (file)
--- a/app/controllers/team_members_controller.rb
+++ b/app/controllers/team_members_controller.rb
@@ -52,7 +52,7 @@ class TeamMembersController < ProjectResourceController
     status = @project.team.import(giver)
     notice = status ? "Succesfully imported" : "Import failed"
 
-    redirect_to project_team_members_path(project), notice: notice
+    redirect_to project_team_index_path(project), notice: notice
   end
 
   protected

diff --git a/app/views/team_members/index.html.haml b/app/views/team_members/index.html.haml
index 50d44bc..3132fd5 100644 (file)
--- a/app/views/team_members/index.html.haml
+++ b/app/views/team_members/index.html.haml
@@ -22,22 +22,22 @@
   .span3
     %ul.nav.nav-pills.nav-stacked
       %li{class: ("active" if !params[:type])}
-        = link_to project_team_members_path(type: nil) do
+        = link_to project_team_index_path(type: nil) do
           All
       %li{class: ("active" if params[:type] == 'masters')}
-        = link_to project_team_members_path(type: 'masters') do
+        = link_to project_team_index_path(type: 'masters') do
           Masters
           %span.pull-right= @project.users_projects.masters.count
       %li{class: ("active" if params[:type] == 'developers')}
-        = link_to project_team_members_path(type: 'developers') do
+        = link_to project_team_index_path(type: 'developers') do
           Developers
           %span.pull-right= @project.users_projects.developers.count
       %li{class: ("active" if params[:type] == 'reporters')}
-        = link_to project_team_members_path(type: 'reporters') do
+        = link_to project_team_index_path(type: 'reporters') do
           Reporters
           %span.pull-right= @project.users_projects.reporters.count
       %li{class: ("active" if params[:type] == 'guests')}
-        = link_to project_team_members_path(type: 'guests') do
+        = link_to project_team_index_path(type: 'guests') do
           Guests
           %span.pull-right= @project.users_projects.guests.count
 

diff --git a/config/routes.rb b/config/routes.rb
index 5973a1a..18475e0 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -270,7 +270,7 @@ Gitlab::Application.routes.draw do
       end
     end
 
-    resources :team_members do
+    resources :team_members, except: [:index, :edit] do
       collection do
 
         # Used for import team