Download as
Browse Code »

Commit d64f23e29419c92c36a0f64917563336ed6012e3

Authored by gitlabhq
1 parent 1beb8416
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

code cleaning

Showing 5 changed files with 19 additions and 89 deletions   Show diff stats
@@ -5,7 +5,7 @@ gem 'rails', '3.1.0' @@ -5,7 +5,7 @@ gem 'rails', '3.1.0'
5 gem 'sqlite3' 5 gem 'sqlite3'
6 gem 'devise', "1.4.7" 6 gem 'devise', "1.4.7"
7 gem 'stamp' 7 gem 'stamp'
8 -gem 'will_paginate', '~> 3.0' 8 +gem 'kaminari'
9 gem 'haml-rails' 9 gem 'haml-rails'
10 gem 'jquery-rails' 10 gem 'jquery-rails'
11 gem 'grit', :git => 'git://github.com/gitlabhq/grit.git' 11 gem 'grit', :git => 'git://github.com/gitlabhq/grit.git'
@@ -16,7 +16,6 @@ gem 'faker' @@ -16,7 +16,6 @@ gem 'faker'
16 gem 'seed-fu', :git => 'git://github.com/mbleigh/seed-fu.git' 16 gem 'seed-fu', :git => 'git://github.com/mbleigh/seed-fu.git'
17 gem "inifile" 17 gem "inifile"
18 gem "pygments.rb", "0.2.3" 18 gem "pygments.rb", "0.2.3"
19 -gem "kaminari"  
20 gem "thin" 19 gem "thin"
21 gem "git" 20 gem "git"
22 gem "acts_as_list" 21 gem "acts_as_list"
@@ -232,7 +232,6 @@ GEM @@ -232,7 +232,6 @@ GEM
232 multi_json (>= 1.0.2) 232 multi_json (>= 1.0.2)
233 warden (1.0.5) 233 warden (1.0.5)
234 rack (>= 1.0) 234 rack (>= 1.0)
235 - will_paginate (3.0.0)  
236 xpath (0.1.4) 235 xpath (0.1.4)
237 nokogiri (~> 1.3) 236 nokogiri (~> 1.3)
238 237
@@ -274,4 +273,3 @@ DEPENDENCIES @@ -274,4 +273,3 @@ DEPENDENCIES
274 thin 273 thin
275 turn 274 turn
276 uglifier 275 uglifier
277 - will_paginate (~> 3.0)  
app/controllers/admin/projects_controller.rb
  Diff comments   View file @d64f23e
@@ -4,29 +4,14 @@ class Admin::ProjectsController < ApplicationController @@ -4,29 +4,14 @@ class Admin::ProjectsController < ApplicationController
4 4
5 def index 5 def index
6 @admin_projects = Project.page(params[:page]) 6 @admin_projects = Project.page(params[:page])
7 -  
8 - respond_to do |format|  
9 - format.html # index.html.erb  
10 - format.json { render json: @admin_projects }  
11 - end  
12 end 7 end
13 8
14 def show 9 def show
15 @admin_project = Project.find_by_code(params[:id]) 10 @admin_project = Project.find_by_code(params[:id])
16 -  
17 - respond_to do |format|  
18 - format.html # show.html.erb  
19 - format.json { render json: @admin_project }  
20 - end  
21 end 11 end
22 12
23 def new 13 def new
24 @admin_project = Project.new 14 @admin_project = Project.new
25 -  
26 - respond_to do |format|  
27 - format.html # new.html.erb  
28 - format.json { render json: @admin_project }  
29 - end  
30 end 15 end
31 16
32 def edit 17 def edit
@@ -37,28 +22,20 @@ class Admin::ProjectsController < ApplicationController @@ -37,28 +22,20 @@ class Admin::ProjectsController < ApplicationController
37 @admin_project = Project.new(params[:project]) 22 @admin_project = Project.new(params[:project])
38 @admin_project.owner = current_user 23 @admin_project.owner = current_user
39 24
40 - respond_to do |format|  
41 - if @admin_project.save  
42 - format.html { redirect_to [:admin, @admin_project], notice: 'Project was successfully created.' }  
43 - format.json { render json: @admin_project, status: :created, location: @admin_project }  
44 - else  
45 - format.html { render action: "new" }  
46 - format.json { render json: @admin_project.errors, status: :unprocessable_entity }  
47 - end 25 + if @admin_project.save
  26 + redirect_to [:admin, @admin_project], notice: 'Project was successfully created.'
  27 + else
  28 + render :action => "new"
48 end 29 end
49 end 30 end
50 31
51 def update 32 def update
52 @admin_project = Project.find_by_code(params[:id]) 33 @admin_project = Project.find_by_code(params[:id])
53 34
54 - respond_to do |format|  
55 - if @admin_project.update_attributes(params[:project])  
56 - format.html { redirect_to [:admin, @admin_project], notice: 'Project was successfully updated.' }  
57 - format.json { head :ok }  
58 - else  
59 - format.html { render action: "edit" }  
60 - format.json { render json: @admin_project.errors, status: :unprocessable_entity }  
61 - end 35 + if @admin_project.update_attributes(params[:project])
  36 + redirect_to [:admin, @admin_project], notice: 'Project was successfully updated.'
  37 + else
  38 + render :action => "edit"
62 end 39 end
63 end 40 end
64 41
@@ -66,9 +43,6 @@ class Admin::ProjectsController < ApplicationController @@ -66,9 +43,6 @@ class Admin::ProjectsController < ApplicationController
66 @admin_project = Project.find_by_code(params[:id]) 43 @admin_project = Project.find_by_code(params[:id])
67 @admin_project.destroy 44 @admin_project.destroy
68 45
69 - respond_to do |format|  
70 - format.html { redirect_to admin_projects_url }  
71 - format.json { head :ok }  
72 - end 46 + redirect_to admin_projects_url
73 end 47 end
74 end 48 end
app/controllers/admin/team_members_controller.rb
  Diff comments   View file @d64f23e
@@ -4,29 +4,14 @@ class Admin::TeamMembersController < ApplicationController @@ -4,29 +4,14 @@ class Admin::TeamMembersController < ApplicationController
4 4
5 def index 5 def index
6 @admin_team_members = UsersProject.page(params[:page]).per(100).order("project_id DESC") 6 @admin_team_members = UsersProject.page(params[:page]).per(100).order("project_id DESC")
7 -  
8 - respond_to do |format|  
9 - format.html # index.html.erb  
10 - format.json { render json: @admin_team_members }  
11 - end  
12 end 7 end
13 8
14 def show 9 def show
15 @admin_team_member = UsersProject.find(params[:id]) 10 @admin_team_member = UsersProject.find(params[:id])
16 -  
17 - respond_to do |format|  
18 - format.html # show.html.erb  
19 - format.json { render json: @admin_team_member }  
20 - end  
21 end 11 end
22 12
23 def new 13 def new
24 @admin_team_member = UsersProject.new(params[:team_member]) 14 @admin_team_member = UsersProject.new(params[:team_member])
25 -  
26 - respond_to do |format|  
27 - format.html # new.html.erb  
28 - format.json { render json: @admin_team_member }  
29 - end  
30 end 15 end
31 16
32 def edit 17 def edit
@@ -37,14 +22,10 @@ class Admin::TeamMembersController < ApplicationController @@ -37,14 +22,10 @@ class Admin::TeamMembersController < ApplicationController
37 @admin_team_member = UsersProject.new(params[:team_member]) 22 @admin_team_member = UsersProject.new(params[:team_member])
38 @admin_team_member.project_id = params[:team_member][:project_id] 23 @admin_team_member.project_id = params[:team_member][:project_id]
39 24
40 - respond_to do |format|  
41 - if @admin_team_member.save  
42 - format.html { redirect_to admin_team_member_path(@admin_team_member), notice: 'UsersProject was successfully created.' }  
43 - format.json { render json: @admin_team_member, status: :created, location: @team_member }  
44 - else  
45 - format.html { render action: "new" }  
46 - format.json { render json: @admin_team_member.errors, status: :unprocessable_entity }  
47 - end 25 + if @admin_team_member.save
  26 + redirect_to admin_team_member_path(@admin_team_member), notice: 'UsersProject was successfully created.'
  27 + else
  28 + render action: "new"
48 end 29 end
49 end 30 end
50 31
@@ -52,14 +33,10 @@ class Admin::TeamMembersController < ApplicationController @@ -52,14 +33,10 @@ class Admin::TeamMembersController < ApplicationController
52 @admin_team_member = UsersProject.find(params[:id]) 33 @admin_team_member = UsersProject.find(params[:id])
53 @admin_team_member.project_id = params[:team_member][:project_id] 34 @admin_team_member.project_id = params[:team_member][:project_id]
54 35
55 - respond_to do |format|  
56 - if @admin_team_member.update_attributes(params[:team_member])  
57 - format.html { redirect_to admin_team_member_path(@admin_team_member), notice: 'UsersProject was successfully updated.' }  
58 - format.json { head :ok }  
59 - else  
60 - format.html { render action: "edit" }  
61 - format.json { render json: @admin_team_member.errors, status: :unprocessable_entity }  
62 - end 36 + if @admin_team_member.update_attributes(params[:team_member])
  37 + redirect_to admin_team_member_path(@admin_team_member), notice: 'UsersProject was successfully updated.'
  38 + else
  39 + render action: "edit"
63 end 40 end
64 end 41 end
65 42
@@ -67,9 +44,6 @@ class Admin::TeamMembersController < ApplicationController @@ -67,9 +44,6 @@ class Admin::TeamMembersController < ApplicationController
67 @admin_team_member = UsersProject.find(params[:id]) 44 @admin_team_member = UsersProject.find(params[:id])
68 @admin_team_member.destroy 45 @admin_team_member.destroy
69 46
70 - respond_to do |format|  
71 - format.html { redirect_to admin_team_members_url }  
72 - format.json { head :ok }  
73 - end 47 + redirect_to admin_team_members_url
74 end 48 end
75 end 49 end
app/controllers/admin/users_controller.rb
  Diff comments   View file @d64f23e
@@ -4,29 +4,14 @@ class Admin::UsersController < ApplicationController @@ -4,29 +4,14 @@ class Admin::UsersController < ApplicationController
4 4
5 def index 5 def index
6 @admin_users = User.page(params[:page]) 6 @admin_users = User.page(params[:page])
7 -  
8 - respond_to do |format|  
9 - format.html # index.html.erb  
10 - format.json { render json: @admin_users }  
11 - end  
12 end 7 end
13 8
14 def show 9 def show
15 @admin_user = User.find(params[:id]) 10 @admin_user = User.find(params[:id])
16 -  
17 - respond_to do |format|  
18 - format.html # show.html.erb  
19 - format.json { render json: @admin_user }  
20 - end  
21 end 11 end
22 12
23 def new 13 def new
24 @admin_user = User.new(:projects_limit => 10) 14 @admin_user = User.new(:projects_limit => 10)
25 -  
26 - respond_to do |format|  
27 - format.html # new.html.erb  
28 - format.json { render json: @admin_user }  
29 - end  
30 end 15 end
31 16
32 def edit 17 def edit