Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g

12 files changed, 339 insertions, 80 deletions

diff --git a/app/models/abuse_report.rb b/app/models/abuse_report.rb
index c8c39db11bc..07c87a7fe87 100644
--- a/app/models/abuse_report.rb
+++ b/app/models/abuse_report.rb
@@ -1,3 +1,15 @@
+# == Schema Information
+#
+# Table name: abuse_reports
+#
+#  id          :integer          not null, primary key
+#  reporter_id :integer
+#  user_id     :integer
+#  message     :text
+#  created_at  :datetime
+#  updated_at  :datetime
+#
+
 class AbuseReport < ActiveRecord::Base
   belongs_to :reporter, class_name: "User"
   belongs_to :user
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index 8f27e35d723..c8841178e93 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -83,7 +83,7 @@ class ApplicationSetting < ActiveRecord::Base
       default_project_visibility: Settings.gitlab.default_projects_features['visibility_level'],
       default_snippet_visibility: Settings.gitlab.default_projects_features['visibility_level'],
       restricted_signup_domains: Settings.gitlab['restricted_signup_domains'],
-      import_sources: ['github','bitbucket','gitlab','gitorious','google_code','git']
+      import_sources: ['github','bitbucket','gitlab','gitorious','google_code','fogbugz','git']
     )
   end
 
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 2456b7d0dc1..fc7e9abe29e 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -2,19 +2,20 @@
 #
 # Table name: issues
 #
-#  id           :integer          not null, primary key
-#  title        :string(255)
-#  assignee_id  :integer
-#  author_id    :integer
-#  project_id   :integer
-#  created_at   :datetime
-#  updated_at   :datetime
-#  position     :integer          default(0)
-#  branch_name  :string(255)
-#  description  :text
-#  milestone_id :integer
-#  state        :string(255)
-#  iid          :integer
+#  id            :integer          not null, primary key
+#  title         :string(255)
+#  assignee_id   :integer
+#  author_id     :integer
+#  project_id    :integer
+#  created_at    :datetime
+#  updated_at    :datetime
+#  position      :integer          default(0)
+#  branch_name   :string(255)
+#  description   :text
+#  milestone_id  :integer
+#  state         :string(255)
+#  iid           :integer
+#  updated_by_id :integer
 #
 
 require 'carrierwave/orm/activerecord'
diff --git a/app/models/label.rb b/app/models/label.rb
index 230631b5180..4a22bd53400 100644
--- a/app/models/label.rb
+++ b/app/models/label.rb
@@ -24,7 +24,7 @@ class Label < ActiveRecord::Base
   validates :color,
             format: { with: /\A#[0-9A-Fa-f]{6}\Z/ },
             allow_blank: false
-  validates :project, presence: true
+  validates :project, presence: true, unless: Proc.new { |service| service.template? }
 
   # Don't allow '?', '&', and ',' for label titles
   validates :title,
@@ -34,6 +34,8 @@ class Label < ActiveRecord::Base
 
   default_scope { order(title: :asc) }
 
+  scope :templates, ->  { where(template: true) }
+
   alias_attribute :name, :title
 
   def self.reference_prefix
@@ -78,4 +80,8 @@ class Label < ActiveRecord::Base
   def open_issues_count
     issues.opened.count
   end
+
+  def template?
+    template
+  end
 end
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 467b90861f9..93faa133875 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -19,6 +19,7 @@
 #  description       :text
 #  position          :integer          default(0)
 #  locked_at         :datetime
+#  updated_by_id     :integer
 #
 
 require Rails.root.join("app/models/commit")
diff --git a/app/models/note.rb b/app/models/note.rb
index 36cad8f583d..89d81ab1de2 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -15,6 +15,7 @@
 #  noteable_id   :integer
 #  system        :boolean          default(FALSE), not null
 #  st_diff       :text
+#  updated_by_id :integer
 #
 
 require 'carrierwave/orm/activerecord'
diff --git a/app/models/project.rb b/app/models/project.rb
index f14cd884c89..495a863d93b 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -43,6 +43,8 @@ class Project < ActiveRecord::Base
   extend Gitlab::ConfigHelper
   extend Enumerize
 
+  UNKNOWN_IMPORT_URL = 'http://unknown.git'
+
   default_value_for :archived, false
   default_value_for :visibility_level, gitlab_config_features.visibility_level
   default_value_for :issues_enabled, gitlab_config_features.issues
@@ -73,6 +75,7 @@ class Project < ActiveRecord::Base
   has_many :services
   has_one :gitlab_ci_service, dependent: :destroy
   has_one :campfire_service, dependent: :destroy
+  has_one :drone_ci_service, dependent: :destroy
   has_one :emails_on_push_service, dependent: :destroy
   has_one :irker_service, dependent: :destroy
   has_one :pivotaltracker_service, dependent: :destroy
@@ -400,6 +403,15 @@ class Project < ActiveRecord::Base
     end
   end
 
+  def create_labels
+    Label.templates.each do |label|
+      label = label.dup
+      label.template = nil
+      label.project_id = self.id
+      label.save
+    end
+  end
+
   def find_service(list, name)
     list.find { |service| service.to_param == name }
   end
@@ -613,6 +625,7 @@ class Project < ActiveRecord::Base
       name: name,
       ssh_url: ssh_url_to_repo,
       http_url: http_url_to_repo,
+      web_url: web_url,
       namespace: namespace.name,
       visibility_level: visibility_level
     }
diff --git a/app/models/project_services/ci_service.rb b/app/models/project_services/ci_service.rb
index 803402c83ee..88186113c68 100644
--- a/app/models/project_services/ci_service.rb
+++ b/app/models/project_services/ci_service.rb
@@ -25,12 +25,24 @@ class CiService < Service
   def category
     :ci
   end
-
+  
+  def valid_token?(token)
+    self.respond_to?(:token) && self.token.present? && self.token == token
+  end
+  
   def supported_events
     %w(push)
   end
 
-  # Return complete url to build page
+  def merge_request_page(iid, sha, ref)
+    commit_page(sha, ref)
+  end
+
+  def commit_page(sha, ref)
+    build_page(sha, ref)
+  end
+
+  # Return complete url to merge_request page
   #
   # Ex.
   #   http://jenkins.example.com:8888/job/test1/scm/bySHA1/12d65c
@@ -45,10 +57,27 @@ class CiService < Service
   #
   #
   # Ex.
-  #   @service.commit_status('13be4ac')
+  #   @service.merge_request_status(9, '13be4ac', 'dev')
+  #   # => 'success'
+  #
+  #   @service.merge_request_status(10, '2abe4ac', 'dev)
+  #   # => 'running'
+  #
+  #
+  def merge_request_status(iid, sha, ref)
+    commit_status(sha, ref)
+  end
+
+  # Return string with build status or :error symbol
+  #
+  # Allowed states: 'success', 'failed', 'running', 'pending', 'skipped'
+  #
+  #
+  # Ex.
+  #   @service.commit_status('13be4ac', 'master')
   #   # => 'success'
   #
-  #   @service.commit_status('2abe4ac')
+  #   @service.commit_status('2abe4ac', 'dev')
   #   # => 'running'
   #
   #
diff --git a/app/models/project_services/drone_ci_service.rb b/app/models/project_services/drone_ci_service.rb
new file mode 100644
index 00000000000..3e2b7faecdb
--- /dev/null
+++ b/app/models/project_services/drone_ci_service.rb
@@ -0,0 +1,190 @@
+# == Schema Information
+#
+# Table name: services
+#
+#  id                    :integer          not null, primary key
+#  type                  :string(255)
+#  title                 :string(255)
+#  project_id            :integer
+#  created_at            :datetime
+#  updated_at            :datetime
+#  active                :boolean          default(FALSE), not null
+#  properties            :text
+#  template              :boolean          default(FALSE)
+#  push_events           :boolean          default(TRUE)
+#  issues_events         :boolean          default(TRUE)
+#  merge_requests_events :boolean          default(TRUE)
+#  tag_push_events       :boolean          default(TRUE)
+#  note_events           :boolean          default(TRUE), not null
+#
+
+class DroneCiService < CiService
+  
+  prop_accessor :drone_url, :token, :enable_ssl_verification
+  validates :drone_url,
+    presence: true,
+    format: { with: /\A#{URI.regexp(%w(http https))}\z/, message: "should be a valid url" }, if: :activated?
+  validates :token,
+    presence: true,
+    format: { with: /\A([A-Za-z0-9]+)\z/ },  if: :activated?
+
+  after_save :compose_service_hook, if: :activated?
+
+  def compose_service_hook
+    hook = service_hook || build_service_hook
+    hook.url = [drone_url, "/api/hook", "?owner=#{project.namespace.path}", "&name=#{project.path}", "&access_token=#{token}"].join
+    hook.enable_ssl_verification = enable_ssl_verification
+    hook.save
+  end
+
+  def execute(data)
+    case data[:object_kind]
+    when 'push'
+      service_hook.execute(data) if push_valid?(data)
+    when 'merge_request'
+      service_hook.execute(data) if merge_request_valid?(data)
+    when 'tag_push'
+      service_hook.execute(data) if tag_push_valid?(data)
+    end
+  end
+
+  def allow_target_ci?
+    true
+  end
+
+  def supported_events
+    %w(push merge_request tag_push)
+  end
+
+  def merge_request_status_path(iid, sha = nil, ref = nil)
+    url = [drone_url, 
+           "gitlab/#{project.namespace.path}/#{project.path}/pulls/#{iid}", 
+           "?access_token=#{token}"]
+
+    URI.join(*url).to_s
+  end
+
+  def commit_status_path(sha, ref)
+    url = [drone_url, 
+           "gitlab/#{project.namespace.path}/#{project.path}/commits/#{sha}", 
+           "?branch=#{URI::encode(ref.to_s)}&access_token=#{token}"]
+
+    URI.join(*url).to_s
+  end
+
+  def merge_request_status(iid, sha, ref)
+    response = HTTParty.get(merge_request_status_path(iid), verify: enable_ssl_verification)
+
+    if response.code == 200 and response['status']
+      case response['status']
+      when 'killed'
+        :canceled
+      when 'failure', 'error'
+        # Because drone return error if some test env failed
+        :failed
+      else
+        response["status"]
+      end
+    else
+      :error
+    end
+  rescue Errno::ECONNREFUSED
+    :error
+  end
+
+  def commit_status(sha, ref)
+    response = HTTParty.get(commit_status_path(sha, ref), verify: enable_ssl_verification)
+
+    if response.code == 200 and response['status']
+      case response['status']
+      when 'killed'
+        :canceled
+      when 'failure', 'error'
+        # Because drone return error if some test env failed
+        :failed
+      else
+        response["status"]
+      end
+    else
+      :error
+    end
+  rescue Errno::ECONNREFUSED
+    :error
+  end
+
+  def merge_request_page(iid, sha, ref)
+    url = [drone_url, 
+           "gitlab/#{project.namespace.path}/#{project.path}/redirect/pulls/#{iid}"]
+
+    URI.join(*url).to_s
+  end
+
+  def commit_page(sha, ref)
+    url = [drone_url, 
+           "gitlab/#{project.namespace.path}/#{project.path}/redirect/commits/#{sha}", 
+           "?branch=#{URI::encode(ref.to_s)}"]
+
+    URI.join(*url).to_s
+  end
+
+  def commit_coverage(sha, ref)
+    nil
+  end
+
+  def build_page(sha, ref)
+    commit_page(sha, ref)
+  end
+
+  def builds_path
+    url = [drone_url, "#{project.namespace.path}/#{project.path}"]
+
+    URI.join(*url).to_s
+  end
+
+  def status_img_path
+    url = [drone_url, 
+           "api/badges/#{project.namespace.path}/#{project.path}/status.svg", 
+           "?branch=#{URI::encode(project.default_branch)}"]
+
+    URI.join(*url).to_s
+  end
+
+  def title
+    'Drone CI'
+  end
+
+  def description
+    'Drone is a Continuous Integration platform built on Docker, written in Go'
+  end
+
+  def to_param
+    'drone_ci'
+  end
+
+  def fields
+    [
+      { type: 'text', name: 'token', placeholder: 'Drone CI project specific token' },
+      { type: 'text', name: 'drone_url', placeholder: 'http://drone.example.com' },
+      { type: 'checkbox', name: 'enable_ssl_verification', title: "Enable SSL verification" }
+    ]
+  end
+
+  private
+
+  def tag_push_valid?(data)
+    data[:total_commits_count] > 0 && !Gitlab::Git.blank_ref?(data[:after])
+  end
+
+  def push_valid?(data)
+    opened_merge_requests = project.merge_requests.opened.where(source_project_id: project.id, 
+                                                                source_branch: Gitlab::Git.ref_name(data[:ref]))
+
+    opened_merge_requests.empty? && data[:total_commits_count] > 0 && 
+      !Gitlab::Git.blank_ref?(data[:after])
+  end
+
+  def merge_request_valid?(data)
+    ['opened', 'reopened'].include?(data[:object_attributes][:state]) &&
+      data[:object_attributes][:merge_status] == 'unchecked'
+  end
+end
diff --git a/app/models/sent_notification.rb b/app/models/sent_notification.rb
index 460ca40be3f..33b113a2a27 100644
--- a/app/models/sent_notification.rb
+++ b/app/models/sent_notification.rb
@@ -1,3 +1,16 @@
+# == Schema Information
+#
+# Table name: sent_notifications
+#
+#  id            :integer          not null, primary key
+#  project_id    :integer
+#  noteable_id   :integer
+#  noteable_type :string(255)
+#  recipient_id  :integer
+#  commit_id     :string(255)
+#  reply_key     :string(255)      not null
+#
+
 class SentNotification < ActiveRecord::Base
   belongs_to :project
   belongs_to :noteable, polymorphic: true
diff --git a/app/models/service.rb b/app/models/service.rb
index dcef2866c3b..60fcc9d2857 100644
--- a/app/models/service.rb
+++ b/app/models/service.rb
@@ -135,6 +135,7 @@ class Service < ActiveRecord::Base
       buildkite
       campfire
       custom_issue_tracker
+      drone_ci
       emails_on_push
       external_wiki
       flowdock
diff --git a/app/models/user.rb b/app/models/user.rb
index f70761074c5..bff8eeed96d 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -2,62 +2,58 @@
 #
 # Table name: users
 #
-#  id                            :integer          not null, primary key
-#  email                         :string(255)      default(""), not null
-#  encrypted_password            :string(255)      default(""), not null
-#  reset_password_token          :string(255)
-#  reset_password_sent_at        :datetime
-#  remember_created_at           :datetime
-#  sign_in_count                 :integer          default(0)
-#  current_sign_in_at            :datetime
-#  last_sign_in_at               :datetime
-#  current_sign_in_ip            :string(255)
-#  last_sign_in_ip               :string(255)
-#  created_at                    :datetime
-#  updated_at                    :datetime
-#  name                          :string(255)
-#  admin                         :boolean          default(FALSE), not null
-#  projects_limit                :integer          default(10)
-#  skype                         :string(255)      default(""), not null
-#  linkedin                      :string(255)      default(""), not null
-#  twitter                       :string(255)      default(""), not null
-#  authentication_token          :string(255)
-#  theme_id                      :integer          default(1), not null
-#  bio                           :string(255)
-#  failed_attempts               :integer          default(0)
-#  locked_at                     :datetime
-#  username                      :string(255)
-#  can_create_group              :boolean          default(TRUE), not null
-#  can_create_team               :boolean          default(TRUE), not null
-#  state                         :string(255)
-#  color_scheme_id               :integer          default(1), not null
-#  notification_level            :integer          default(1), not null
-#  password_expires_at           :datetime
-#  created_by_id                 :integer
-#  last_credential_check_at      :datetime
-#  avatar                        :string(255)
-#  confirmation_token            :string(255)
-#  confirmed_at                  :datetime
-#  confirmation_sent_at          :datetime
-#  unconfirmed_email             :string(255)
-#  hide_no_ssh_key               :boolean          default(FALSE)
-#  website_url                   :string(255)      default(""), not null
-#  github_access_token           :string(255)
-#  gitlab_access_token           :string(255)
-#  notification_email            :string(255)
-#  hide_no_password              :boolean          default(FALSE)
-#  password_automatically_set    :boolean          default(FALSE)
-#  bitbucket_access_token        :string(255)
-#  bitbucket_access_token_secret :string(255)
-#  location                      :string(255)
-#  encrypted_otp_secret          :string(255)
-#  encrypted_otp_secret_iv       :string(255)
-#  encrypted_otp_secret_salt     :string(255)
-#  otp_required_for_login        :boolean          default(FALSE), not null
-#  otp_backup_codes              :text
-#  public_email                  :string(255)      default(""), not null
-#  dashboard                     :integer          default(0)
-#  project_view                  :integer          default(0)
+#  id                         :integer          not null, primary key
+#  email                      :string(255)      default(""), not null
+#  encrypted_password         :string(255)      default(""), not null
+#  reset_password_token       :string(255)
+#  reset_password_sent_at     :datetime
+#  remember_created_at        :datetime
+#  sign_in_count              :integer          default(0)
+#  current_sign_in_at         :datetime
+#  last_sign_in_at            :datetime
+#  current_sign_in_ip         :string(255)
+#  last_sign_in_ip            :string(255)
+#  created_at                 :datetime
+#  updated_at                 :datetime
+#  name                       :string(255)
+#  admin                      :boolean          default(FALSE), not null
+#  projects_limit             :integer          default(10)
+#  skype                      :string(255)      default(""), not null
+#  linkedin                   :string(255)      default(""), not null
+#  twitter                    :string(255)      default(""), not null
+#  authentication_token       :string(255)
+#  theme_id                   :integer          default(1), not null
+#  bio                        :string(255)
+#  failed_attempts            :integer          default(0)
+#  locked_at                  :datetime
+#  username                   :string(255)
+#  can_create_group           :boolean          default(TRUE), not null
+#  can_create_team            :boolean          default(TRUE), not null
+#  state                      :string(255)
+#  color_scheme_id            :integer          default(1), not null
+#  notification_level         :integer          default(1), not null
+#  password_expires_at        :datetime
+#  created_by_id              :integer
+#  last_credential_check_at   :datetime
+#  avatar                     :string(255)
+#  confirmation_token         :string(255)
+#  confirmed_at               :datetime
+#  confirmation_sent_at       :datetime
+#  unconfirmed_email          :string(255)
+#  hide_no_ssh_key            :boolean          default(FALSE)
+#  website_url                :string(255)      default(""), not null
+#  notification_email         :string(255)
+#  hide_no_password           :boolean          default(FALSE)
+#  password_automatically_set :boolean          default(FALSE)
+#  location                   :string(255)
+#  encrypted_otp_secret       :string(255)
+#  encrypted_otp_secret_iv    :string(255)
+#  encrypted_otp_secret_salt  :string(255)
+#  otp_required_for_login     :boolean          default(FALSE), not null
+#  otp_backup_codes           :text
+#  public_email               :string(255)      default(""), not null
+#  dashboard                  :integer          default(0)
+#  project_view               :integer          default(0)
 #
 
 require 'carrierwave/orm/activerecord'
@@ -104,7 +100,7 @@ class User < ActiveRecord::Base
   # Profile
   has_many :keys, dependent: :destroy
   has_many :emails, dependent: :destroy
-  has_many :identities, dependent: :destroy
+  has_many :identities, dependent: :destroy, autosave: true
 
   # Groups
   has_many :members, dependent: :destroy
@@ -637,10 +633,6 @@ class User < ActiveRecord::Base
     email.start_with?('temp-email-for-oauth')
   end
 
-  def public_profile?
-    authorized_projects.public_only.any?
-  end
-
   def avatar_url(size = nil)
     if avatar.present?
       [gitlab_config.url, avatar.url].join