Deprecate code for Project. Use title and path

Dmitriy Zaporozhets
1 parent ab9d0236
Showing 22 changed files with 79 additions and 83 deletions Show diff stats
app/controllers/admin/projects_controller.rb
app/controllers/application_controller.rb
app/models/namespace.rb
app/models/project.rb
app/models/user.rb
app/observers/project_observer.rb
app/roles/push_observer.rb
app/roles/repository.rb
app/views/admin/dashboard/index.html.haml
app/views/admin/groups/_form.html.haml
app/views/admin/projects/_form.html.haml
app/views/projects/_form.html.haml
db/fixtures/development/001_admin.rb
db/fixtures/development/003_users.rb
db/fixtures/production/001_admin.rb
db/migrate/20121123164910_rename_code_to_path.rb
db/schema.rb
lib/api/helpers.rb
lib/gitlab/auth.rb
spec/factories.rb
@@ -5,7 +5,7 @@ class Admin::ProjectsController &lt; AdminController
     @projects = Project.scoped
     @projects = @projects.where(namespace_id: params[:namespace_id]) if params[:namespace_id].present?
     @projects = @projects.search(params[:name]) if params[:name].present?
-    @projects = @projects.includes(:namespace).order("namespaces.code, projects.name ASC").page(params[:page]).per(20)
+    @projects = @projects.includes(:namespace).order("namespaces.path, projects.name ASC").page(params[:page]).per(20)
   end
  
   def show
@@ -66,7 +66,7 @@ class ApplicationController &lt; ActionController::Base
     id = params[:project_id] || params[:id]
     id = id.split("/") if id.include?("/")
  
-    @project ||= current_user.projects.find_by_code(id)
+    @project ||= current_user.projects.find_by_path(id)
     @project || render_404
   end
  
 class Namespace < ActiveRecord::Base
-  attr_accessible :code, :name, :owner_id
+  attr_accessible :name, :path
  
-  has_many :projects
+  has_many :projects, dependent: :destroy
   belongs_to :owner, class_name: "User"
  
   validates :name, presence: true, uniqueness: true
-  validates :code, presence: true, uniqueness: true
+  validates :path, uniqueness: true, presence: true, length: { within: 1..255 },
+            format: { with: /\A[a-zA-Z][a-zA-Z0-9_\-\.]*\z/,
+                      message: "only letters, digits & '_' '-' '.' allowed. Letter should be first" }
   validates :owner, presence: true
  
   delegate :name, to: :owner, allow_nil: true, prefix: true
@@ -15,11 +17,11 @@ class Namespace &lt; ActiveRecord::Base
   scope :root, where('type IS NULL')
  
   def self.search query
-    where("name LIKE :query OR code LIKE :query", query: "%#{query}%")
+    where("name LIKE :query OR path LIKE :query", query: "%#{query}%")
   end
  
   def to_param
-    code
+    path
   end
  
   def human_name
@@ -27,7 +29,7 @@ class Namespace &lt; ActiveRecord::Base
   end
  
   def ensure_dir_exist
-    namespace_dir_path = File.join(Gitlab.config.git_base_path, code)
+    namespace_dir_path = File.join(Gitlab.config.git_base_path, path)
     Dir.mkdir(namespace_dir_path) unless File.exists?(namespace_dir_path)
   end
 end
@@ -27,7 +27,7 @@ class Project &lt; ActiveRecord::Base
   include Authority
   include Team
  
-  attr_accessible :name, :path, :description, :code, :default_branch, :issues_enabled,
+  attr_accessible :name, :path, :description, :default_branch, :issues_enabled,
                   :wall_enabled, :merge_requests_enabled, :wiki_enabled, as: [:default, :admin]
  
   attr_accessible :namespace_id, as: :admin
@@ -58,16 +58,16 @@ class Project &lt; ActiveRecord::Base
   # Validations
   validates :owner, presence: true
   validates :description, length: { within: 0..2000 }
-  validates :name, uniqueness: true, presence: true, length: { within: 0..255 }
-  validates :path, uniqueness: true, presence: true, length: { within: 0..255 },
-            format: { with: /\A[a-zA-Z][a-zA-Z0-9_\-\.]*\z/,
-                      message: "only letters, digits & '_' '-' '.' allowed. Letter should be first" }
-  validates :code, presence: true, uniqueness: true, length: { within: 1..255 },
+  validates :name, presence: true, length: { within: 0..255 }
+  validates :path, presence: true, length: { within: 0..255 },
             format: { with: /\A[a-zA-Z][a-zA-Z0-9_\-\.]*\z/,
                       message: "only letters, digits & '_' '-' '.' allowed. Letter should be first" }
   validates :issues_enabled, :wall_enabled, :merge_requests_enabled,
             :wiki_enabled, inclusion: { in: [true, false] }
  
+  validates_uniqueness_of :name, scope: :namespace_id
+  validates_uniqueness_of :path, scope: :namespace_id
+
   validate :check_limit, :repo_name
  
   # Scopes
@@ -81,20 +81,23 @@ class Project &lt; ActiveRecord::Base
     end
  
     def search query
-      where("projects.name LIKE :query OR projects.code LIKE :query OR projects.path LIKE :query", query: "%#{query}%")
+      where("projects.name LIKE :query OR projects.path LIKE :query", query: "%#{query}%")
     end
  
     def create_by_user(params, user)
-      namespace_id = params.delete(:namespace_id) || namespace.try(:id)
+      namespace_id = params.delete(:namespace_id)
+      namespace_id ||= current_user.namespace_id
  
       project = Project.new params
  
       Project.transaction do
  
-        # Build gitlab-hq code from GitLab HQ name
+        # Parametrize path for project
         #
-        slug = project.name.dup.parameterize
-        project.code = project.path = slug
+        # Ex.
+        #  'GitLab HQ'.parameterize => "gitlab-hq"
+        #
+        project.path = project.name.dup.parameterize
  
         project.owner = user
         project.namespace_id = namespace_id
@@ -149,14 +152,14 @@ class Project &lt; ActiveRecord::Base
  
   def to_param
     if namespace
-      namespace.code + "/" + code
+      namespace.path + "/" + path
     else
-      code
+      path
     end
   end
  
   def web_url
-    [Gitlab.config.url, code].join("/")
+    [Gitlab.config.url, path].join("/")
   end
  
   def common_notes
@@ -213,7 +216,7 @@ class Project &lt; ActiveRecord::Base
  
   def path_with_namespace
     if namespace
-      namespace.code + '/' + path
+      namespace.path + '/' + path
     else
       path
     end
@@ -69,7 +69,8 @@ class User &lt; ActiveRecord::Base
   before_save :ensure_authentication_token
   alias_attribute :private_token, :authentication_token
  
-  delegate :code, to: :namespace, allow_nil: true, prefix: true
+  delegate :path, to: :namespace, allow_nil: true, prefix: true
+  delegate :id, to: :namespace, allow_nil: true, prefix: true
  
   # Scopes
   scope :not_in_project, ->(project) { where("id not in (:ids)", ids: project.users.map(&:id) ) }
@@ -121,7 +122,7 @@ class User &lt; ActiveRecord::Base
  
   def namespaces
     namespaces = []
-    namespaces << self.namespace
+    namespaces << self.namespace if self.namespace
     namespaces = namespaces + Group.all if admin
     namespaces
   end
 class ProjectObserver < ActiveRecord::Observer
-  def before_save(project)
+  def after_save(project)
+    project.update_repository
+
     # Move repository if namespace changed
     if project.namespace_id_changed? and not project.new_record?
       move_project(project)
     end
   end
  
-  def after_save(project)
-    project.update_repository
-  end
-
   def after_destroy(project)
     log_info("Project \"#{project.name}\" was removed")
  
@@ -27,8 +25,8 @@ class ProjectObserver &lt; ActiveRecord::Observer
   end
  
   def move_project(project)
-    old_dir = Namespace.find_by_id(project.namespace_id_was).try(:code) || ''
-    new_dir = Namespace.find_by_id(project.namespace_id).try(:code) || ''
+    old_dir = Namespace.find_by_id(project.namespace_id_was).try(:path) || ''
+    new_dir = Namespace.find_by_id(project.namespace_id).try(:path) || ''
  
     # Create new dir if missing
     new_dir_path = File.join(Gitlab.config.git_base_path, new_dir)
@@ -114,7 +114,7 @@ module PushObserver
         id: commit.id,
         message: commit.safe_message,
         timestamp: commit.date.xmlschema,
-        url: "#{Gitlab.config.url}/#{code}/commits/#{commit.id}",
+        url: "#{Gitlab.config.url}/#{path}/commits/#{commit.id}",
         author: {
           name: commit.author_name,
           email: commit.author_email
@@ -87,7 +87,7 @@ module Repository
   end
  
   def namespace_dir
-    namespace.try(:code) || ''
+    namespace.try(:path) || ''
   end
  
   def update_repository
@@ -164,12 +164,12 @@ module Repository
     return nil unless commit
  
     # Build file path
-    file_name = self.code + "-" + commit.id.to_s + ".tar.gz"
-    storage_path = Rails.root.join("tmp", "repositories", self.code)
+    file_name = self.path + "-" + commit.id.to_s + ".tar.gz"
+    storage_path = Rails.root.join("tmp", "repositories", self.path)
     file_path = File.join(storage_path, file_name)
  
     # Put files into a directory before archiving
-    prefix = self.code + "/"
+    prefix = self.path + "/"
  
     # Create file if not exists
     unless File.exists?(file_path)
@@ -27,7 +27,7 @@
         = link_to admin_projects_path do
           %h1= Project.count
         %hr
-        = link_to 'New Project', new_admin_project_path, class: "btn small"
+        = link_to 'New Project', new_project_path, class: "btn small"
   .span4
     .ui-box
       %h5 Users
@@ -8,12 +8,12 @@
     .input
       = f.text_field :name, placeholder: "Example Group", class: "xxlarge"
   .clearfix
-    = f.label :code do
+    = f.label :path do
       URL
     .input
       .input-prepend
         %span.add-on= web_app_url + 'groups/'
-        = f.text_field :code, placeholder: "example"
+        = f.text_field :path, placeholder: "example"
  
   .form-actions
     = f.submit 'Save group', class: "btn save-btn"
@@ -18,13 +18,6 @@
         Path
       .input
         = text_field_tag :ppath, @project.path_to_repo, class: "xlarge", disabled: true
-    .clearfix
-      = f.label :code do
-        URL
-      .input
-        .input-prepend
-          %span.add-on= web_app_url
-          = f.text_field :code, placeholder: "example"
  
     - unless project.new_record?
       .clearfix
@@ -19,13 +19,6 @@
         .input-prepend
           %strong
             = text_field_tag :ppath, @project.path_to_repo, class: "xlarge", disabled: true
-    .clearfix
-      = f.label :code do
-        URL
-      .input
-        .input-prepend
-          %span.add-on= web_app_url
-          = f.text_field :code, placeholder: "example"
  
     - unless @project.new_record? || @project.heads.empty?
       .clearfix
 unless User.count > 0
   admin = User.create(
-    :email => "admin@local.host",
-    :name => "Administrator",
-    :password => "5iveL!fe",
-    :password_confirmation => "5iveL!fe"
+    email: "admin@local.host",
+    name: "Administrator",
+    username: 'root',
+    password: "5iveL!fe",
+    password_confirmation: "5iveL!fe"
   )
  
   admin.projects_limit = 10000
 User.seed(:id, [
-  { :id => 2, :name => Faker::Internet.user_name, :email => Faker::Internet.email},
-  { :id => 3, :name => Faker::Internet.user_name, :email => Faker::Internet.email},
-  { :id => 4, :name => Faker::Internet.user_name, :email => Faker::Internet.email},
-  { :id => 5, :name => Faker::Internet.user_name, :email => Faker::Internet.email},
-  { :id => 6, :name => Faker::Internet.user_name, :email => Faker::Internet.email},
-  { :id => 7, :name => Faker::Internet.user_name, :email => Faker::Internet.email},
-  { :id => 8, :name => Faker::Internet.user_name, :email => Faker::Internet.email},
-  { :id => 9, :name => Faker::Internet.user_name, :email => Faker::Internet.email}
+  { id: 2, username: Faker::Internet.user_name, name: Faker::Name.name, email: Faker::Internet.email},
+  { id: 3, username: Faker::Internet.user_name, name: Faker::Name.name, email: Faker::Internet.email},
+  { id: 4, username: Faker::Internet.user_name, name: Faker::Name.name, email: Faker::Internet.email},
+  { id: 5, username: Faker::Internet.user_name, name: Faker::Name.name, email: Faker::Internet.email},
+  { id: 6, username: Faker::Internet.user_name, name: Faker::Name.name, email: Faker::Internet.email},
+  { id: 7, username: Faker::Internet.user_name, name: Faker::Name.name, email: Faker::Internet.email},
+  { id: 8, username: Faker::Internet.user_name, name: Faker::Name.name, email: Faker::Internet.email},
+  { id: 9, username: Faker::Internet.user_name, name: Faker::Name.name, email: Faker::Internet.email}
 ])
  
 admin = User.create(
-  :email => "admin@local.host",
-  :name => "Administrator",
-  :password => "5iveL!fe",
-  :password_confirmation => "5iveL!fe"
+  email: "admin@local.host",
+  name: "Administrator",
+  username: 'root',
+  password: "5iveL!fe",
+  password_confirmation: "5iveL!fe"
 )
  
 admin.projects_limit = 10000
@@ -0,0 +1,11 @@
+class RenameCodeToPath < ActiveRecord::Migration
+  def up
+    remove_column :projects, :code
+    rename_column :namespaces, :code, :path
+  end
+
+  def down
+    add_column :projects, :code, :string
+    rename_column :namespaces, :path, :code
+  end
+end
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
  
-ActiveRecord::Schema.define(:version => 20121123104937) do
+ActiveRecord::Schema.define(:version => 20121123164910) do
  
   create_table "events", :force => true do |t|
     t.string   "target_type"
@@ -82,7 +82,7 @@ ActiveRecord::Schema.define(:version =&gt; 20121123104937) do
  
   create_table "namespaces", :force => true do |t|
     t.string   "name",       :null => false
-    t.string   "code",       :null => false
+    t.string   "path",       :null => false
     t.integer  "owner_id",   :null => false
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
@@ -111,7 +111,6 @@ ActiveRecord::Schema.define(:version =&gt; 20121123104937) do
     t.datetime "created_at",                               :null => false
     t.datetime "updated_at",                               :null => false
     t.boolean  "private_flag",           :default => true, :null => false
-    t.string   "code"
     t.integer  "owner_id"
     t.string   "default_branch"
     t.boolean  "issues_enabled",         :default => true, :null => false
@@ -6,7 +6,7 @@ module Gitlab
  
     def user_project
       if @project ||= current_user.projects.find_by_id(params[:id]) ||
-                      current_user.projects.find_by_code(params[:id])
+                      current_user.projects.find_by_path(params[:id])
       else
         not_found!
       end
@@ -34,6 +34,7 @@ module Gitlab
         extern_uid: uid,
         provider: provider,
         name: name,
+        username: email.match(/^[^@]*/)[0],
         email: email,
         password: password,
         password_confirmation: password,
@@ -12,6 +12,7 @@ FactoryGirl.define do
   factory :user, aliases: [:author, :assignee, :owner] do
     email { Faker::Internet.email }
     name
+    username 'john'
     password "123456"
     password_confirmation { password }
  
@@ -13,7 +13,7 @@ describe UserObserver do
   end
  
   context 'when a new user is created' do
-    let(:user) { double(:user, id: 42, password: 'P@ssword!', name: 'John', email: 'u@mail.local') }
+    let(:user) { double(:user, id: 42, password: 'P@ssword!', name: 'John', email: 'u@mail.local', username: 'root') }
     let(:notification) { double :notification }
  
     it 'sends an email' do
@@ -78,14 +78,6 @@ describe Admin::ProjectsController, &quot;routing&quot; do
     get("/admin/projects").should route_to('admin/projects#index')
   end
  
-  it "to #create" do
-    post("/admin/projects").should route_to('admin/projects#create')
-  end
-
-  it "to #new" do
-    get("/admin/projects/new").should route_to('admin/projects#new')
-  end
-
   it "to #edit" do
     get("/admin/projects/gitlab/edit").should route_to('admin/projects#edit', id: 'gitlab')
   end
...	...	@@ -5,7 +5,7 @@ class Admin::ProjectsController < AdminController
5	5	@projects = Project.scoped
6	6	@projects = @projects.where(namespace_id: params[:namespace_id]) if params[:namespace_id].present?
7	7	@projects = @projects.search(params[:name]) if params[:name].present?
8		- @projects = @projects.includes(:namespace).order("namespaces.code, projects.name ASC").page(params[:page]).per(20)
	8	+ @projects = @projects.includes(:namespace).order("namespaces.path, projects.name ASC").page(params[:page]).per(20)
9	9	end
10	10
11	11	def show
...	...
...	...	@@ -66,7 +66,7 @@ class ApplicationController < ActionController::Base
66	66	id = params[:project_id] \|\| params[:id]
67	67	id = id.split("/") if id.include?("/")
68	68
69		- @project \|\|= current_user.projects.find_by_code(id)
	69	+ @project \|\|= current_user.projects.find_by_path(id)
70	70	@project \|\| render_404
71	71	end
72	72
...	...
1	1	class Namespace < ActiveRecord::Base
2		- attr_accessible :code, :name, :owner_id
	2	+ attr_accessible :name, :path
3	3
4		- has_many :projects
	4	+ has_many :projects, dependent: :destroy
5	5	belongs_to :owner, class_name: "User"
6	6
7	7	validates :name, presence: true, uniqueness: true
8		- validates :code, presence: true, uniqueness: true
	8	+ validates :path, uniqueness: true, presence: true, length: { within: 1..255 },
	9	+ format: { with: /\A[a-zA-Z][a-zA-Z0-9_\-\.]*\z/,
	10	+ message: "only letters, digits & '_' '-' '.' allowed. Letter should be first" }
9	11	validates :owner, presence: true
10	12
11	13	delegate :name, to: :owner, allow_nil: true, prefix: true
...	...	@@ -15,11 +17,11 @@ class Namespace < ActiveRecord::Base
15	17	scope :root, where('type IS NULL')
16	18
17	19	def self.search query
18		- where("name LIKE :query OR code LIKE :query", query: "%#{query}%")
	20	+ where("name LIKE :query OR path LIKE :query", query: "%#{query}%")
19	21	end
20	22
21	23	def to_param
22		- code
	24	+ path
23	25	end
24	26
25	27	def human_name
...	...	@@ -27,7 +29,7 @@ class Namespace < ActiveRecord::Base
27	29	end
28	30
29	31	def ensure_dir_exist
30		- namespace_dir_path = File.join(Gitlab.config.git_base_path, code)
	32	+ namespace_dir_path = File.join(Gitlab.config.git_base_path, path)
31	33	Dir.mkdir(namespace_dir_path) unless File.exists?(namespace_dir_path)
32	34	end
33	35	end
...	...
...	...	@@ -27,7 +27,7 @@ class Project < ActiveRecord::Base
27	27	include Authority
28	28	include Team
29	29
30		- attr_accessible :name, :path, :description, :code, :default_branch, :issues_enabled,
	30	+ attr_accessible :name, :path, :description, :default_branch, :issues_enabled,
31	31	:wall_enabled, :merge_requests_enabled, :wiki_enabled, as: [:default, :admin]
32	32
33	33	attr_accessible :namespace_id, as: :admin
...	...	@@ -58,16 +58,16 @@ class Project < ActiveRecord::Base
58	58	# Validations
59	59	validates :owner, presence: true
60	60	validates :description, length: { within: 0..2000 }
61		- validates :name, uniqueness: true, presence: true, length: { within: 0..255 }
62		- validates :path, uniqueness: true, presence: true, length: { within: 0..255 },
63		- format: { with: /\A[a-zA-Z][a-zA-Z0-9_\-\.]*\z/,
64		- message: "only letters, digits & '_' '-' '.' allowed. Letter should be first" }
65		- validates :code, presence: true, uniqueness: true, length: { within: 1..255 },
	61	+ validates :name, presence: true, length: { within: 0..255 }
	62	+ validates :path, presence: true, length: { within: 0..255 },
66	63	format: { with: /\A[a-zA-Z][a-zA-Z0-9_\-\.]*\z/,
67	64	message: "only letters, digits & '_' '-' '.' allowed. Letter should be first" }
68	65	validates :issues_enabled, :wall_enabled, :merge_requests_enabled,
69	66	:wiki_enabled, inclusion: { in: [true, false] }
70	67
	68	+ validates_uniqueness_of :name, scope: :namespace_id
	69	+ validates_uniqueness_of :path, scope: :namespace_id
	70	+
71	71	validate :check_limit, :repo_name
72	72
73	73	# Scopes
...	...	@@ -81,20 +81,23 @@ class Project < ActiveRecord::Base
81	81	end
82	82
83	83	def search query
84		- where("projects.name LIKE :query OR projects.code LIKE :query OR projects.path LIKE :query", query: "%#{query}%")
	84	+ where("projects.name LIKE :query OR projects.path LIKE :query", query: "%#{query}%")
85	85	end
86	86
87	87	def create_by_user(params, user)
88		- namespace_id = params.delete(:namespace_id) \|\| namespace.try(:id)
	88	+ namespace_id = params.delete(:namespace_id)
	89	+ namespace_id \|\|= current_user.namespace_id
89	90
90	91	project = Project.new params
91	92
92	93	Project.transaction do
93	94
94		- # Build gitlab-hq code from GitLab HQ name
	95	+ # Parametrize path for project
95	96	#
96		- slug = project.name.dup.parameterize
97		- project.code = project.path = slug
	97	+ # Ex.
	98	+ # 'GitLab HQ'.parameterize => "gitlab-hq"
	99	+ #
	100	+ project.path = project.name.dup.parameterize
98	101
99	102	project.owner = user
100	103	project.namespace_id = namespace_id
...	...	@@ -149,14 +152,14 @@ class Project < ActiveRecord::Base
149	152
150	153	def to_param
151	154	if namespace
152		- namespace.code + "/" + code
	155	+ namespace.path + "/" + path
153	156	else
154		- code
	157	+ path
155	158	end
156	159	end
157	160
158	161	def web_url
159		- [Gitlab.config.url, code].join("/")
	162	+ [Gitlab.config.url, path].join("/")
160	163	end
161	164
162	165	def common_notes
...	...	@@ -213,7 +216,7 @@ class Project < ActiveRecord::Base
213	216
214	217	def path_with_namespace
215	218	if namespace
216		- namespace.code + '/' + path
	219	+ namespace.path + '/' + path
217	220	else
218	221	path
219	222	end
...	...
...	...	@@ -69,7 +69,8 @@ class User < ActiveRecord::Base
69	69	before_save :ensure_authentication_token
70	70	alias_attribute :private_token, :authentication_token
71	71
72		- delegate :code, to: :namespace, allow_nil: true, prefix: true
	72	+ delegate :path, to: :namespace, allow_nil: true, prefix: true
	73	+ delegate :id, to: :namespace, allow_nil: true, prefix: true
73	74
74	75	# Scopes
75	76	scope :not_in_project, ->(project) { where("id not in (:ids)", ids: project.users.map(&:id) ) }
...	...	@@ -121,7 +122,7 @@ class User < ActiveRecord::Base
121	122
122	123	def namespaces
123	124	namespaces = []
124		- namespaces << self.namespace
	125	+ namespaces << self.namespace if self.namespace
125	126	namespaces = namespaces + Group.all if admin
126	127	namespaces
127	128	end
...	...
1	1	class ProjectObserver < ActiveRecord::Observer
2		- def before_save(project)
	2	+ def after_save(project)
	3	+ project.update_repository
	4	+
3	5	# Move repository if namespace changed
4	6	if project.namespace_id_changed? and not project.new_record?
5	7	move_project(project)
6	8	end
7	9	end
8	10
9		- def after_save(project)
10		- project.update_repository
11		- end
12		-
13	11	def after_destroy(project)
14	12	log_info("Project \"#{project.name}\" was removed")
15	13
...	...	@@ -27,8 +25,8 @@ class ProjectObserver < ActiveRecord::Observer
27	25	end
28	26
29	27	def move_project(project)
30		- old_dir = Namespace.find_by_id(project.namespace_id_was).try(:code) \|\| ''
31		- new_dir = Namespace.find_by_id(project.namespace_id).try(:code) \|\| ''
	28	+ old_dir = Namespace.find_by_id(project.namespace_id_was).try(:path) \|\| ''
	29	+ new_dir = Namespace.find_by_id(project.namespace_id).try(:path) \|\| ''
32	30
33	31	# Create new dir if missing
34	32	new_dir_path = File.join(Gitlab.config.git_base_path, new_dir)
...	...
...	...	@@ -114,7 +114,7 @@ module PushObserver
114	114	id: commit.id,
115	115	message: commit.safe_message,
116	116	timestamp: commit.date.xmlschema,
117		- url: "#{Gitlab.config.url}/#{code}/commits/#{commit.id}",
	117	+ url: "#{Gitlab.config.url}/#{path}/commits/#{commit.id}",
118	118	author: {
119	119	name: commit.author_name,
120	120	email: commit.author_email
...	...
...	...	@@ -87,7 +87,7 @@ module Repository
87	87	end
88	88
89	89	def namespace_dir
90		- namespace.try(:code) \|\| ''
	90	+ namespace.try(:path) \|\| ''
91	91	end
92	92
93	93	def update_repository
...	...	@@ -164,12 +164,12 @@ module Repository
164	164	return nil unless commit
165	165
166	166	# Build file path
167		- file_name = self.code + "-" + commit.id.to_s + ".tar.gz"
168		- storage_path = Rails.root.join("tmp", "repositories", self.code)
	167	+ file_name = self.path + "-" + commit.id.to_s + ".tar.gz"
	168	+ storage_path = Rails.root.join("tmp", "repositories", self.path)
169	169	file_path = File.join(storage_path, file_name)
170	170
171	171	# Put files into a directory before archiving
172		- prefix = self.code + "/"
	172	+ prefix = self.path + "/"
173	173
174	174	# Create file if not exists
175	175	unless File.exists?(file_path)
...	...
...	...	@@ -27,7 +27,7 @@
27	27	= link_to admin_projects_path do
28	28	%h1= Project.count
29	29	%hr
30		- = link_to 'New Project', new_admin_project_path, class: "btn small"
	30	+ = link_to 'New Project', new_project_path, class: "btn small"
31	31	.span4
32	32	.ui-box
33	33	%h5 Users
...	...
...	...	@@ -8,12 +8,12 @@
8	8	.input
9	9	= f.text_field :name, placeholder: "Example Group", class: "xxlarge"
10	10	.clearfix
11		- = f.label :code do
	11	+ = f.label :path do
12	12	URL
13	13	.input
14	14	.input-prepend
15	15	%span.add-on= web_app_url + 'groups/'
16		- = f.text_field :code, placeholder: "example"
	16	+ = f.text_field :path, placeholder: "example"
17	17
18	18	.form-actions
19	19	= f.submit 'Save group', class: "btn save-btn"
...	...