Remove user resource. Add ssh url to repo for project

reuben-sutton · Jun 3, 2013 · 94ae273 · 94ae273
1 parent 26938bf
commit 94ae273
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 135 deletions.
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
@@ -108,7 +108,8 @@ def add
       name: project.name_with_namespace,
       gitlab_url: project.web_url,
       scripts: 'ls -la',
-      default_ref: project.default_branch
+      default_ref: project.default_branch,
+      ssh_url_to_repo: project.ssh_url_to_repo
     }
 
     @project = Project.new(params)

diff --git a/app/controllers/resques_controller.rb b/app/controllers/resques_controller.rb
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
diff --git a/app/models/project.rb b/app/models/project.rb
@@ -1,14 +1,16 @@
 class Project < ActiveRecord::Base
   attr_accessible :name, :path, :scripts, :timeout, :token,
-    :default_ref, :gitlab_url, :always_build, :polling_interval, :public
+    :default_ref, :gitlab_url, :always_build, :polling_interval,
+    :public, :ssh_url_to_repo
 
   has_many :builds, dependent: :destroy
 
 
   #
   # Validations
   #
-  validates_presence_of :name, :scripts, :timeout, :token, :default_ref, :gitlab_url
+  validates_presence_of :name, :scripts, :timeout, :token, :default_ref, :gitlab_url, :ssh_url_to_repo
+
   validates_uniqueness_of :name
 
   validates :polling_interval,

diff --git a/app/views/projects/_form.html.haml b/app/views/projects/_form.html.haml
@@ -17,6 +17,9 @@
         .field
           = f.label :gitlab_url, "GitLab url to project"
           = f.text_field :gitlab_url, class: 'input-xlarge', placeholder: 'http://gitlab.domain.com/project-slug'
+        .field
+          = f.label :ssh_url_to_repo, "ssh url to repository"
+          = f.text_field :ssh_url_to_repo, class: 'input-xlarge', placeholder: 'git@gitlab.domain.com:project-slug.git'
         .field
           = f.label :default_ref, "Make tabs for next branches"
           = f.text_field :default_ref, class: 'input-xlarge', placeholder: 'master, stable'

diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml
diff --git a/app/views/users/edit.html.haml~ b/app/views/users/edit.html.haml~
diff --git a/app/views/users/index.html.haml b/app/views/users/index.html.haml
diff --git a/config/routes.rb b/config/routes.rb
@@ -26,7 +26,6 @@
     end
   end
 
-  resources :users
   resource :user_sessions
   resources :runners, only: [:index, :destroy]
 

diff --git a/db/migrate/20130603144030_add_more_fields_to_project.rb b/db/migrate/20130603144030_add_more_fields_to_project.rb
@@ -0,0 +1,5 @@
+class AddMoreFieldsToProject < ActiveRecord::Migration
+  def change
+    add_column :projects, :ssh_url_to_repo, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130603130920) do
+ActiveRecord::Schema.define(:version => 20130603144030) do
 
   create_table "builds", :force => true do |t|
     t.integer  "project_id"
@@ -41,6 +41,7 @@
     t.boolean  "always_build",     :default => false, :null => false
     t.integer  "polling_interval"
     t.boolean  "public",           :default => false, :null => false
+    t.string   "ssh_url_to_repo"
   end
 
   create_table "runners", :force => true do |t|
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,6 @@ @@
         end
       end
-      resources :users
       resource :user_sessions
       resources :runners, only: [:index, :destroy]
@@ Expand Down @@