Merge branch 'refactor/services' of /home/git/repositories/gitlab/gitlabhq

Dmitriy Zaporozhets
2 parents adc51a9b 6caa5a84
Showing 16 changed files with 242 additions and 91 deletions Show diff stats
CHANGELOG
Gemfile
Gemfile.lock
app/assets/javascripts/wall.js.coffee
app/controllers/services_controller.rb
app/models/campfire_service.rb
app/models/gitlab_ci_service.rb
app/models/project.rb
app/models/service.rb
app/views/services/_form.html.haml
app/views/services/_gitlab_ci.html.haml
app/views/services/edit.html.haml
app/views/services/index.html.haml
db/migrate/20130522141856_add_more_fields_to_service.rb
db/schema.rb
features/steps/project/project_services.rb
+v 5.3.0
+  - Refactored services 
+  - Campfire service added
+
 v 5.2.0
   - Turbolinks
   - Git over http with ldap credentials
@@ -101,6 +101,9 @@ gem &quot;foreman&quot;
 # Cache
 gem "redis-rails"
+# Campfire integration
+gem 'tinder', '~> 1.9.2'
+
 group :assets do
   gem "sass-rails"
   gem "coffee-rails"
@@ -130,6 +130,8 @@ GEM
       railties (>= 3.0.0)
     faraday (0.8.7)
       multipart-post (~> 1.1)
+    faraday_middleware (0.9.0)
+      faraday (>= 0.7.4, < 0.9)
     faye-websocket (0.4.7)
       eventmachine (>= 0.12.0)
     ffaker (1.16.0)
@@ -214,7 +216,7 @@ GEM
       activesupport (>= 3.1, < 4.1)
       haml (>= 3.1, < 4.1)
       railties (>= 3.1, < 4.1)
-    hashie (2.0.4)
+    hashie (1.2.0)
     hike (1.2.2)
     http_parser.rb (0.5.3)
     httparty (0.11.0)
@@ -420,6 +422,7 @@ GEM
       multi_json (~> 1)
       redis (~> 3)
       redis-namespace
+    simple_oauth (0.1.9)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
@@ -461,11 +464,24 @@ GEM
     thor (0.18.1)
     tilt (1.3.7)
     timers (1.1.0)
+    tinder (1.9.2)
+      eventmachine (~> 1.0)
+      faraday (~> 0.8)
+      faraday_middleware (~> 0.9)
+      hashie (~> 1.0)
+      json (~> 1.7.5)
+      mime-types (~> 1.19)
+      multi_json (~> 1.5)
+      twitter-stream (~> 0.1)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
     turbolinks (1.1.1)
       coffee-rails
+    twitter-stream (0.1.16)
+      eventmachine (>= 0.12.8)
+      http_parser.rb (~> 0.5.1)
+      simple_oauth (~> 0.1.4)
     tzinfo (0.3.37)
     uglifier (2.0.1)
       execjs (>= 0.3.0)
@@ -570,6 +586,7 @@ DEPENDENCIES
   test_after_commit
   therubyracer
   thin
+  tinder (~> 1.9.2)
   turbolinks
   uglifier
   webmock
@@ -60,7 +60,7 @@ class Wall
   renderNote: (note) ->
     template = @noteTemplate()
     template = template.replace('{{author_name}}', note.author.name)
-    template = template.replace('{{created_at}}', note.created_at)
+    template = template.replace(/{{created_at}}/g, note.created_at)
     template = template.replace('{{text}}', linkify(sanitize(note.body)))
     if note.attachment
 class ServicesController < ProjectResourceController
   # Authorize
   before_filter :authorize_admin_project!
+  before_filter :service, only: [:edit, :update, :test]
   respond_to :html
   def index
-    @gitlab_ci_service = @project.gitlab_ci_service
+    @project.build_missing_services
+    @services = @project.services.reload
   end
   def edit
-    @service = @project.gitlab_ci_service
-
-    # Create if missing
-    @service = @project.create_gitlab_ci_service unless @service
   end
   def update
-    @service = @project.gitlab_ci_service
-
     if @service.update_attributes(params[:service])
-      redirect_to edit_project_service_path(@project, :gitlab_ci)
+      redirect_to edit_project_service_path(@project, @service.to_param)
     else
       render 'edit'
     end
@@ -28,9 +24,14 @@ class ServicesController &lt; ProjectResourceController
   def test
     data = GitPushService.new.sample_data(project, current_user)
-    @service = project.gitlab_ci_service
     @service.execute(data)
     redirect_to :back
   end
+
+  private
+
+  def service
+    @service ||= @project.services.find { |service| service.to_param == params[:id] }
+  end
 end
@@ -0,0 +1,76 @@
+# == Schema Information
+#
+# Table name: services
+#
+#  id          :integer          not null, primary key
+#  type        :string(255)
+#  title       :string(255)
+#  token       :string(255)
+#  project_id  :integer          not null
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#  active      :boolean          default(FALSE), not null
+#  project_url :string(255)
+#
+
+class CampfireService < Service
+  attr_accessible :subdomain, :room
+
+  validates :token, presence: true, if: :activated?
+
+  def title
+    'Campfire'
+  end
+
+  def description
+    'Simple web-based real-time group chat'
+  end
+
+  def to_param
+    'campfire'
+  end
+
+  def fields
+    [
+      { type: 'text', name: 'token',     placeholder: '' },
+      { type: 'text', name: 'subdomain', placeholder: '' },
+      { type: 'text', name: 'room',      placeholder: '' }
+    ]
+  end
+
+  def execute(push_data)
+    room = gate.find_room_by_name(self.room)
+    return true unless room
+
+    message = build_message(push_data)
+
+    room.speak(message)
+  end
+
+  private
+
+  def gate
+    @gate ||= Tinder::Campfire.new(subdomain, token: token)
+  end
+
+  def build_message(push)
+    ref = push[:ref].gsub("refs/heads/", "")
+    before = push[:before]
+    after = push[:after]
+
+    message = ""
+    message << "[#{project.name_with_namespace}] "
+    message << "#{push[:user_name]} "
+
+    if before =~ /000000/
+      message << "pushed new branch #{ref} \n"
+    elsif after =~ /000000/
+      message << "removed branch #{ref} \n"
+    else
+      message << "pushed #{push[:total_commits_count]} commits to #{ref}. "
+      message << "#{project.web_url}/compare/#{before}...#{after}"
+    end
+
+    message
+  end
+end
@@ -54,4 +54,23 @@ class GitlabCiService &lt; Service
   def status_img_path
     project_url + "/status.png?ref=" + project.default_branch
   end
+
+  def title
+    'GitLab CI'
+  end
+
+  def description
+    'Continuous integration server from GitLab'
+  end
+
+  def to_param
+    'gitlab_ci'
+  end
+
+  def fields
+    [
+      { type: 'text', name: 'token', placeholder: 'GitLab CI project specific token' },
+      { type: 'text', name: 'project_url', placeholder: 'http://ci.gitlabhq.com/projects/3'}
+    ]
+  end
 end
@@ -45,9 +45,11 @@ class Project &lt; ActiveRecord::Base
   has_one :last_event, class_name: 'Event', order: 'events.created_at DESC', foreign_key: 'project_id'
   has_one :gitlab_ci_service, dependent: :destroy
+  has_one :campfire_service, dependent: :destroy
   has_one :forked_project_link, dependent: :destroy, foreign_key: "forked_to_project_id"
   has_one :forked_from_project, through: :forked_project_link
+  has_many :services,           dependent: :destroy
   has_many :events,             dependent: :destroy
   has_many :merge_requests,     dependent: :destroy
   has_many :issues,             dependent: :destroy, order: "state DESC, created_at DESC"
@@ -223,8 +225,18 @@ class Project &lt; ActiveRecord::Base
     self.issues_enabled && !self.used_default_issues_tracker?
   end
-  def services
-    [gitlab_ci_service].compact
+  def build_missing_services
+    available_services_names.each do |service_name|
+      service = services.find { |service| service.to_param == service_name }
+
+      # If service is available but missing in db
+      # we should create an instance. Ex `create_gitlab_ci_service`
+      service = self.send :"create_#{service_name}_service" if service.nil?
+    end
+  end
+
+  def available_services_names
+    %w(gitlab_ci campfire)
   end
   def gitlab_ci?
@@ -13,6 +13,8 @@
 #  project_url :string(255)
 #
+# To add new service you should build a class inherited from Service
+# and implement a set of methods
 class Service < ActiveRecord::Base
   attr_accessible :title, :token, :type, :active
@@ -24,4 +26,25 @@ class Service &lt; ActiveRecord::Base
   def activated?
     active
   end
+
+  def title
+    # implement inside child
+  end
+
+  def description
+    # implement inside child
+  end
+
+  def to_param
+    # implement inside child
+  end
+
+  def fields
+    # implement inside child
+    []
+  end
+
+  def execute
+    # implement inside child
+  end
 end
@@ -0,0 +1,48 @@
+%h3.page_title
+  - if @service.activated?
+    %span.cgreen
+      %i.icon-circle
+  - else
+    %span.cgray
+      %i.icon-circle-blank
+  = @service.title
+
+%p= @service.description
+
+.back_link
+  = link_to project_services_path(@project) do
+    &larr; to services
+
+%hr
+
+= form_for(@service, as: :service, url: project_service_path(@project, @service.to_param), method: :put) do |f|
+  - if @service.errors.any?
+    .alert.alert-error
+      %ul
+        - @service.errors.full_messages.each do |msg|
+          %li= msg
+
+
+  .control-group
+    = f.label :active, "Active", class: "control-label"
+    .controls
+      = f.check_box :active
+
+  - @service.fields.each do |field|
+    - name = field[:name]
+    - type = field[:type]
+    - placeholder = field[:placeholder]
+
+    .control-group
+      = f.label name, class: "control-label"
+      .controls
+        - if type == 'text'
+          = f.text_field name, class: "input-xlarge", placeholder: placeholder
+        - elsif type == 'checkbox'
+          = f.check_box name
+
+  .form-actions
+    = f.submit 'Save', class: 'btn btn-save'
+    &nbsp;
+    - if @service.valid? && @service.activated?
+      = link_to 'Test settings', test_project_service_path(@project, @service.to_param), class: 'btn btn-small'
@@ -1,46 +0,0 @@
-%h3.page_title
-  GitLab CI
-  %small Continuous integration server from GitLab
-  .pull-right
-    - if @service.active
-      %small.cgreen Enabled
-    - else
-      %small.cgray Disabled
-
-
-
-.back_link
-  = link_to project_services_path(@project) do
-    &larr; to services
-
-%hr
-= form_for(@service, :as => :service, :url => project_service_path(@project, :gitlab_ci), :method => :put) do |f|
-  - if @service.errors.any?
-    .alert.alert-error
-      %ul
-        - @service.errors.full_messages.each do |msg|
-          %li= msg
-
-
-  .control-group
-    = f.label :active, "Active", class: "control-label"
-    .controls
-      = f.check_box :active
-
-  .control-group
-    = f.label :project_url, "Project URL", class: "control-label"
-    .controls
-      = f.text_field :project_url, class: "input-xlarge", placeholder: "http://ci.gitlabhq.com/projects/3"
-
-  .control-group
-    = f.label :token, class: "control-label" do
-      CI Project token
-    .controls
-      = f.text_field :token, class: "input-xlarge", placeholder: "GitLab CI project specific token"
-
-
-  .form-actions
-    = f.submit 'Save', class: 'btn btn-save'
-    &nbsp;
-    - if @service.valid? && @service.active
-      = link_to 'Test settings', test_project_service_path(@project), class: 'btn btn-small'
 = render "projects/settings_nav"
-= render 'gitlab_ci'
+= render 'form'
@@ -3,30 +3,16 @@
 %h3.page_title Services
 %br
-%ul.ui-box.well-list
-  %li
-    %h4.cgreen
-      = link_to edit_project_service_path(@project, :gitlab_ci) do
-        GitLab CI
-        %small Continuous integration server from GitLab
-      .pull-right
-        - if @gitlab_ci_service.try(:active)
-          %small.cgreen
-            %i.icon-ok
-            Enabled
+%ul.bordered-list
+  - @services.each do |service|
+    %li
+      %h4
+        - if service.activated?
+          %span.cgreen
+            %i.icon-circle
         - else
-          %small.cgray
-            %i.icon-off
-            Disabled
-  %li.disabled
-    %h4
-      Jenkins CI
-      %small An extendable open source continuous integration server
-      .pull-right
-        %small Not implemented yet
-  %li.disabled
-    %h4
-      Campfire
-      %small Web-based group chat tool
-      .pull-right
-        %small Not implemented yet
+          %span.cgray
+            %i.icon-circle-blank
+        = link_to edit_project_service_path(@project, service.to_param) do
+          = service.title
+      %p= service.description
@@ -0,0 +1,6 @@
+class AddMoreFieldsToService < ActiveRecord::Migration
+  def change
+    add_column :services, :subdomain, :string
+    add_column :services, :room, :string
+  end
+end
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20130506095501) do
+ActiveRecord::Schema.define(:version => 20130522141856) do
   create_table "deploy_keys_projects", :force => true do |t|
     t.integer  "deploy_key_id", :null => false
@@ -194,6 +194,8 @@ ActiveRecord::Schema.define(:version =&gt; 20130506095501) do
     t.datetime "updated_at",                     :null => false
     t.boolean  "active",      :default => false, :null => false
     t.string   "project_url"
+    t.string   "subdomain"
+    t.string   "room"
   end
   add_index "services", ["project_id"], :name => "index_services_on_project_id"
@@ -9,7 +9,7 @@ class ProjectServices &lt; Spinach::FeatureSteps
   Then 'I should see list of available services' do
     page.should have_content 'Services'
-    page.should have_content 'Jenkins'
+    page.should have_content 'Campfire'
     page.should have_content 'GitLab CI'
   end
@@ -19,12 +19,12 @@ class ProjectServices &lt; Spinach::FeatureSteps
   And 'I fill gitlab-ci settings' do
     check 'Active'
-    fill_in 'Project URL', with: 'http://ci.gitlab.org/projects/3'
-    fill_in 'CI Project token', with: 'verySecret'
+    fill_in 'Project url', with: 'http://ci.gitlab.org/projects/3'
+    fill_in 'Token', with: 'verySecret'
     click_button 'Save'
   end
   Then 'I should see service settings saved' do
-    find_field('Project URL').value.should == 'http://ci.gitlab.org/projects/3'
+    find_field('Project url').value.should == 'http://ci.gitlab.org/projects/3'
   end
 end
		1	+v 5.3.0
		2	+ - Refactored services
		3	+ - Campfire service added
		4	+
1	v 5.2.0	5	v 5.2.0
2	- Turbolinks	6	- Turbolinks
3	- Git over http with ldap credentials	7	- Git over http with ldap credentials
	@@ -130,6 +130,8 @@ GEM		@@ -130,6 +130,8 @@ GEM
130	railties (>= 3.0.0)	130	railties (>= 3.0.0)
131	faraday (0.8.7)	131	faraday (0.8.7)
132	multipart-post (~> 1.1)	132	multipart-post (~> 1.1)
		133	+ faraday_middleware (0.9.0)
		134	+ faraday (>= 0.7.4, < 0.9)
133	faye-websocket (0.4.7)	135	faye-websocket (0.4.7)
134	eventmachine (>= 0.12.0)	136	eventmachine (>= 0.12.0)
135	ffaker (1.16.0)	137	ffaker (1.16.0)
	@@ -214,7 +216,7 @@ GEM		@@ -214,7 +216,7 @@ GEM
214	activesupport (>= 3.1, < 4.1)	216	activesupport (>= 3.1, < 4.1)
215	haml (>= 3.1, < 4.1)	217	haml (>= 3.1, < 4.1)
216	railties (>= 3.1, < 4.1)	218	railties (>= 3.1, < 4.1)
217	- hashie (2.0.4)	219	+ hashie (1.2.0)
218	hike (1.2.2)	220	hike (1.2.2)
219	http_parser.rb (0.5.3)	221	http_parser.rb (0.5.3)
220	httparty (0.11.0)	222	httparty (0.11.0)
	@@ -420,6 +422,7 @@ GEM		@@ -420,6 +422,7 @@ GEM
420	multi_json (~> 1)	422	multi_json (~> 1)
421	redis (~> 3)	423	redis (~> 3)
422	redis-namespace	424	redis-namespace
		425	+ simple_oauth (0.1.9)
423	simplecov (0.7.1)	426	simplecov (0.7.1)
424	multi_json (~> 1.0)	427	multi_json (~> 1.0)
425	simplecov-html (~> 0.7.1)	428	simplecov-html (~> 0.7.1)
	@@ -461,11 +464,24 @@ GEM		@@ -461,11 +464,24 @@ GEM
461	thor (0.18.1)	464	thor (0.18.1)
462	tilt (1.3.7)	465	tilt (1.3.7)
463	timers (1.1.0)	466	timers (1.1.0)
		467	+ tinder (1.9.2)
		468	+ eventmachine (~> 1.0)
		469	+ faraday (~> 0.8)
		470	+ faraday_middleware (~> 0.9)
		471	+ hashie (~> 1.0)
		472	+ json (~> 1.7.5)
		473	+ mime-types (~> 1.19)
		474	+ multi_json (~> 1.5)
		475	+ twitter-stream (~> 0.1)
464	treetop (1.4.12)	476	treetop (1.4.12)
465	polyglot	477	polyglot
466	polyglot (>= 0.3.1)	478	polyglot (>= 0.3.1)
467	turbolinks (1.1.1)	479	turbolinks (1.1.1)
468	coffee-rails	480	coffee-rails
		481	+ twitter-stream (0.1.16)
		482	+ eventmachine (>= 0.12.8)
		483	+ http_parser.rb (~> 0.5.1)
		484	+ simple_oauth (~> 0.1.4)
469	tzinfo (0.3.37)	485	tzinfo (0.3.37)
470	uglifier (2.0.1)	486	uglifier (2.0.1)
471	execjs (>= 0.3.0)	487	execjs (>= 0.3.0)
	@@ -570,6 +586,7 @@ DEPENDENCIES		@@ -570,6 +586,7 @@ DEPENDENCIES
570	test_after_commit	586	test_after_commit
571	therubyracer	587	therubyracer
572	thin	588	thin
		589	+ tinder (~> 1.9.2)
573	turbolinks	590	turbolinks
574	uglifier	591	uglifier
575	webmock	592	webmock
	@@ -60,7 +60,7 @@ class Wall		@@ -60,7 +60,7 @@ class Wall
60	renderNote: (note) ->	60	renderNote: (note) ->
61	template = @noteTemplate()	61	template = @noteTemplate()
62	template = template.replace('{{author_name}}', note.author.name)	62	template = template.replace('{{author_name}}', note.author.name)
63	- template = template.replace('{{created_at}}', note.created_at)	63	+ template = template.replace(/{{created_at}}/g, note.created_at)
64	template = template.replace('{{text}}', linkify(sanitize(note.body)))	64	template = template.replace('{{text}}', linkify(sanitize(note.body)))
65		65
66	if note.attachment	66	if note.attachment
@@ -0,0 +1,76 @@		@@ -0,0 +1,76 @@
	1	+# == Schema Information
	2	+#
	3	+# Table name: services
	4	+#
	5	+# id :integer not null, primary key
	6	+# type :string(255)
	7	+# title :string(255)
	8	+# token :string(255)
	9	+# project_id :integer not null
	10	+# created_at :datetime not null
	11	+# updated_at :datetime not null
	12	+# active :boolean default(FALSE), not null
	13	+# project_url :string(255)
	14	+#
	15	+
	16	+class CampfireService < Service
	17	+ attr_accessible :subdomain, :room
	18	+
	19	+ validates :token, presence: true, if: :activated?
	20	+
	21	+ def title
	22	+ 'Campfire'
	23	+ end
	24	+
	25	+ def description
	26	+ 'Simple web-based real-time group chat'
	27	+ end
	28	+
	29	+ def to_param
	30	+ 'campfire'
	31	+ end
	32	+
	33	+ def fields
	34	+ [
	35	+ { type: 'text', name: 'token', placeholder: '' },
	36	+ { type: 'text', name: 'subdomain', placeholder: '' },
	37	+ { type: 'text', name: 'room', placeholder: '' }
	38	+ ]
	39	+ end
	40	+
	41	+ def execute(push_data)
	42	+ room = gate.find_room_by_name(self.room)
	43	+ return true unless room
	44	+
	45	+ message = build_message(push_data)
	46	+
	47	+ room.speak(message)
	48	+ end
	49	+
	50	+ private
	51	+
	52	+ def gate
	53	+ @gate \|\|= Tinder::Campfire.new(subdomain, token: token)
	54	+ end
	55	+
	56	+ def build_message(push)
	57	+ ref = push[:ref].gsub("refs/heads/", "")
	58	+ before = push[:before]
	59	+ after = push[:after]
	60	+
	61	+ message = ""
	62	+ message << "[#{project.name_with_namespace}] "
	63	+ message << "#{push[:user_name]} "
	64	+
	65	+ if before =~ /000000/
	66	+ message << "pushed new branch #{ref} \n"
	67	+ elsif after =~ /000000/
	68	+ message << "removed branch #{ref} \n"
	69	+ else
	70	+ message << "pushed #{push[:total_commits_count]} commits to #{ref}. "
	71	+ message << "#{project.web_url}/compare/#{before}...#{after}"
	72	+ end
	73	+
	74	+ message
	75	+ end
	76	+end
	@@ -54,4 +54,23 @@ class GitlabCiService < Service		@@ -54,4 +54,23 @@ class GitlabCiService < Service
54	def status_img_path	54	def status_img_path
55	project_url + "/status.png?ref=" + project.default_branch	55	project_url + "/status.png?ref=" + project.default_branch
56	end	56	end
		57	+
		58	+ def title
		59	+ 'GitLab CI'
		60	+ end
		61	+
		62	+ def description
		63	+ 'Continuous integration server from GitLab'
		64	+ end
		65	+
		66	+ def to_param
		67	+ 'gitlab_ci'
		68	+ end
		69	+
		70	+ def fields
		71	+ [
		72	+ { type: 'text', name: 'token', placeholder: 'GitLab CI project specific token' },
		73	+ { type: 'text', name: 'project_url', placeholder: 'http://ci.gitlabhq.com/projects/3'}
		74	+ ]
		75	+ end
57	end	76	end
	@@ -13,6 +13,8 @@		@@ -13,6 +13,8 @@
13	# project_url :string(255)	13	# project_url :string(255)
14	#	14	#
15		15
		16	+# To add new service you should build a class inherited from Service
		17	+# and implement a set of methods
16	class Service < ActiveRecord::Base	18	class Service < ActiveRecord::Base
17	attr_accessible :title, :token, :type, :active	19	attr_accessible :title, :token, :type, :active
18		20
	@@ -24,4 +26,25 @@ class Service < ActiveRecord::Base		@@ -24,4 +26,25 @@ class Service < ActiveRecord::Base
24	def activated?	26	def activated?
25	active	27	active
26	end	28	end
		29	+
		30	+ def title
		31	+ # implement inside child
		32	+ end
		33	+
		34	+ def description
		35	+ # implement inside child
		36	+ end
		37	+
		38	+ def to_param
		39	+ # implement inside child
		40	+ end
		41	+
		42	+ def fields
		43	+ # implement inside child
		44	+ []
		45	+ end
		46	+
		47	+ def execute
		48	+ # implement inside child
		49	+ end
27	end	50	end
@@ -0,0 +1,48 @@		@@ -0,0 +1,48 @@
	1	+%h3.page_title
	2	+ - if @service.activated?
	3	+ %span.cgreen
	4	+ %i.icon-circle
	5	+ - else
	6	+ %span.cgray
	7	+ %i.icon-circle-blank
	8	+ = @service.title
	9	+
	10	+%p= @service.description
	11	+
	12	+.back_link
	13	+ = link_to project_services_path(@project) do
	14	+ ← to services
	15	+
	16	+%hr
	17	+
	18	+= form_for(@service, as: :service, url: project_service_path(@project, @service.to_param), method: :put) do \|f\|
	19	+ - if @service.errors.any?
	20	+ .alert.alert-error
	21	+ %ul
	22	+ - @service.errors.full_messages.each do \|msg\|
	23	+ %li= msg
	24	+
	25	+
	26	+ .control-group
	27	+ = f.label :active, "Active", class: "control-label"
	28	+ .controls
	29	+ = f.check_box :active
	30	+
	31	+ - @service.fields.each do \|field\|
	32	+ - name = field[:name]
	33	+ - type = field[:type]
	34	+ - placeholder = field[:placeholder]
	35	+
	36	+ .control-group
	37	+ = f.label name, class: "control-label"
	38	+ .controls
	39	+ - if type == 'text'
	40	+ = f.text_field name, class: "input-xlarge", placeholder: placeholder
	41	+ - elsif type == 'checkbox'
	42	+ = f.check_box name
	43	+
	44	+ .form-actions
	45	+ = f.submit 'Save', class: 'btn btn-save'
	46	+
	47	+ - if @service.valid? && @service.activated?
	48	+ = link_to 'Test settings', test_project_service_path(@project, @service.to_param), class: 'btn btn-small'
	@@ -1,46 +0,0 @@	@@ -1,46 +0,0 @@
1	-%h3.page_title
2	- GitLab CI
3	- %small Continuous integration server from GitLab
4	- .pull-right
5	- - if @service.active
6	- %small.cgreen Enabled
7	- - else
8	- %small.cgray Disabled
9	-
10	-
11	-
12	-.back_link
13	- = link_to project_services_path(@project) do
14	- ← to services
15	-
16	-%hr
17	-= form_for(@service, :as => :service, :url => project_service_path(@project, :gitlab_ci), :method => :put) do \|f\|
18	- - if @service.errors.any?
19	- .alert.alert-error
20	- %ul
21	- - @service.errors.full_messages.each do \|msg\|
22	- %li= msg
23	-
24	-
25	- .control-group
26	- = f.label :active, "Active", class: "control-label"
27	- .controls
28	- = f.check_box :active
29	-
30	- .control-group
31	- = f.label :project_url, "Project URL", class: "control-label"
32	- .controls
33	- = f.text_field :project_url, class: "input-xlarge", placeholder: "http://ci.gitlabhq.com/projects/3"
34	-
35	- .control-group
36	- = f.label :token, class: "control-label" do
37	- CI Project token
38	- .controls
39	- = f.text_field :token, class: "input-xlarge", placeholder: "GitLab CI project specific token"
40	-
41	-
42	- .form-actions
43	- = f.submit 'Save', class: 'btn btn-save'
44	-
45	- - if @service.valid? && @service.active
46	- = link_to 'Test settings', test_project_service_path(@project), class: 'btn btn-small'
1	= render "projects/settings_nav"	1	= render "projects/settings_nav"
2		2
3	-= render 'gitlab_ci'	3	+= render 'form'
	@@ -3,30 +3,16 @@		@@ -3,30 +3,16 @@
3	%h3.page_title Services	3	%h3.page_title Services
4	%br	4	%br
5		5
6	-%ul.ui-box.well-list
7	- %li
8	- %h4.cgreen
9	- = link_to edit_project_service_path(@project, :gitlab_ci) do
10	- GitLab CI
11	- %small Continuous integration server from GitLab
12	- .pull-right
13	- - if @gitlab_ci_service.try(:active)
14	- %small.cgreen
15	- %i.icon-ok
16	- Enabled	6	+%ul.bordered-list
		7	+ - @services.each do \|service\|
		8	+ %li
		9	+ %h4
		10	+ - if service.activated?
		11	+ %span.cgreen
		12	+ %i.icon-circle
17	- else	13	- else
18	- %small.cgray
19	- %i.icon-off
20	- Disabled
21	- %li.disabled
22	- %h4
23	- Jenkins CI
24	- %small An extendable open source continuous integration server
25	- .pull-right
26	- %small Not implemented yet
27	- %li.disabled
28	- %h4
29	- Campfire
30	- %small Web-based group chat tool
31	- .pull-right
32	- %small Not implemented yet	14	+ %span.cgray
		15	+ %i.icon-circle-blank
		16	+ = link_to edit_project_service_path(@project, service.to_param) do
		17	+ = service.title
		18	+ %p= service.description