From c843722de2d778b6ec8fef0656797fd5a8074666 Mon Sep 17 00:00:00 2001
From: Jeff Stubler <brunsa2@gmail.com>
Date: Mon, 20 Jul 2015 20:34:19 -0500
Subject: Add graphs showing commits ahead and behind default to branches page

---
 app/models/project.rb    |  2 ++
 app/models/repository.rb | 42 ++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 42 insertions(+), 2 deletions(-)

(limited to 'app/models')

diff --git a/app/models/project.rb b/app/models/project.rb
index 74b89aad499..e73a856c289 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -714,6 +714,8 @@ class Project < ActiveRecord::Base
   end
 
   def change_head(branch)
+    # Cached divergent commit counts are based on repository head
+    repository.expire_branch_cache
     gitlab_shell.update_repository_head(self.path_with_namespace, branch)
     reload_default_branch
   end
diff --git a/app/models/repository.rb b/app/models/repository.rb
index c9b36bd8170..9b270bc9d18 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -146,10 +146,27 @@ class Repository
   def size
     cache.fetch(:size) { raw_repository.size }
   end
+  
+  def diverging_commit_counts(branch)
+    branch_cache_key = ('diverging_commit_counts_' + branch.name).to_sym
+    cache.fetch(branch_cache_key) do
+      number_commits_behind = commits_between(branch.name, root_ref).size
+      number_commits_ahead = commits_between(root_ref, branch.name).size
+      
+      { behind: number_commits_behind, ahead: number_commits_ahead }
+    end
+  end
 
   def cache_keys
-    %i(size branch_names tag_names commit_count
-       readme version contribution_guide changelog license)
+    %i(size branch_names tag_names commit_count readme
+       contribution_guide changelog license)
+  end
+  
+  def branch_cache_keys
+    branches.map do
+      |branch|
+      ('diverging_commit_counts_' + branch.name).to_sym
+    end
   end
 
   def build_cache
@@ -158,12 +175,28 @@ class Repository
         send(key)
       end
     end
+    
+    branches.each do |branch|
+      unless cache.exist?(('diverging_commit_counts_' + branch.name).to_sym)
+        send(:diverging_commit_counts, branch)
+      end
+    end
   end
 
   def expire_cache
     cache_keys.each do |key|
       cache.expire(key)
     end
+    
+    branches.each do |branch|
+      cache.expire(('diverging_commit_counts_' + branch.name).to_sym)
+    end
+  end
+  
+  def expire_branch_cache
+    branches.each do |branch|
+      cache.expire(('diverging_commit_counts_' + branch.name).to_sym)
+    end
   end
 
   def rebuild_cache
@@ -171,6 +204,11 @@ class Repository
       cache.expire(key)
       send(key)
     end
+    
+    branches.each do |branch|
+      cache.expire(('diverging_commit_counts_' + branch.name).to_sym)
+      send(:diverging_commit_counts, branch)
+    end
   end
 
   def lookup_cache
-- 
cgit v1.2.1


From e0c64fac68b4b3acc48300956146b85e03b426ce Mon Sep 17 00:00:00 2001
From: Jeff Stubler <brunsa2@gmail.com>
Date: Wed, 11 Nov 2015 16:29:29 -0600
Subject: Refactor for style issues

---
 app/models/repository.rb | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

(limited to 'app/models')

diff --git a/app/models/repository.rb b/app/models/repository.rb
index 9b270bc9d18..0e2d4ea1fb8 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -148,8 +148,7 @@ class Repository
   end
   
   def diverging_commit_counts(branch)
-    branch_cache_key = ('diverging_commit_counts_' + branch.name).to_sym
-    cache.fetch(branch_cache_key) do
+    cache.fetch(:"diverging_commit_counts_#{branch.name}") do
       number_commits_behind = commits_between(branch.name, root_ref).size
       number_commits_ahead = commits_between(root_ref, branch.name).size
       
@@ -158,14 +157,13 @@ class Repository
   end
 
   def cache_keys
-    %i(size branch_names tag_names commit_count readme
-       contribution_guide changelog license)
+    %i(size branch_names tag_names commit_count
+       readme version contribution_guide changelog license)
   end
   
   def branch_cache_keys
-    branches.map do
-      |branch|
-      ('diverging_commit_counts_' + branch.name).to_sym
+    branches.map do |branch|
+      :"diverging_commit_counts_#{branch.name}"
     end
   end
 
@@ -177,7 +175,7 @@ class Repository
     end
     
     branches.each do |branch|
-      unless cache.exist?(('diverging_commit_counts_' + branch.name).to_sym)
+      unless cache.exist?(:"diverging_commit_counts_#{branch.name}")
         send(:diverging_commit_counts, branch)
       end
     end
@@ -188,14 +186,12 @@ class Repository
       cache.expire(key)
     end
     
-    branches.each do |branch|
-      cache.expire(('diverging_commit_counts_' + branch.name).to_sym)
-    end
+    expire_branch_cache
   end
   
   def expire_branch_cache
     branches.each do |branch|
-      cache.expire(('diverging_commit_counts_' + branch.name).to_sym)
+      cache.expire(:"diverging_commit_counts_#{branch.name}")
     end
   end
 
@@ -206,8 +202,8 @@ class Repository
     end
     
     branches.each do |branch|
-      cache.expire(('diverging_commit_counts_' + branch.name).to_sym)
-      send(:diverging_commit_counts, branch)
+      cache.expire(:"diverging_commit_counts_#{branch.name}")
+      diverging_commit_counts(branch)
     end
   end
 
-- 
cgit v1.2.1


From 2e8ec7e7204b2876218db34439584204b1062265 Mon Sep 17 00:00:00 2001
From: Jeff Stubler <brunsa2@gmail.com>
Date: Tue, 15 Dec 2015 16:23:52 -0600
Subject: Fix diverging commit count calculation

Rugged seemed to stop accepting branch names as valid refs, throwing `Rugged::ReferenceError` exceptions. Now the branch target rather than branch name is used, and the default branch's hash is also calculated, and these work properly.

This used to work and might be something worth re-investigating in the future.
---
 app/models/repository.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'app/models')

diff --git a/app/models/repository.rb b/app/models/repository.rb
index 4186ef295c9..77e5bd975ec 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -157,9 +157,12 @@ class Repository
   end
   
   def diverging_commit_counts(branch)
+    root_ref_hash = raw_repository.rev_parse_target(root_ref).oid
     cache.fetch(:"diverging_commit_counts_#{branch.name}") do
-      number_commits_behind = commits_between(branch.name, root_ref).size
-      number_commits_ahead = commits_between(root_ref, branch.name).size
+      # Rugged seems to throw a `ReferenceError` when given branch_names rather
+      # than SHA-1 hashes
+      number_commits_behind = commits_between(branch.target, root_ref_hash).size
+      number_commits_ahead = commits_between(root_ref_hash, branch.target).size
       
       { behind: number_commits_behind, ahead: number_commits_ahead }
     end
-- 
cgit v1.2.1


From b45ee2c314e2c26f4574f2e973dfa40204860c66 Mon Sep 17 00:00:00 2001
From: Mike Wyatt <wyatt.mike@gmail.com>
Date: Wed, 16 Dec 2015 10:08:05 -0400
Subject: better support for referencing and closing issues in asana_service.rb

---
 app/models/project_services/asana_service.rb | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

(limited to 'app/models')

diff --git a/app/models/project_services/asana_service.rb b/app/models/project_services/asana_service.rb
index e6e16058d41..bbc508e8f8e 100644
--- a/app/models/project_services/asana_service.rb
+++ b/app/models/project_services/asana_service.rb
@@ -98,17 +98,29 @@ automatically inspected. Leave blank to include all branches.'
     task_list = []
     close_list = []
 
-    message.split("\n").each do |line|
-      # look for a task ID or a full Asana url
-      task_list.concat(line.scan(/#(\d+)/))
-      task_list.concat(line.scan(/https:\/\/app\.asana\.com\/\d+\/\d+\/(\d+)/))
-      # look for a word starting with 'fix' followed by a task ID
-      close_list.concat(line.scan(/(fix\w*)\W*#(\d+)/i))
+    # matches either:
+    # - #1234
+    # - https://app.asana.com/0/0/1234
+    # optionally preceded with:
+    # - fix/ed/es/ing
+    # - close/s/d
+    # - closing
+    issue_finder = /(fix\w*|clos[ei]\w*+)?\W*(?:https:\/\/app\.asana\.com\/\d+\/\d+\/(\d+)|#(\d+))/i
+
+    message.scan(issue_finder).each do |tuple|
+      # tuple will be
+      # [ 'fix', 'id_from_url', 'id_from_pound' ]
+      taskid = tuple[2] || tuple[1]
+      task_list.push(taskid)
+
+      if tuple[0]
+        close_list.push(taskid)
+      end
     end
 
     # post commit to every taskid found
     task_list.each do |taskid|
-      task = Asana::Task.find(taskid[0])
+      task = Asana::Task.find(taskid)
 
       if task
         task.create_story(text: push_msg + ' ' + message)
@@ -117,7 +129,7 @@ automatically inspected. Leave blank to include all branches.'
 
     # close all tasks that had 'fix(ed/es/ing) #:id' in them
     close_list.each do |taskid|
-      task = Asana::Task.find(taskid.last)
+      task = Asana::Task.find(taskid)
 
       if task
         task.modify(completed: true)
-- 
cgit v1.2.1


From 989131c530f06fc52e9212df1e3e8d48eae4902f Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Thu, 24 Dec 2015 14:43:07 +0100
Subject: Render milestone links as references

---
 app/models/milestone.rb | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'app/models')

diff --git a/app/models/milestone.rb b/app/models/milestone.rb
index d8c7536cd31..e47b6440746 100644
--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
@@ -22,6 +22,7 @@ class Milestone < ActiveRecord::Base
 
   include InternalId
   include Sortable
+  include Referable
   include StripAttribute
 
   belongs_to :project
@@ -61,6 +62,23 @@ class Milestone < ActiveRecord::Base
     end
   end
 
+  def self.reference_pattern
+    nil
+  end
+
+  def self.link_reference_pattern
+    super("milestones", /(?<milestone>\d+)/)
+  end
+
+  def to_reference(from_project = nil)
+    h = Gitlab::Application.routes.url_helpers
+    h.namespace_project_milestone_url(self.project.namespace, self.project, self)
+  end
+
+  def reference_link_text(from_project = nil)
+    %Q{<i class="fa fa-clock-o"></i> }.html_safe + self.title
+  end
+
   def expired?
     if due_date
       due_date.past?
-- 
cgit v1.2.1


From 83d42c1518274dc0af0f49fda3a10e846569cbcc Mon Sep 17 00:00:00 2001
From: Valery Sizov <vsv2711@gmail.com>
Date: Fri, 25 Dec 2015 18:13:55 +0200
Subject: Revert upvotes and downvotes params to MR API

---
 app/models/concerns/issuable.rb | 6 ++----
 app/models/note.rb              | 2 --
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'app/models')

diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index 919833f6df5..18a00f95b48 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -95,14 +95,12 @@ module Issuable
     opened? || reopened?
   end
 
-  # Deprecated. Still exists to preserve API compatibility.
   def downvotes
-    0
+    notes.awards.where(note: "thumbsdown").count
   end
 
-  # Deprecated. Still exists to preserve API compatibility.
   def upvotes
-    0
+    notes.awards.where(note: "thumbsup").count
   end
 
   def subscribed?(user)
diff --git a/app/models/note.rb b/app/models/note.rb
index 1222d99cf1f..1ca86b2592f 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -346,12 +346,10 @@ class Note < ActiveRecord::Base
     read_attribute(:system)
   end
 
-  # Deprecated. Still exists to preserve API compatibility.
   def downvote?
     false
   end
 
-  # Deprecated. Still exists to preserve API compatibility.
   def upvote?
     false
   end
-- 
cgit v1.2.1


From 42592201d9ce57817d439c5899b63776872a4175 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 28 Dec 2015 15:28:39 +0100
Subject: Hotfix for builds trace data integrity

Issue #4246
---
 app/models/ci/build.rb | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

(limited to 'app/models')

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 7b89fe069ea..e251b1dcd97 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -194,8 +194,11 @@ module Ci
     end
 
     def raw_trace
-      if File.exist?(path_to_trace)
+      if File.file?(path_to_trace)
         File.read(path_to_trace)
+      elsif File.file?(old_path_to_trace)
+        # Temporary fix for build trace data integrity
+        File.read(old_path_to_trace)
       else
         # backward compatibility
         read_attribute :trace
@@ -231,6 +234,24 @@ module Ci
       "#{dir_to_trace}/#{id}.log"
     end
 
+    ##
+    # Deprecated
+    #
+    def old_dir_to_trace
+      File.join(
+        Settings.gitlab_ci.builds_path,
+        created_at.utc.strftime("%Y_%m"),
+        project.ci_id.to_s
+      )
+    end
+
+    ##
+    # Deprecated
+    #
+    def old_path_to_trace
+      "#{old_dir_to_trace}/#{id}.log"
+    end
+
     def token
       project.runners_token
     end
-- 
cgit v1.2.1


From a3469d914aaf28a1184247cbe72e5197ce7ca006 Mon Sep 17 00:00:00 2001
From: Gabriel Mazetto <gabriel@gitlab.com>
Date: Mon, 28 Dec 2015 18:21:34 -0200
Subject: reCAPTCHA is configurable through Admin Settings, no reload needed.

---
 app/models/application_setting.rb | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

(limited to 'app/models')

diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index 7c107da116c..be69d317d73 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -44,24 +44,32 @@ class ApplicationSetting < ActiveRecord::Base
   attr_accessor :restricted_signup_domains_raw
 
   validates :session_expire_delay,
-    presence: true,
-    numericality: { only_integer: true, greater_than_or_equal_to: 0 }
+            presence: true,
+            numericality: { only_integer: true, greater_than_or_equal_to: 0 }
 
   validates :home_page_url,
-    allow_blank: true,
-    url: true,
-    if: :home_page_url_column_exist
+            allow_blank: true,
+            url: true,
+            if: :home_page_url_column_exist
 
   validates :after_sign_out_path,
-    allow_blank: true,
-    url: true
+            allow_blank: true,
+            url: true
 
   validates :admin_notification_email,
-    allow_blank: true,
-    email: true
+            allow_blank: true,
+            email: true
 
   validates :two_factor_grace_period,
-    numericality: { greater_than_or_equal_to: 0 }
+            numericality: { greater_than_or_equal_to: 0 }
+
+  validates :recaptcha_site_key,
+            presence: true,
+            if: :recaptcha_enabled
+
+  validates :recaptcha_private_key,
+            presence: true,
+            if: :recaptcha_enabled
 
   validates_each :restricted_visibility_levels do |record, attr, value|
     unless value.nil?
-- 
cgit v1.2.1


From d3807328d8ed9be2915f67708b093269bf0b1b9f Mon Sep 17 00:00:00 2001
From: Valery Sizov <vsv2711@gmail.com>
Date: Tue, 29 Dec 2015 10:11:20 +0200
Subject: note votes methids implementation

---
 app/models/note.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/models')

diff --git a/app/models/note.rb b/app/models/note.rb
index 1ca86b2592f..3d5b663c99f 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -347,11 +347,11 @@ class Note < ActiveRecord::Base
   end
 
   def downvote?
-    false
+    is_award && note == "thumbsdown"
   end
 
   def upvote?
-    false
+    is_award && note == "thumbsup"
   end
 
   def editable?
-- 
cgit v1.2.1


From 504696453bb7d89278bf021393274e475b84ebbd Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Tue, 29 Dec 2015 08:52:06 +0100
Subject: Add hotfix that allows to access build artifacts created before 8.3

This is a temporary hotfix that allows to access build artifacts created
before 8.3. See #5257.

This needs to be changed after migrating CI build files.

Note that `ArtifactUploader` uses `artifacts_path` to create a storage
directory before and after parsisting `Ci::Build` instance, before and
after moving a file to store (save and fetch a file).
---
 app/models/ci/build.rb | 37 ++++++++++++++++++++++++++++++++++---
 1 file changed, 34 insertions(+), 3 deletions(-)

(limited to 'app/models')

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index e251b1dcd97..3e67b2771c1 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -196,7 +196,7 @@ module Ci
     def raw_trace
       if File.file?(path_to_trace)
         File.read(path_to_trace)
-      elsif File.file?(old_path_to_trace)
+      elsif project.ci_id && File.file?(old_path_to_trace)
         # Temporary fix for build trace data integrity
         File.read(old_path_to_trace)
       else
@@ -215,8 +215,8 @@ module Ci
     end
 
     def trace=(trace)
-      unless Dir.exists? dir_to_trace
-        FileUtils.mkdir_p dir_to_trace
+      unless Dir.exists?(dir_to_trace)
+        FileUtils.mkdir_p(dir_to_trace)
       end
 
       File.write(path_to_trace, trace)
@@ -237,6 +237,9 @@ module Ci
     ##
     # Deprecated
     #
+    # This is a hotfix for CI build data integrity, see #4246
+    # Should be removed in 8.4, after CI files migration has been done.
+    #
     def old_dir_to_trace
       File.join(
         Settings.gitlab_ci.builds_path,
@@ -248,10 +251,38 @@ module Ci
     ##
     # Deprecated
     #
+    # This is a hotfix for CI build data integrity, see #4246
+    # Should be removed in 8.4, after CI files migration has been done.
+    #
     def old_path_to_trace
       "#{old_dir_to_trace}/#{id}.log"
     end
 
+    ##
+    # Deprecated
+    #
+    # This contains a hotfix for CI build data integrity, see #4246
+    #
+    # This method is used by `ArtifactUploader` to create a store_dir.
+    # Warning: Uploader uses it after AND before file has been stored.
+    #
+    # This method returns old path to artifacts only if it already exists.
+    #
+    def artifacts_path
+      old = File.join(created_at.utc.strftime('%Y_%m'),
+                      project.ci_id.to_s,
+                      id.to_s)
+
+      old_store = File.join(ArtifactUploader.artifacts_path, old)
+      return old if project.ci_id && File.directory?(old_store)
+
+      File.join(
+        created_at.utc.strftime('%Y_%m'),
+        project.id.to_s,
+        id.to_s
+      )
+    end
+
     def token
       project.runners_token
     end
-- 
cgit v1.2.1


From 2cd2c54bd1c83f8545b5f903d7717c4848453f0c Mon Sep 17 00:00:00 2001
From: Mike Wyatt <wyatt.mike@gmail.com>
Date: Tue, 29 Dec 2015 15:37:48 -0400
Subject: Update Asana field descriptions

---
 app/models/project_services/asana_service.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'app/models')

diff --git a/app/models/project_services/asana_service.rb b/app/models/project_services/asana_service.rb
index bbc508e8f8e..a16adf10432 100644
--- a/app/models/project_services/asana_service.rb
+++ b/app/models/project_services/asana_service.rb
@@ -53,14 +53,12 @@ http://developer.asana.com/documentation/#api_keys'
       {
         type: 'text',
         name: 'api_key',
-        placeholder: 'User API token. User must have access to task,
-all comments will be attributed to this user.'
+        placeholder: 'User Personal Access Token. User must have access to task, all comments will be attributed to this user.'
       },
       {
         type: 'text',
         name: 'restrict_to_branch',
-        placeholder: 'Comma-separated list of branches which will be
-automatically inspected. Leave blank to include all branches.'
+        placeholder: 'Comma-separated list of branches which will be automatically inspected. Leave blank to include all branches.'
       }
     ]
   end
-- 
cgit v1.2.1


From 12ec1e3c407a4b72f670483a558a9cb95449c838 Mon Sep 17 00:00:00 2001
From: Mike Wyatt <wyatt.mike@gmail.com>
Date: Tue, 29 Dec 2015 15:39:58 -0400
Subject: Update Asana service to work with Personal Access Token, lessen
 number of requests to Asana API

---
 app/models/project_services/asana_service.rb | 52 +++++++++++-----------------
 1 file changed, 21 insertions(+), 31 deletions(-)

(limited to 'app/models')

diff --git a/app/models/project_services/asana_service.rb b/app/models/project_services/asana_service.rb
index a16adf10432..111a60431b1 100644
--- a/app/models/project_services/asana_service.rb
+++ b/app/models/project_services/asana_service.rb
@@ -67,35 +67,34 @@ http://developer.asana.com/documentation/#api_keys'
     %w(push)
   end
 
+  def client
+    @_client ||= begin
+      Asana::Client.new do |c|
+        c.authentication :access_token, api_key
+      end
+    end
+  end
+
   def execute(data)
     return unless supported_events.include?(data[:object_kind])
 
-    Asana.configure do |client|
-      client.api_key = api_key
-    end
-
-    user = data[:user_name]
+    # check the branch restriction is poplulated and branch is not included
     branch = Gitlab::Git.ref_name(data[:ref])
-
     branch_restriction = restrict_to_branch.to_s
-
-    # check the branch restriction is poplulated and branch is not included
     if branch_restriction.length > 0 && branch_restriction.index(branch).nil?
       return
     end
 
+    user = data[:user_name]
     project_name = project.name_with_namespace
-    push_msg = user + ' pushed to branch ' + branch + ' of ' + project_name
+    push_msg = "#{user} pushed to branch #{branch} of #{project_name} ( #{commit[:url]} )"
 
     data[:commits].each do |commit|
-      check_commit(' ( ' + commit[:url] + ' ): ' + commit[:message], push_msg)
+      check_commit(commit[:message], push_msg)
     end
   end
 
   def check_commit(message, push_msg)
-    task_list = []
-    close_list = []
-
     # matches either:
     # - #1234
     # - https://app.asana.com/0/0/1234
@@ -109,28 +108,19 @@ http://developer.asana.com/documentation/#api_keys'
       # tuple will be
       # [ 'fix', 'id_from_url', 'id_from_pound' ]
       taskid = tuple[2] || tuple[1]
-      task_list.push(taskid)
-
-      if tuple[0]
-        close_list.push(taskid)
-      end
-    end
-
-    # post commit to every taskid found
-    task_list.each do |taskid|
-      task = Asana::Task.find(taskid)
 
-      if task
-        task.create_story(text: push_msg + ' ' + message)
+      begin
+        task = Asana::Task.find_by_id(client, taskid)
+      rescue Exception => e
+        puts e.message
+        puts e.backtrace.inspect
+        next
       end
-    end
 
-    # close all tasks that had 'fix(ed/es/ing) #:id' in them
-    close_list.each do |taskid|
-      task = Asana::Task.find(taskid)
+      task.add_comment(text: "#{push_msg} #{message}")
 
-      if task
-        task.modify(completed: true)
+      if tuple[0]
+        task.update(completed: true)
       end
     end
   end
-- 
cgit v1.2.1


From e8080fc8fb216fb6da7d3f056e8b4417f807d09e Mon Sep 17 00:00:00 2001
From: Mike Wyatt <wyatt.mike@gmail.com>
Date: Tue, 29 Dec 2015 16:00:36 -0400
Subject: Fix error in Asana service

---
 app/models/project_services/asana_service.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/models')

diff --git a/app/models/project_services/asana_service.rb b/app/models/project_services/asana_service.rb
index 111a60431b1..80c56b9097b 100644
--- a/app/models/project_services/asana_service.rb
+++ b/app/models/project_services/asana_service.rb
@@ -87,9 +87,9 @@ http://developer.asana.com/documentation/#api_keys'
 
     user = data[:user_name]
     project_name = project.name_with_namespace
-    push_msg = "#{user} pushed to branch #{branch} of #{project_name} ( #{commit[:url]} )"
 
     data[:commits].each do |commit|
+      push_msg = "#{user} pushed to branch #{branch} of #{project_name} ( #{commit[:url]} )"
       check_commit(commit[:message], push_msg)
     end
   end
-- 
cgit v1.2.1


From 59533d47dd901a1b4a7e4eda382a0a25ce9a1eef Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Mon, 28 Dec 2015 18:10:46 -0800
Subject: Fix project transfer e-mail sending incorrect paths in e-mail
 notification

The introduction of ActiveJob and `deliver_now` in 7f214cee7 caused a race
condition where the mailer would be invoked before the project was committed
to the database, causing the transfer e-mail notification to show the old
path instead of the new one.

Closes #4670
---
 app/models/project.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'app/models')

diff --git a/app/models/project.rb b/app/models/project.rb
index 75f85310d5f..017471995ec 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -555,7 +555,9 @@ class Project < ActiveRecord::Base
   end
 
   def send_move_instructions(old_path_with_namespace)
-    NotificationService.new.project_was_moved(self, old_path_with_namespace)
+    # New project path needs to be committed to the DB or notification will
+    # retrieve stale information
+    run_after_commit { NotificationService.new.project_was_moved(self, old_path_with_namespace) }
   end
 
   def owner
-- 
cgit v1.2.1


From 6eb273a11cf7521448f4bcb5f9376df24c2f9f3f Mon Sep 17 00:00:00 2001
From: Mike Wyatt <wyatt.mike@gmail.com>
Date: Wed, 30 Dec 2015 00:50:44 -0400
Subject: Restore colon in Asana comment

---
 app/models/project_services/asana_service.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/models')

diff --git a/app/models/project_services/asana_service.rb b/app/models/project_services/asana_service.rb
index 80c56b9097b..183ce2df787 100644
--- a/app/models/project_services/asana_service.rb
+++ b/app/models/project_services/asana_service.rb
@@ -89,7 +89,7 @@ http://developer.asana.com/documentation/#api_keys'
     project_name = project.name_with_namespace
 
     data[:commits].each do |commit|
-      push_msg = "#{user} pushed to branch #{branch} of #{project_name} ( #{commit[:url]} )"
+      push_msg = "#{user} pushed to branch #{branch} of #{project_name} ( #{commit[:url]} ):"
       check_commit(commit[:message], push_msg)
     end
   end
-- 
cgit v1.2.1


From 7b98d0e1a24645df802ad65911c290ad057d1422 Mon Sep 17 00:00:00 2001
From: Mike Wyatt <wyatt.mike@gmail.com>
Date: Wed, 30 Dec 2015 00:51:05 -0400
Subject: Update Asana service documentation

---
 app/models/project_services/asana_service.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/models')

diff --git a/app/models/project_services/asana_service.rb b/app/models/project_services/asana_service.rb
index 183ce2df787..ab5772356f1 100644
--- a/app/models/project_services/asana_service.rb
+++ b/app/models/project_services/asana_service.rb
@@ -40,8 +40,8 @@ get the commit comment added to it.
 
 You can also close a task with a message containing: `fix #123456`.
 
-You can find your Api Keys here:
-http://developer.asana.com/documentation/#api_keys'
+You can create a Personal Access Token here:
+http://app.asana.com/-/account_api'
   end
 
   def to_param
-- 
cgit v1.2.1


From 9e7a88f089323964088945829523b798ea6b78b5 Mon Sep 17 00:00:00 2001
From: Mike Wyatt <wyatt.mike@gmail.com>
Date: Wed, 30 Dec 2015 00:52:56 -0400
Subject: Better handling of errors in Asana service

[ci skip]
---
 app/models/project_services/asana_service.rb | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'app/models')

diff --git a/app/models/project_services/asana_service.rb b/app/models/project_services/asana_service.rb
index ab5772356f1..cb4f6ddb3a5 100644
--- a/app/models/project_services/asana_service.rb
+++ b/app/models/project_services/asana_service.rb
@@ -111,17 +111,16 @@ http://app.asana.com/-/account_api'
 
       begin
         task = Asana::Task.find_by_id(client, taskid)
-      rescue Exception => e
-        puts e.message
-        puts e.backtrace.inspect
+        task.add_comment(text: "#{push_msg} #{message}")
+
+        if tuple[0]
+          task.update(completed: true)
+        end
+      rescue => e
+        Rails.logger.error(e.message)
+        Rails.logger.error(e.backtrace.join("\n"))
         next
       end
-
-      task.add_comment(text: "#{push_msg} #{message}")
-
-      if tuple[0]
-        task.update(completed: true)
-      end
     end
   end
 end
-- 
cgit v1.2.1


From ea4777ff501e370a39ae30e76a955136afe3c1fa Mon Sep 17 00:00:00 2001
From: Tomasz Maczukin <tomasz@maczukin.pl>
Date: Thu, 31 Dec 2015 15:19:13 +0100
Subject: Add features for list and show details of variables in API

---
 app/models/ci/variable.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/models')

diff --git a/app/models/ci/variable.rb b/app/models/ci/variable.rb
index 56759d3e50f..0e2712086ca 100644
--- a/app/models/ci/variable.rb
+++ b/app/models/ci/variable.rb
@@ -9,6 +9,7 @@
 #  encrypted_value      :text
 #  encrypted_value_salt :string(255)
 #  encrypted_value_iv   :string(255)
+#  gl_project_id        :integer
 #
 
 module Ci
-- 
cgit v1.2.1


From fd178c1e7d23b0bf96565ae5177485e847c9271d Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sat, 2 Jan 2016 19:53:45 -0500
Subject: Prevent duplicate "username has already been taken" validation
 message

Closes #201 - two-year-old bug, woo! :boom: :tada:
---
 app/models/user.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'app/models')

diff --git a/app/models/user.rb b/app/models/user.rb
index df87f3b79bd..20f907e4347 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -352,10 +352,13 @@ class User < ActiveRecord::Base
   end
 
   def namespace_uniq
+    # Return early if username already failed the first uniqueness validation
+    return if self.errors[:username].include?('has already been taken')
+
     namespace_name = self.username
     existing_namespace = Namespace.by_path(namespace_name)
     if existing_namespace && existing_namespace != self.namespace
-      self.errors.add :username, "already exists"
+      self.errors.add(:username, 'has already been taken')
     end
   end
 
-- 
cgit v1.2.1


From 79ec7f289748ca5812d51c3a61e3a2f9c2464fda Mon Sep 17 00:00:00 2001
From: Steve Norman <steve.norman@thomsonreuters.com>
Date: Tue, 5 May 2015 15:13:11 +0000
Subject: Added system hooks messages for renaming and transferring a project

---
 app/models/project.rb | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'app/models')

diff --git a/app/models/project.rb b/app/models/project.rb
index 017471995ec..eadc42d1da5 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -81,6 +81,7 @@ class Project < ActiveRecord::Base
   acts_as_taggable_on :tags
 
   attr_accessor :new_default_branch
+  attr_accessor :old_path_with_namespace
 
   # Relations
   belongs_to :creator, foreign_key: 'creator_id', class_name: 'User'
@@ -701,6 +702,11 @@ class Project < ActiveRecord::Base
         gitlab_shell.mv_repository("#{old_path_with_namespace}.wiki", "#{new_path_with_namespace}.wiki")
         send_move_instructions(old_path_with_namespace)
         reset_events_cache
+
+        @old_path_with_namespace = old_path_with_namespace
+
+        SystemHooksService.new.execute_hooks_for(self, :rename)
+
         @repository = nil
       rescue
         # Returning false does not rollback after_* transaction but gives
-- 
cgit v1.2.1


From 8b1844912561a7e6dd0cc361ea1514f2a340e275 Mon Sep 17 00:00:00 2001
From: Valery Sizov <vsv2711@gmail.com>
Date: Mon, 28 Dec 2015 13:32:18 +0200
Subject: remove public field from namespace and refactoring

---
 app/models/ability.rb | 2 +-
 app/models/group.rb   | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

(limited to 'app/models')

diff --git a/app/models/ability.rb b/app/models/ability.rb
index 1b3ee757040..5a1a67db8e1 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -69,7 +69,7 @@ class Ability
                 subject.group
               end
 
-      if group && group.public_profile?
+      if group && group.projects.public_only.any?
         [:read_group]
       else
         []
diff --git a/app/models/group.rb b/app/models/group.rb
index 1b5b875a19e..b8f2ab6ae5d 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -50,10 +50,6 @@ class Group < Namespace
       User.reference_pattern
     end
 
-    def public_and_given_groups(ids)
-      where('public IS TRUE OR namespaces.id IN (?)', ids)
-    end
-
     def visible_to_user(user)
       where(id: user.authorized_groups.select(:id).reorder(nil))
     end
@@ -125,10 +121,6 @@ class Group < Namespace
     end
   end
 
-  def public_profile?
-    self.public || projects.public_only.any?
-  end
-
   def post_create_hook
     Gitlab::AppLogger.info("Group \"#{name}\" was created")
 
-- 
cgit v1.2.1


From bb6b793c55150ecbe072456bc4b151191764b642 Mon Sep 17 00:00:00 2001
From: Mike Wyatt <wyatt.mike@gmail.com>
Date: Mon, 4 Jan 2016 11:19:39 -0400
Subject: Don't log backtrace in Asana service

---
 app/models/project_services/asana_service.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'app/models')

diff --git a/app/models/project_services/asana_service.rb b/app/models/project_services/asana_service.rb
index cb4f6ddb3a5..7d367e40037 100644
--- a/app/models/project_services/asana_service.rb
+++ b/app/models/project_services/asana_service.rb
@@ -118,7 +118,6 @@ http://app.asana.com/-/account_api'
         end
       rescue => e
         Rails.logger.error(e.message)
-        Rails.logger.error(e.backtrace.join("\n"))
         next
       end
     end
-- 
cgit v1.2.1


From 46a220ae3c0e646aac63a3230399fcc8979df6ec Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Mon, 4 Jan 2016 18:59:42 -0500
Subject: Add `AbuseReport#notify`

Tell, Don't Ask.
---
 app/models/abuse_report.rb | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'app/models')

diff --git a/app/models/abuse_report.rb b/app/models/abuse_report.rb
index 89b3116b9f2..55864236b2f 100644
--- a/app/models/abuse_report.rb
+++ b/app/models/abuse_report.rb
@@ -18,4 +18,10 @@ class AbuseReport < ActiveRecord::Base
   validates :user, presence: true
   validates :message, presence: true
   validates :user_id, uniqueness: true
+
+  def notify
+    return unless self.persisted?
+
+    AbuseReportMailer.notify(self.id).deliver_later
+  end
 end
-- 
cgit v1.2.1


From 6ce01ca3ece007f135c6b5a9bc258fdd9e8d71de Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Tue, 5 Jan 2016 11:00:10 -0200
Subject: Validate README format before displaying
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Take the first previewable README file as project’s README, otherwise
if none file is available, or we can’t preview any of them, we assume
that project doesn’t have a README file.
---
 app/models/tree.rb | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'app/models')

diff --git a/app/models/tree.rb b/app/models/tree.rb
index 93b3246a668..e0e04d8859f 100644
--- a/app/models/tree.rb
+++ b/app/models/tree.rb
@@ -17,18 +17,16 @@ class Tree
   def readme
     return @readme if defined?(@readme)
 
-    available_readmes = blobs.select(&:readme?)
+    # Take the first previewable readme, or return nil if none is available or
+    # we can't preview any of them
+    readme_tree = blobs.find do |blob|
+      blob.readme? && (previewable?(blob.name) || plain?(blob.name))
+    end
 
-    if available_readmes.count == 0
+    if readme_tree.nil?
       return @readme = nil
     end
 
-    # Take the first previewable readme, or the first available readme, if we
-    # can't preview any of them
-    readme_tree = available_readmes.find do |readme|
-      previewable?(readme.name)
-    end || available_readmes.first
-
     readme_path = path == '/' ? readme_tree.name : File.join(path, readme_tree.name)
 
     git_repo = repository.raw_repository
-- 
cgit v1.2.1


From 097faeb481db2a4956b41049c041d55f5da4e2c1 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Tue, 5 Jan 2016 16:24:42 +0100
Subject: Get "Merge when build succeeds" to work when commits were pushed to
 MR target branch while builds were running

---
 app/models/merge_request.rb | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'app/models')

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index ac25d38eb63..30d0c2b5961 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -229,6 +229,8 @@ class MergeRequest < ActiveRecord::Base
   end
 
   def check_if_can_be_merged
+    return unless unchecked?
+
     can_be_merged =
       project.repository.can_be_merged?(source_sha, target_branch)
 
@@ -252,7 +254,11 @@ class MergeRequest < ActiveRecord::Base
   end
 
   def mergeable?
-    open? && !work_in_progress? && can_be_merged?
+    return false unless open? && !work_in_progress?
+
+    check_if_can_be_merged
+
+    can_be_merged?
   end
 
   def gitlab_merge_status
@@ -452,6 +458,10 @@ class MergeRequest < ActiveRecord::Base
     !source_branch_exists? || !target_branch_exists?
   end
 
+  def broken?
+    self.commits.blank? || branch_missing? || cannot_be_merged?
+  end
+
   def can_be_merged_by?(user)
     ::Gitlab::GitAccess.new(user, project).can_push_to_branch?(target_branch)
   end
@@ -507,8 +517,4 @@ class MergeRequest < ActiveRecord::Base
   def ci_commit
     @ci_commit ||= source_project.ci_commit(last_commit.id) if last_commit && source_project
   end
-
-  def broken?
-    self.commits.blank? || branch_missing? || cannot_be_merged?
-  end
 end
-- 
cgit v1.2.1


From 0b661516324862506d5ec30c44cac704346a90ad Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Tue, 5 Jan 2016 16:45:53 +0100
Subject: Remove icon from milestone reference.

---
 app/models/milestone.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/models')

diff --git a/app/models/milestone.rb b/app/models/milestone.rb
index e47b6440746..eaa2db2e247 100644
--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
@@ -76,7 +76,7 @@ class Milestone < ActiveRecord::Base
   end
 
   def reference_link_text(from_project = nil)
-    %Q{<i class="fa fa-clock-o"></i> }.html_safe + self.title
+    self.title
   end
 
   def expired?
-- 
cgit v1.2.1


From db2d067eecc5d40e5f5b4e50a9d8ab505b207e54 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Tue, 5 Jan 2016 20:38:35 +0100
Subject: Fix project destroy callback

See gitlab-org/gitlab-ee!107.
---
 app/models/ci/build.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'app/models')

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 3e67b2771c1..d7fccb2197d 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -54,6 +54,8 @@ module Ci
     # To prevent db load megabytes of data from trace
     default_scope -> { select(Ci::Build.columns_without_lazy) }
 
+    before_destroy { project }
+
     class << self
       def columns_without_lazy
         (column_names - LAZY_ATTRIBUTES).map do |column_name|
@@ -145,10 +147,6 @@ module Ci
       end
     end
 
-    def project
-      commit.project
-    end
-
     def project_id
       commit.project.id
     end
-- 
cgit v1.2.1


From 37ce5f312eabf95deff7aac68f6bce6ba6e106b9 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 6 Jan 2016 13:33:11 +0100
Subject: Fix mentionable reference extraction caching.

---
 app/models/concerns/mentionable.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'app/models')

diff --git a/app/models/concerns/mentionable.rb b/app/models/concerns/mentionable.rb
index 6316ee208b5..98f71ae8cb0 100644
--- a/app/models/concerns/mentionable.rb
+++ b/app/models/concerns/mentionable.rb
@@ -51,8 +51,11 @@ module Mentionable
     else
       self.class.mentionable_attrs.each do |attr, options|
         text = send(attr)
-        options[:cache_key] = [self, attr] if options.delete(:cache) && self.persisted?
-        ext.analyze(text, options)
+
+        context = options.dup
+        context[:cache_key] = [self, attr] if context.delete(:cache) && self.persisted?
+
+        ext.analyze(text, context)
       end
     end
 
-- 
cgit v1.2.1


From 79c0e7212af0a6b0243bc0512a75eb936fb8d862 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Wed, 6 Jan 2016 02:30:59 +0000
Subject: Annotate models

---
 app/models/application_setting.rb                  |  15 ++-
 app/models/ci/build.rb                             |   1 +
 app/models/ci/runner_project.rb                    |  11 +-
 app/models/ci/trigger.rb                           |  13 +--
 app/models/ci/variable.rb                          |   3 +-
 app/models/commit_status.rb                        |  55 +++++-----
 app/models/generic_commit_status.rb                |   1 +
 app/models/group.rb                                |   1 -
 app/models/hooks/project_hook.rb                   |   1 +
 app/models/hooks/service_hook.rb                   |   1 +
 app/models/hooks/system_hook.rb                    |   1 +
 app/models/hooks/web_hook.rb                       |   1 +
 app/models/merge_request.rb                        |  44 ++++----
 app/models/namespace.rb                            |   1 -
 app/models/project.rb                              |   7 ++
 app/models/project_services/asana_service.rb       |   2 +
 app/models/project_services/assembla_service.rb    |   1 +
 app/models/project_services/bamboo_service.rb      |   1 +
 app/models/project_services/buildkite_service.rb   |   1 +
 .../project_services/builds_email_service.rb       |   1 +
 app/models/project_services/campfire_service.rb    |   1 +
 app/models/project_services/ci_service.rb          |   1 +
 .../custom_issue_tracker_service.rb                |   1 +
 app/models/project_services/drone_ci_service.rb    |   1 +
 .../project_services/emails_on_push_service.rb     |   1 +
 .../project_services/external_wiki_service.rb      |   1 +
 app/models/project_services/flowdock_service.rb    |   1 +
 app/models/project_services/gemnasium_service.rb   |   1 +
 app/models/project_services/gitlab_ci_service.rb   |   1 +
 .../gitlab_issue_tracker_service.rb                |   1 +
 app/models/project_services/hipchat_service.rb     |   1 +
 app/models/project_services/irker_service.rb       |   1 +
 .../project_services/issue_tracker_service.rb      |   1 +
 app/models/project_services/jira_service.rb        |   1 +
 .../project_services/pivotaltracker_service.rb     |   1 +
 app/models/project_services/pushover_service.rb    |   1 +
 app/models/project_services/redmine_service.rb     |   1 +
 app/models/project_services/slack_service.rb       |   1 +
 app/models/project_services/teamcity_service.rb    |   1 +
 app/models/service.rb                              |   1 +
 app/models/user.rb                                 | 113 +++++++++++----------
 41 files changed, 176 insertions(+), 119 deletions(-)

(limited to 'app/models')

diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index be69d317d73..6c6c2468374 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -27,9 +27,20 @@
 #  admin_notification_email          :string(255)
 #  shared_runners_enabled            :boolean          default(TRUE), not null
 #  max_artifacts_size                :integer          default(100), not null
-#  runners_registration_token        :string(255)
-#  require_two_factor_authentication :boolean          default(TRUE)
+#  runners_registration_token        :string
+#  require_two_factor_authentication :boolean          default(FALSE)
 #  two_factor_grace_period           :integer          default(48)
+#  metrics_enabled                   :boolean          default(FALSE)
+#  metrics_host                      :string           default("localhost")
+#  metrics_username                  :string
+#  metrics_password                  :string
+#  metrics_pool_size                 :integer          default(16)
+#  metrics_timeout                   :integer          default(10)
+#  metrics_method_call_threshold     :integer          default(10)
+#  recaptcha_enabled                 :boolean          default(FALSE)
+#  recaptcha_site_key                :string
+#  recaptcha_private_key             :string
+#  metrics_port                      :integer          default(8089)
 #
 
 class ApplicationSetting < ActiveRecord::Base
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index d7fccb2197d..30f79fd3bfa 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -29,6 +29,7 @@
 #  target_url         :string(255)
 #  description        :string(255)
 #  artifacts_file     :text
+#  gl_project_id      :integer
 #
 
 module Ci
diff --git a/app/models/ci/runner_project.rb b/app/models/ci/runner_project.rb
index 93d9be144e8..7b16f207a26 100644
--- a/app/models/ci/runner_project.rb
+++ b/app/models/ci/runner_project.rb
@@ -2,11 +2,12 @@
 #
 # Table name: ci_runner_projects
 #
-#  id         :integer          not null, primary key
-#  runner_id  :integer          not null
-#  project_id :integer          not null
-#  created_at :datetime
-#  updated_at :datetime
+#  id            :integer          not null, primary key
+#  runner_id     :integer          not null
+#  project_id    :integer
+#  created_at    :datetime
+#  updated_at    :datetime
+#  gl_project_id :integer
 #
 
 module Ci
diff --git a/app/models/ci/trigger.rb b/app/models/ci/trigger.rb
index 23516709a41..bb98cd5c7da 100644
--- a/app/models/ci/trigger.rb
+++ b/app/models/ci/trigger.rb
@@ -2,12 +2,13 @@
 #
 # Table name: ci_triggers
 #
-#  id         :integer          not null, primary key
-#  token      :string(255)
-#  project_id :integer          not null
-#  deleted_at :datetime
-#  created_at :datetime
-#  updated_at :datetime
+#  id            :integer          not null, primary key
+#  token         :string(255)
+#  project_id    :integer
+#  deleted_at    :datetime
+#  created_at    :datetime
+#  updated_at    :datetime
+#  gl_project_id :integer
 #
 
 module Ci
diff --git a/app/models/ci/variable.rb b/app/models/ci/variable.rb
index 56759d3e50f..7f6f497f325 100644
--- a/app/models/ci/variable.rb
+++ b/app/models/ci/variable.rb
@@ -3,12 +3,13 @@
 # Table name: ci_variables
 #
 #  id                   :integer          not null, primary key
-#  project_id           :integer          not null
+#  project_id           :integer
 #  key                  :string(255)
 #  value                :text
 #  encrypted_value      :text
 #  encrypted_value_salt :string(255)
 #  encrypted_value_iv   :string(255)
+#  gl_project_id        :integer
 #
 
 module Ci
diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index 21c5c87bc3d..ff479493474 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -1,30 +1,35 @@
 # == Schema Information
 #
-#  project_id            integer
-#  status                string
-#  finished_at           datetime
-#  trace                 text
-#  created_at            datetime
-#  updated_at            datetime
-#  started_at            datetime
-#  runner_id             integer
-#  coverage              float
-#  commit_id             integer
-#  commands              text
-#  job_id                integer
-#  name                  string
-#  deploy                boolean           default: false
-#  options               text
-#  allow_failure         boolean           default: false, null: false
-#  stage                 string
-#  trigger_request_id    integer
-#  stage_idx             integer
-#  tag                   boolean
-#  ref                   string
-#  user_id               integer
-#  type                  string
-#  target_url            string
-#  description           string
+# Table name: ci_builds
+#
+#  id                 :integer          not null, primary key
+#  project_id         :integer
+#  status             :string(255)
+#  finished_at        :datetime
+#  trace              :text
+#  created_at         :datetime
+#  updated_at         :datetime
+#  started_at         :datetime
+#  runner_id          :integer
+#  coverage           :float
+#  commit_id          :integer
+#  commands           :text
+#  job_id             :integer
+#  name               :string(255)
+#  deploy             :boolean          default(FALSE)
+#  options            :text
+#  allow_failure      :boolean          default(FALSE), not null
+#  stage              :string(255)
+#  trigger_request_id :integer
+#  stage_idx          :integer
+#  tag                :boolean
+#  ref                :string(255)
+#  user_id            :integer
+#  type               :string(255)
+#  target_url         :string(255)
+#  description        :string(255)
+#  artifacts_file     :text
+#  gl_project_id      :integer
 #
 
 class CommitStatus < ActiveRecord::Base
diff --git a/app/models/generic_commit_status.rb b/app/models/generic_commit_status.rb
index 12c934e2494..97f4f03a9a5 100644
--- a/app/models/generic_commit_status.rb
+++ b/app/models/generic_commit_status.rb
@@ -29,6 +29,7 @@
 #  target_url         :string(255)
 #  description        :string(255)
 #  artifacts_file     :text
+#  gl_project_id      :integer
 #
 
 class GenericCommitStatus < CommitStatus
diff --git a/app/models/group.rb b/app/models/group.rb
index b8f2ab6ae5d..5a31b46920c 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -11,7 +11,6 @@
 #  type        :string(255)
 #  description :string(255)      default(""), not null
 #  avatar      :string(255)
-#  public      :boolean          default(FALSE)
 #
 
 require 'carrierwave/orm/activerecord'
diff --git a/app/models/hooks/project_hook.rb b/app/models/hooks/project_hook.rb
index 22638057773..fa18ba5dbbe 100644
--- a/app/models/hooks/project_hook.rb
+++ b/app/models/hooks/project_hook.rb
@@ -15,6 +15,7 @@
 #  tag_push_events         :boolean          default(FALSE)
 #  note_events             :boolean          default(FALSE), not null
 #  enable_ssl_verification :boolean          default(TRUE)
+#  build_events            :boolean          default(FALSE), not null
 #
 
 class ProjectHook < WebHook
diff --git a/app/models/hooks/service_hook.rb b/app/models/hooks/service_hook.rb
index 09bb3ee52a2..b333a337347 100644
--- a/app/models/hooks/service_hook.rb
+++ b/app/models/hooks/service_hook.rb
@@ -15,6 +15,7 @@
 #  tag_push_events         :boolean          default(FALSE)
 #  note_events             :boolean          default(FALSE), not null
 #  enable_ssl_verification :boolean          default(TRUE)
+#  build_events            :boolean          default(FALSE), not null
 #
 
 class ServiceHook < WebHook
diff --git a/app/models/hooks/system_hook.rb b/app/models/hooks/system_hook.rb
index 2f63c59b07e..d81512fae5d 100644
--- a/app/models/hooks/system_hook.rb
+++ b/app/models/hooks/system_hook.rb
@@ -15,6 +15,7 @@
 #  tag_push_events         :boolean          default(FALSE)
 #  note_events             :boolean          default(FALSE), not null
 #  enable_ssl_verification :boolean          default(TRUE)
+#  build_events            :boolean          default(FALSE), not null
 #
 
 class SystemHook < WebHook
diff --git a/app/models/hooks/web_hook.rb b/app/models/hooks/web_hook.rb
index 40eb0e20b4b..7164c0e1e90 100644
--- a/app/models/hooks/web_hook.rb
+++ b/app/models/hooks/web_hook.rb
@@ -15,6 +15,7 @@
 #  tag_push_events         :boolean          default(FALSE)
 #  note_events             :boolean          default(FALSE), not null
 #  enable_ssl_verification :boolean          default(TRUE)
+#  build_events            :boolean          default(FALSE), not null
 #
 
 class WebHook < ActiveRecord::Base
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index ac25d38eb63..1b98474fc55 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -2,28 +2,28 @@
 #
 # Table name: merge_requests
 #
-#  id                         :integer          not null, primary key
-#  target_branch              :string(255)      not null
-#  source_branch              :string(255)      not null
-#  source_project_id          :integer          not null
-#  author_id                  :integer
-#  assignee_id                :integer
-#  title                      :string(255)
-#  created_at                 :datetime
-#  updated_at                 :datetime
-#  milestone_id               :integer
-#  state                      :string(255)
-#  merge_status               :string(255)
-#  target_project_id          :integer          not null
-#  iid                        :integer
-#  description                :text
-#  position                   :integer          default(0)
-#  locked_at                  :datetime
-#  updated_by_id              :integer
-#  merge_error                :string(255)
-#  merge_params               :text (serialized to hash)
-#  merge_when_build_succeeds  :boolean          default(false), not null
-#  merge_user_id              :integer
+#  id                        :integer          not null, primary key
+#  target_branch             :string(255)      not null
+#  source_branch             :string(255)      not null
+#  source_project_id         :integer          not null
+#  author_id                 :integer
+#  assignee_id               :integer
+#  title                     :string(255)
+#  created_at                :datetime
+#  updated_at                :datetime
+#  milestone_id              :integer
+#  state                     :string(255)
+#  merge_status              :string(255)
+#  target_project_id         :integer          not null
+#  iid                       :integer
+#  description               :text
+#  position                  :integer          default(0)
+#  locked_at                 :datetime
+#  updated_by_id             :integer
+#  merge_error               :string(255)
+#  merge_params              :text
+#  merge_when_build_succeeds :boolean          default(FALSE), not null
+#  merge_user_id             :integer
 #
 
 require Rails.root.join("app/models/commit")
diff --git a/app/models/namespace.rb b/app/models/namespace.rb
index adafabbec07..bdb33f37495 100644
--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
@@ -11,7 +11,6 @@
 #  type        :string(255)
 #  description :string(255)      default(""), not null
 #  avatar      :string(255)
-#  public      :boolean          default(FALSE)
 #
 
 class Namespace < ActiveRecord::Base
diff --git a/app/models/project.rb b/app/models/project.rb
index b1a6cfa86af..7626c698816 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -29,6 +29,13 @@
 #  import_source          :string(255)
 #  commit_count           :integer          default(0)
 #  import_error           :text
+#  ci_id                  :integer
+#  builds_enabled         :boolean          default(TRUE), not null
+#  shared_runners_enabled :boolean          default(TRUE), not null
+#  runners_token          :string
+#  build_coverage_regex   :string
+#  build_allow_git_fetch  :boolean          default(TRUE), not null
+#  build_timeout          :integer          default(3600), not null
 #
 
 require 'carrierwave/orm/activerecord'
diff --git a/app/models/project_services/asana_service.rb b/app/models/project_services/asana_service.rb
index 7d367e40037..792ad804575 100644
--- a/app/models/project_services/asana_service.rb
+++ b/app/models/project_services/asana_service.rb
@@ -16,7 +16,9 @@
 #  merge_requests_events :boolean          default(TRUE)
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
+#  build_events          :boolean          default(FALSE), not null
 #
+
 require 'asana'
 
 class AsanaService < Service
diff --git a/app/models/project_services/assembla_service.rb b/app/models/project_services/assembla_service.rb
index fb7e0c0fb0d..29d841faed8 100644
--- a/app/models/project_services/assembla_service.rb
+++ b/app/models/project_services/assembla_service.rb
@@ -16,6 +16,7 @@
 #  merge_requests_events :boolean          default(TRUE)
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
+#  build_events          :boolean          default(FALSE), not null
 #
 
 class AssemblaService < Service
diff --git a/app/models/project_services/bamboo_service.rb b/app/models/project_services/bamboo_service.rb
index aa8746beb80..9e7f642180e 100644
--- a/app/models/project_services/bamboo_service.rb
+++ b/app/models/project_services/bamboo_service.rb
@@ -16,6 +16,7 @@
 #  merge_requests_events :boolean          default(TRUE)
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
+#  build_events          :boolean          default(FALSE), not null
 #
 
 class BambooService < CiService
diff --git a/app/models/project_services/buildkite_service.rb b/app/models/project_services/buildkite_service.rb
index 199ee3a9d0d..3efbfd2eec3 100644
--- a/app/models/project_services/buildkite_service.rb
+++ b/app/models/project_services/buildkite_service.rb
@@ -16,6 +16,7 @@
 #  merge_requests_events :boolean          default(TRUE)
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
+#  build_events          :boolean          default(FALSE), not null
 #
 
 require "addressable/uri"
diff --git a/app/models/project_services/builds_email_service.rb b/app/models/project_services/builds_email_service.rb
index 8247c79fc33..92c9b13c9b9 100644
--- a/app/models/project_services/builds_email_service.rb
+++ b/app/models/project_services/builds_email_service.rb
@@ -16,6 +16,7 @@
 #  merge_requests_events :boolean          default(TRUE)
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
+#  build_events          :boolean          default(FALSE), not null
 #
 
 class BuildsEmailService < Service
diff --git a/app/models/project_services/campfire_service.rb b/app/models/project_services/campfire_service.rb
index e591afdda64..6e8f0842524 100644
--- a/app/models/project_services/campfire_service.rb
+++ b/app/models/project_services/campfire_service.rb
@@ -16,6 +16,7 @@
 #  merge_requests_events :boolean          default(TRUE)
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
+#  build_events          :boolean          default(FALSE), not null
 #
 
 class CampfireService < Service
diff --git a/app/models/project_services/ci_service.rb b/app/models/project_services/ci_service.rb
index 88186113c68..c3f70d1f972 100644
--- a/app/models/project_services/ci_service.rb
+++ b/app/models/project_services/ci_service.rb
@@ -16,6 +16,7 @@
 #  merge_requests_events :boolean          default(TRUE)
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
+#  build_events          :boolean          default(FALSE), not null
 #
 
 # Base class for CI services
diff --git a/app/models/project_services/custom_issue_tracker_service.rb b/app/models/project_services/custom_issue_tracker_service.rb
index 7c2027c18e6..88a3e9218cb 100644
--- a/app/models/project_services/custom_issue_tracker_service.rb
+++ b/app/models/project_services/custom_issue_tracker_service.rb
@@ -16,6 +16,7 @@
 #  merge_requests_events :boolean          default(TRUE)
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
+#  build_events          :boolean          default(FALSE), not null
 #
 
 class CustomIssueTrackerService < IssueTrackerService
diff --git a/app/models/project_services/drone_ci_service.rb b/app/models/project_services/drone_ci_service.rb
index 08e5ccb3855..b4724bb647e 100644
--- a/app/models/project_services/drone_ci_service.rb
+++ b/app/models/project_services/drone_ci_service.rb
@@ -16,6 +16,7 @@
 #  merge_requests_events :boolean          default(TRUE)
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
+#  build_events          :boolean          default(FALSE), not null
 #
 
 class DroneCiService < CiService
diff --git a/app/models/project_services/emails_on_push_service.rb b/app/models/project_services/emails_on_push_service.rb
index 8f5d8b086eb..b831577cd97 100644
--- a/app/models/project_services/emails_on_push_service.rb
+++ b/app/models/project_services/emails_on_push_service.rb
@@ -16,6 +16,7 @@
 #  merge_requests_events :boolean          default(TRUE)
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
+#  build_events          :boolean          default(FALSE), not null
 #
 
 class EmailsOnPushService < Service
diff --git a/app/models/project_services/external_wiki_service.rb b/app/models/project_services/external_wiki_service.rb
index 74c57949b4d..b402b68665a 100644
--- a/app/models/project_services/external_wiki_service.rb
+++ b/app/models/project_services/external_wiki_service.rb
@@ -16,6 +16,7 @@
 #  merge_requests_events :boolean          default(TRUE)
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
+#  build_events          :boolean          default(FALSE), not null
 #
 
 class ExternalWikiService < Service
diff --git a/app/models/project_services/flowdock_service.rb b/app/models/project_services/flowdock_service.rb
index 15c7c907f7e..8605ce66e48 100644
--- a/app/models/project_services/flowdock_service.rb
+++ b/app/models/project_services/flowdock_service.rb
@@ -16,6 +16,7 @@
 #  merge_requests_events :boolean          default(TRUE)
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
+#  build_events          :boolean          default(FALSE), not null
 #
 
 require "flowdock-git-hook"
diff --git a/app/models/project_services/gemnasium_service.rb b/app/models/project_services/gemnasium_service.rb
index 202fee042e3..61babe9cfe5 100644
--- a/app/models/project_services/gemnasium_service.rb
+++ b/app/models/project_services/gemnasium_service.rb
@@ -16,6 +16,7 @@
 #  merge_requests_events :boolean          default(TRUE)
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
+#  build_events          :boolean          default(FALSE), not null
 #
 
 require "gemnasium/gitlab_service"
diff --git a/app/models/project_services/gitlab_ci_service.rb b/app/models/project_services/gitlab_ci_service.rb
index b64d97ce75d..33f0d7ea01a 100644
--- a/app/models/project_services/gitlab_ci_service.rb
+++ b/app/models/project_services/gitlab_ci_service.rb
@@ -16,6 +16,7 @@
 #  merge_requests_events :boolean          default(TRUE)
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
+#  build_events          :boolean          default(FALSE), not null
 #
 
 # TODO(ayufan): The GitLabCiService is deprecated and the type should be removed when the database entries are removed
diff --git a/app/models/project_services/gitlab_issue_tracker_service.rb b/app/models/project_services/gitlab_issue_tracker_service.rb
index 9558292fea3..7aa04309f54 100644
--- a/app/models/project_services/gitlab_issue_tracker_service.rb
+++ b/app/models/project_services/gitlab_issue_tracker_service.rb
@@ -16,6 +16,7 @@
 #  merge_requests_events :boolean          default(TRUE)
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
+#  build_events          :boolean          default(FALSE), not null
 #
 
 class GitlabIssueTrackerService < IssueTrackerService
diff --git a/app/models/project_services/hipchat_service.rb b/app/models/project_services/hipchat_service.rb
index 1e1686a11c6..32a81808930 100644
--- a/app/models/project_services/hipchat_service.rb
+++ b/app/models/project_services/hipchat_service.rb
@@ -16,6 +16,7 @@
 #  merge_requests_events :boolean          default(TRUE)
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
+#  build_events          :boolean          default(FALSE), not null
 #
 
 class HipchatService < Service
diff --git a/app/models/project_services/irker_service.rb b/app/models/project_services/irker_service.rb
index d24aa317cf3..bd9b580038f 100644
--- a/app/models/project_services/irker_service.rb
+++ b/app/models/project_services/irker_service.rb
@@ -16,6 +16,7 @@
 #  merge_requests_events :boolean          default(TRUE)
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
+#  build_events          :boolean          default(FALSE), not null
 #
 
 require 'uri'
diff --git a/app/models/project_services/issue_tracker_service.rb b/app/models/project_services/issue_tracker_service.rb
index 936e574cccd..ed201979d39 100644
--- a/app/models/project_services/issue_tracker_service.rb
+++ b/app/models/project_services/issue_tracker_service.rb
@@ -16,6 +16,7 @@
 #  merge_requests_events :boolean          default(TRUE)
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
+#  build_events          :boolean          default(FALSE), not null
 #
 
 class IssueTrackerService < Service
diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb
index e216f406e1c..a1b77c61576 100644
--- a/app/models/project_services/jira_service.rb
+++ b/app/models/project_services/jira_service.rb
@@ -16,6 +16,7 @@
 #  merge_requests_events :boolean          default(TRUE)
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
+#  build_events          :boolean          default(FALSE), not null
 #
 
 class JiraService < IssueTrackerService
diff --git a/app/models/project_services/pivotaltracker_service.rb b/app/models/project_services/pivotaltracker_service.rb
index ade9ee97873..c9a890c7e3f 100644
--- a/app/models/project_services/pivotaltracker_service.rb
+++ b/app/models/project_services/pivotaltracker_service.rb
@@ -16,6 +16,7 @@
 #  merge_requests_events :boolean          default(TRUE)
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
+#  build_events          :boolean          default(FALSE), not null
 #
 
 class PivotaltrackerService < Service
diff --git a/app/models/project_services/pushover_service.rb b/app/models/project_services/pushover_service.rb
index 53edf522e9a..3d7e8bbee61 100644
--- a/app/models/project_services/pushover_service.rb
+++ b/app/models/project_services/pushover_service.rb
@@ -16,6 +16,7 @@
 #  merge_requests_events :boolean          default(TRUE)
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
+#  build_events          :boolean          default(FALSE), not null
 #
 
 class PushoverService < Service
diff --git a/app/models/project_services/redmine_service.rb b/app/models/project_services/redmine_service.rb
index dd9ba97ee1f..de974354c77 100644
--- a/app/models/project_services/redmine_service.rb
+++ b/app/models/project_services/redmine_service.rb
@@ -16,6 +16,7 @@
 #  merge_requests_events :boolean          default(TRUE)
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
+#  build_events          :boolean          default(FALSE), not null
 #
 
 class RedmineService < IssueTrackerService
diff --git a/app/models/project_services/slack_service.rb b/app/models/project_services/slack_service.rb
index 375b4534d07..d89cf6d17b2 100644
--- a/app/models/project_services/slack_service.rb
+++ b/app/models/project_services/slack_service.rb
@@ -16,6 +16,7 @@
 #  merge_requests_events :boolean          default(TRUE)
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
+#  build_events          :boolean          default(FALSE), not null
 #
 
 class SlackService < Service
diff --git a/app/models/project_services/teamcity_service.rb b/app/models/project_services/teamcity_service.rb
index a63700693d7..b8e9416131a 100644
--- a/app/models/project_services/teamcity_service.rb
+++ b/app/models/project_services/teamcity_service.rb
@@ -16,6 +16,7 @@
 #  merge_requests_events :boolean          default(TRUE)
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
+#  build_events          :boolean          default(FALSE), not null
 #
 
 class TeamcityService < CiService
diff --git a/app/models/service.rb b/app/models/service.rb
index d3bf7f0ebd1..24f4bf7646e 100644
--- a/app/models/service.rb
+++ b/app/models/service.rb
@@ -16,6 +16,7 @@
 #  merge_requests_events :boolean          default(TRUE)
 #  tag_push_events       :boolean          default(TRUE)
 #  note_events           :boolean          default(TRUE), not null
+#  build_events          :boolean          default(FALSE), not null
 #
 
 # To add new service you should build a class inherited from Service
diff --git a/app/models/user.rb b/app/models/user.rb
index 20f907e4347..46b36c605b0 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -2,62 +2,63 @@
 #
 # 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
-#  unlock_token               :string(255)
-#  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)
-#  consumed_timestep          :integer
-#  layout                     :integer          default(0)
-#  hide_project_limit         :boolean          default(FALSE)
+#  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)
+#  consumed_timestep           :integer
+#  layout                      :integer          default(0)
+#  hide_project_limit          :boolean          default(FALSE)
+#  unlock_token                :string
+#  otp_grace_period_started_at :datetime
 #
 
 require 'carrierwave/orm/activerecord'
-- 
cgit v1.2.1


From 539b41929bddf0e82d986f9e823208dd92707a21 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Thu, 7 Jan 2016 12:26:05 +0100
Subject: Milestone reference is a Markdown link

---
 app/models/milestone.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'app/models')

diff --git a/app/models/milestone.rb b/app/models/milestone.rb
index eaa2db2e247..550d14d4c39 100644
--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
@@ -71,8 +71,12 @@ class Milestone < ActiveRecord::Base
   end
 
   def to_reference(from_project = nil)
+    escaped_title = self.title.gsub("]", "\\]")
+
     h = Gitlab::Application.routes.url_helpers
-    h.namespace_project_milestone_url(self.project.namespace, self.project, self)
+    url = h.namespace_project_milestone_url(self.project.namespace, self.project, self)
+
+    "[#{escaped_title}](#{url})"
   end
 
   def reference_link_text(from_project = nil)
-- 
cgit v1.2.1


From 41b8a238ce4bd7f091d46fb9b89b7456fde17ddf Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Thu, 7 Jan 2016 12:56:18 +0100
Subject: Merge branch 'master' of github.com:gitlabhq/gitlabhq

---
 app/models/repository.rb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'app/models')

diff --git a/app/models/repository.rb b/app/models/repository.rb
index 6ecd2d2f27e..9deb08d93b8 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -681,6 +681,11 @@ class Repository
     end
   end
 
+  def ls_files(ref)
+    actual_ref = ref || root_ref
+    raw_repository.ls_files(actual_ref)
+  end
+
   private
 
   def cache
-- 
cgit v1.2.1


From b60c146267dfa8dc1c170426e1817c6b2a168d1a Mon Sep 17 00:00:00 2001
From: Tomasz Maczukin <tomasz@maczukin.pl>
Date: Thu, 7 Jan 2016 13:49:38 +0100
Subject: Change :variable_id to :key as resource ID in API

---
 app/models/ci/variable.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'app/models')

diff --git a/app/models/ci/variable.rb b/app/models/ci/variable.rb
index 0e2712086ca..1d9ee91a31c 100644
--- a/app/models/ci/variable.rb
+++ b/app/models/ci/variable.rb
@@ -18,8 +18,12 @@ module Ci
     
     belongs_to :project, class_name: '::Project', foreign_key: :gl_project_id
 
-    validates_presence_of :key
     validates_uniqueness_of :key, scope: :gl_project_id
+    validates :key,
+      presence: true,
+      length: { within: 0..255 },
+      format: { with: /\A[a-zA-Z0-9_]+\z/,
+                message: "can contain only letters, digits and '_'." }
 
     attr_encrypted :value, mode: :per_attribute_iv_and_salt, key: Gitlab::Application.secrets.db_key_base
   end
-- 
cgit v1.2.1


From 9dacc3bc568c6c8cfc4a1bc1af23eb96f9eae9b0 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Wed, 6 Jan 2016 17:29:44 +0100
Subject: Sort by ID when sorting using "Recently created"

Sorting by "id" has the same effect as sorting by created_at while
performing far better and without the need of an extra index (in case
one wanted to speed up sorting by "created_at").

Sorting by "Recently updated" still uses the physical "updated_at"
column as there's no way to use the "id" column for this instead.
---
 app/models/concerns/sortable.rb | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'app/models')

diff --git a/app/models/concerns/sortable.rb b/app/models/concerns/sortable.rb
index 7391a77383c..8b47b9e0abd 100644
--- a/app/models/concerns/sortable.rb
+++ b/app/models/concerns/sortable.rb
@@ -11,6 +11,7 @@ module Sortable
     default_scope { order_id_desc }
 
     scope :order_id_desc, -> { reorder(id: :desc) }
+    scope :order_id_asc, -> { reorder(id: :asc) }
     scope :order_created_desc, -> { reorder(created_at: :desc) }
     scope :order_created_asc, -> { reorder(created_at: :asc) }
     scope :order_updated_desc, -> { reorder(updated_at: :desc) }
@@ -28,6 +29,8 @@ module Sortable
       when 'updated_desc' then order_updated_desc
       when 'created_asc' then order_created_asc
       when 'created_desc' then order_created_desc
+      when 'id_desc' then order_id_desc
+      when 'id_asc' then order_id_asc
       else
         all
       end
-- 
cgit v1.2.1


From 0d0049c0584be2d358048c3cc545406b64bf3826 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Wed, 6 Jan 2016 17:32:25 +0100
Subject: Don't pluck IDs when getting issues/MRs per group

This replaces plucking of IDs with a sub-query, saving the overhead of
loading the data in Ruby and then mapping the rows to an Array of IDs.
This also scales much better when dealing with a large amount of IDs
that would be involved.
---
 app/models/issue.rb         | 2 +-
 app/models/merge_request.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/models')

diff --git a/app/models/issue.rb b/app/models/issue.rb
index 80ecd15077f..21cc2105161 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -33,7 +33,7 @@ class Issue < ActiveRecord::Base
   belongs_to :project
   validates :project, presence: true
 
-  scope :of_group, ->(group) { where(project_id: group.project_ids) }
+  scope :of_group, ->(group) { where(project_id: group.projects.select(:id)) }
   scope :cared, ->(user) { where(assignee_id: user) }
   scope :open_for, ->(user) { opened.assigned_to(user) }
 
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 30d0c2b5961..3c41bebc807 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -131,7 +131,7 @@ class MergeRequest < ActiveRecord::Base
   validate :validate_branches
   validate :validate_fork
 
-  scope :of_group, ->(group) { where("source_project_id in (:group_project_ids) OR target_project_id in (:group_project_ids)", group_project_ids: group.project_ids) }
+  scope :of_group, ->(group) { where("source_project_id in (:group_project_ids) OR target_project_id in (:group_project_ids)", group_project_ids: group.projects.select(:id)) }
   scope :by_branch, ->(branch_name) { where("(source_branch LIKE :branch) OR (target_branch LIKE :branch)", branch: branch_name) }
   scope :cared, ->(user) { where('assignee_id = :user OR author_id = :user', user: user.id) }
   scope :by_milestone, ->(milestone) { where(milestone_id: milestone) }
-- 
cgit v1.2.1


From 4443a5f3c76015f7bf083248b6910d01839cfc88 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 7 Jan 2016 13:00:47 +0100
Subject: Add support for ref and path to commits filtering

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/models/repository.rb | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'app/models')

diff --git a/app/models/repository.rb b/app/models/repository.rb
index 9deb08d93b8..d9ff71c01ed 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -92,9 +92,12 @@ class Repository
     commits
   end
 
-  def find_commits_by_message(query)
+  def find_commits_by_message(query, ref = nil, path = nil, limit = 1000, offset = 0)
+    ref ||= root_ref
+
     # Limited to 1000 commits for now, could be parameterized?
-    args = %W(#{Gitlab.config.git.bin_path} log --pretty=%H --max-count 1000 --grep=#{query})
+    args = %W(#{Gitlab.config.git.bin_path} log #{ref} --pretty=%H --skip #{offset} --max-count #{limit} --grep=#{query})
+    args = args.concat(%W(-- #{path})) if path.present?
 
     git_log_results = Gitlab::Popen.popen(args, path_to_repo).first.lines.map(&:chomp)
     commits = git_log_results.map { |c| commit(c) }
@@ -175,7 +178,7 @@ class Repository
   def size
     cache.fetch(:size) { raw_repository.size }
   end
-  
+
   def diverging_commit_counts(branch)
     root_ref_hash = raw_repository.rev_parse_target(root_ref).oid
     cache.fetch(:"diverging_commit_counts_#{branch.name}") do
@@ -183,7 +186,7 @@ class Repository
       # than SHA-1 hashes
       number_commits_behind = commits_between(branch.target, root_ref_hash).size
       number_commits_ahead = commits_between(root_ref_hash, branch.target).size
-      
+
       { behind: number_commits_behind, ahead: number_commits_ahead }
     end
   end
@@ -192,7 +195,7 @@ class Repository
     %i(size branch_names tag_names commit_count
        readme version contribution_guide changelog license)
   end
-  
+
   def branch_cache_keys
     branches.map do |branch|
       :"diverging_commit_counts_#{branch.name}"
@@ -205,7 +208,7 @@ class Repository
         send(key)
       end
     end
-    
+
     branches.each do |branch|
       unless cache.exist?(:"diverging_commit_counts_#{branch.name}")
         send(:diverging_commit_counts, branch)
@@ -227,10 +230,10 @@ class Repository
     cache_keys.each do |key|
       cache.expire(key)
     end
-    
+
     expire_branch_cache
   end
-  
+
   def expire_branch_cache
     branches.each do |branch|
       cache.expire(:"diverging_commit_counts_#{branch.name}")
@@ -242,7 +245,7 @@ class Repository
       cache.expire(key)
       send(key)
     end
-    
+
     branches.each do |branch|
       cache.expire(:"diverging_commit_counts_#{branch.name}")
       diverging_commit_counts(branch)
-- 
cgit v1.2.1


From 8386edafd13c8cca1c6ed45abbbc554351300e9d Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Thu, 7 Jan 2016 06:28:24 -0800
Subject: Accept 2xx status codes for successful Web hook triggers

Closes https://github.com/gitlabhq/gitlabhq/issues/9956
---
 app/models/hooks/web_hook.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/models')

diff --git a/app/models/hooks/web_hook.rb b/app/models/hooks/web_hook.rb
index 40eb0e20b4b..b12a45e922a 100644
--- a/app/models/hooks/web_hook.rb
+++ b/app/models/hooks/web_hook.rb
@@ -60,7 +60,7 @@ class WebHook < ActiveRecord::Base
                               basic_auth: auth)
     end
 
-    [response.code == 200, ActionView::Base.full_sanitizer.sanitize(response.to_s)]
+    [(response.code >= 200 && response.code < 300), ActionView::Base.full_sanitizer.sanitize(response.to_s)]
   rescue SocketError, OpenSSL::SSL::SSLError, Errno::ECONNRESET, Errno::ECONNREFUSED, Net::OpenTimeout => e
     logger.error("WebHook Error => #{e}")
     [false, e.to_s]
-- 
cgit v1.2.1


From 19a0db30ba14cb07a8f542abec56bd9cb2fa417f Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Thu, 7 Jan 2016 15:34:37 +0100
Subject: Removed ORDER BY in "of_group" scopes

These scopes don't care about the order. Removing the explicit "ORDER
BY" can speed up the queries by a little bit.
---
 app/models/issue.rb         | 4 +++-
 app/models/merge_request.rb | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'app/models')

diff --git a/app/models/issue.rb b/app/models/issue.rb
index 21cc2105161..f52e47f3e62 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -33,7 +33,9 @@ class Issue < ActiveRecord::Base
   belongs_to :project
   validates :project, presence: true
 
-  scope :of_group, ->(group) { where(project_id: group.projects.select(:id)) }
+  scope :of_group,
+    ->(group) { where(project_id: group.projects.select(:id).reorder(nil)) }
+
   scope :cared, ->(user) { where(assignee_id: user) }
   scope :open_for, ->(user) { opened.assigned_to(user) }
 
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 3c41bebc807..4e685ad3b7c 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -131,7 +131,7 @@ class MergeRequest < ActiveRecord::Base
   validate :validate_branches
   validate :validate_fork
 
-  scope :of_group, ->(group) { where("source_project_id in (:group_project_ids) OR target_project_id in (:group_project_ids)", group_project_ids: group.projects.select(:id)) }
+  scope :of_group, ->(group) { where("source_project_id in (:group_project_ids) OR target_project_id in (:group_project_ids)", group_project_ids: group.projects.select(:id).reorder(nil)) }
   scope :by_branch, ->(branch_name) { where("(source_branch LIKE :branch) OR (target_branch LIKE :branch)", branch: branch_name) }
   scope :cared, ->(user) { where('assignee_id = :user OR author_id = :user', user: user.id) }
   scope :by_milestone, ->(milestone) { where(milestone_id: milestone) }
-- 
cgit v1.2.1


From 69209612e1793fcebcdb784074056d7a02b0f6f7 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Tue, 22 Dec 2015 12:15:06 -0800
Subject: Suppress e-mails on failed builds if allow_failure is set

Every time I push to GitLab, I get > 2 emails saying a spec failed when
I don't care about benchmarks and other specs that have `allow_failure` set to `true`.
---
 app/models/project_services/builds_email_service.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'app/models')

diff --git a/app/models/project_services/builds_email_service.rb b/app/models/project_services/builds_email_service.rb
index 92c9b13c9b9..f6313255cbb 100644
--- a/app/models/project_services/builds_email_service.rb
+++ b/app/models/project_services/builds_email_service.rb
@@ -73,12 +73,16 @@ class BuildsEmailService < Service
     when 'success'
       !notify_only_broken_builds?
     when 'failed'
-      true
+      !allow_failure?(data)
     else
       false
     end
   end
 
+  def allow_failure?(data)
+    data[:build_allow_failure] == true
+  end
+
   def all_recipients(data)
     all_recipients = recipients.split(',')
 
-- 
cgit v1.2.1


From 59305715e9d3569f47d7c2accc2106022c0a6960 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Wed, 6 Jan 2016 16:35:17 -0500
Subject: Remove stamp gem

Closes #5908
---
 app/models/global_milestone.rb | 4 ++--
 app/models/milestone.rb        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'app/models')

diff --git a/app/models/global_milestone.rb b/app/models/global_milestone.rb
index af1d7562ebe..4fa5825a5f3 100644
--- a/app/models/global_milestone.rb
+++ b/app/models/global_milestone.rb
@@ -121,9 +121,9 @@ class GlobalMilestone
   def expires_at
     if due_date
       if due_date.past?
-        "expired at #{due_date.stamp("Aug 21, 2011")}"
+        "expired at #{due_date.strftime('%b %-d, %Y')}"
       else
-        "expires at #{due_date.stamp("Aug 21, 2011")}"
+        "expires at #{due_date.strftime('%b %-d, %Y')}"
       end
     end
   end
diff --git a/app/models/milestone.rb b/app/models/milestone.rb
index 550d14d4c39..5f920132da9 100644
--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
@@ -112,9 +112,9 @@ class Milestone < ActiveRecord::Base
   def expires_at
     if due_date
       if due_date.past?
-        "expired at #{due_date.stamp("Aug 21, 2011")}"
+        "expired at #{due_date.strftime('%b %-d, %Y')}"
       else
-        "expires at #{due_date.stamp("Aug 21, 2011")}"
+        "expires at #{due_date.strftime('%b %-d, %Y')}"
       end
     end
   end
-- 
cgit v1.2.1


From f7fdcb95daf235455effa96d00eb082c147ac49e Mon Sep 17 00:00:00 2001
From: Drew Blessing <drew@gitlab.com>
Date: Thu, 7 Jan 2016 15:07:13 -0600
Subject: Do not call API if there is no API URL

---
 app/models/project_services/jira_service.rb | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'app/models')

diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb
index a1b77c61576..b6c01c32d9a 100644
--- a/app/models/project_services/jira_service.rb
+++ b/app/models/project_services/jira_service.rb
@@ -121,6 +121,7 @@ class JiraService < IssueTrackerService
   end
 
   def test_settings
+    return unless api_url.present?
     result = JiraService.get(
       jira_api_test_url,
       headers: {
@@ -218,6 +219,7 @@ class JiraService < IssueTrackerService
   end
 
   def send_message(url, message)
+    return unless api_url.present?
     result = JiraService.post(
       url,
       body: message,
@@ -243,6 +245,7 @@ class JiraService < IssueTrackerService
   end
 
   def existing_comment?(issue_name, new_comment)
+    return unless api_url.present?
     result = JiraService.get(
       comment_url(issue_name),
       headers: {
-- 
cgit v1.2.1


From fa36749bcee7fa2eb72c9f2a6a28aab1b7274097 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Wed, 6 Jan 2016 17:27:56 -0500
Subject: Add two custom Date/Time conversion formats

---
 app/models/global_milestone.rb | 4 ++--
 app/models/milestone.rb        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'app/models')

diff --git a/app/models/global_milestone.rb b/app/models/global_milestone.rb
index 4fa5825a5f3..7ee276255a0 100644
--- a/app/models/global_milestone.rb
+++ b/app/models/global_milestone.rb
@@ -121,9 +121,9 @@ class GlobalMilestone
   def expires_at
     if due_date
       if due_date.past?
-        "expired at #{due_date.strftime('%b %-d, %Y')}"
+        "expired on #{due_date.to_s(:medium)}"
       else
-        "expires at #{due_date.strftime('%b %-d, %Y')}"
+        "expires on #{due_date.to_s(:medium)}"
       end
     end
   end
diff --git a/app/models/milestone.rb b/app/models/milestone.rb
index 5f920132da9..c9a0ad8b9b6 100644
--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
@@ -112,9 +112,9 @@ class Milestone < ActiveRecord::Base
   def expires_at
     if due_date
       if due_date.past?
-        "expired at #{due_date.strftime('%b %-d, %Y')}"
+        "expired on #{due_date.to_s(:medium)}"
       else
-        "expires at #{due_date.strftime('%b %-d, %Y')}"
+        "expires on #{due_date.to_s(:medium)}"
       end
     end
   end
-- 
cgit v1.2.1


From fc7b14a534ed63af787b63b22fee9cd267cae5b0 Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Fri, 8 Jan 2016 13:21:40 +0100
Subject: Remove reference to EE from JIRA service model

---
 app/models/project_services/jira_service.rb | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'app/models')

diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb
index a1b77c61576..9f9b44f099b 100644
--- a/app/models/project_services/jira_service.rb
+++ b/app/models/project_services/jira_service.rb
@@ -44,11 +44,6 @@ class JiraService < IssueTrackerService
     'allow a user to easily navigate to the Jira issue tracker. See the '\
     '[integration doc](http://doc.gitlab.com/ce/integration/external-issue-tracker.html) '\
     'for details.'
-
-    line2 = 'Support for referencing commits and automatic closing of Jira issues directly '\
-    'from GitLab is [available in GitLab EE.](http://doc.gitlab.com/ee/integration/jira.html)'
-
-    [line1, line2].join("\n\n")
   end
 
   def title
-- 
cgit v1.2.1


From 549a2fa7873366b52e9ba3caa849073b7b958b73 Mon Sep 17 00:00:00 2001
From: Tomasz Maczukin <tomasz@maczukin.pl>
Date: Fri, 8 Jan 2016 14:01:31 +0100
Subject: Modify builds scope filtering in builds API

---
 app/models/ci/build.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'app/models')

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 3e67b2771c1..8fb68743a9b 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -94,6 +94,10 @@ module Ci
         new_build.save
         new_build
       end
+
+      def available_statuses
+        state_machines[:status].states.map &:value
+      end
     end
 
     state_machine :status, initial: :pending do
-- 
cgit v1.2.1


From d09f1a4443696cdd7187ba855da26e57905ef422 Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Fri, 8 Jan 2016 15:22:42 +0100
Subject: Remove useless assignment to variable

---
 app/models/project_services/jira_service.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/models')

diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb
index 9f9b44f099b..8a43a021819 100644
--- a/app/models/project_services/jira_service.rb
+++ b/app/models/project_services/jira_service.rb
@@ -40,7 +40,7 @@ class JiraService < IssueTrackerService
   end
 
   def help
-    line1 = 'Setting `project_url`, `issues_url` and `new_issue_url` will '\
+    'Setting `project_url`, `issues_url` and `new_issue_url` will '\
     'allow a user to easily navigate to the Jira issue tracker. See the '\
     '[integration doc](http://doc.gitlab.com/ce/integration/external-issue-tracker.html) '\
     'for details.'
-- 
cgit v1.2.1


From bc7ef8e5b7a002ca6bc2d7a5e6be11b4a59b6710 Mon Sep 17 00:00:00 2001
From: Gabriel Mazetto <gabriel@gitlab.com>
Date: Tue, 29 Dec 2015 17:53:55 -0200
Subject: Add ldap_blocked as new state to users state machine

---
 app/models/user.rb | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'app/models')

diff --git a/app/models/user.rb b/app/models/user.rb
index 46b36c605b0..67b47b0f329 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -198,16 +198,26 @@ class User < ActiveRecord::Base
       transition active: :blocked
     end
 
+    event :ldap_block do
+      transition active: :ldap_blocked
+    end
+
     event :activate do
       transition blocked: :active
     end
+
+    state :blocked, :ldap_blocked do
+      def blocked?
+        true
+      end
+    end
   end
 
   mount_uploader :avatar, AvatarUploader
 
   # Scopes
   scope :admins, -> { where(admin: true) }
-  scope :blocked, -> { with_state(:blocked) }
+  scope :blocked, -> { with_states(:blocked, :ldap_blocked) }
   scope :active, -> { with_state(:active) }
   scope :not_in_project, ->(project) { project.users.present? ? where("id not in (:ids)", ids: project.users.map(&:id) ) : all }
   scope :without_projects, -> { where('id NOT IN (SELECT DISTINCT(user_id) FROM members)') }
-- 
cgit v1.2.1


From ec67e9be1d7486199b47e19c766202a8bfdefe93 Mon Sep 17 00:00:00 2001
From: Gabriel Mazetto <gabriel@gitlab.com>
Date: Wed, 6 Jan 2016 05:38:52 -0200
Subject: Repair ldap_blocked state when no ldap identity exist anymore

---
 app/models/identity.rb | 4 ++++
 app/models/user.rb     | 1 +
 2 files changed, 5 insertions(+)

(limited to 'app/models')

diff --git a/app/models/identity.rb b/app/models/identity.rb
index 8bcdc194953..830b99fa3f2 100644
--- a/app/models/identity.rb
+++ b/app/models/identity.rb
@@ -18,4 +18,8 @@ class Identity < ActiveRecord::Base
   validates :provider, presence: true
   validates :extern_uid, allow_blank: true, uniqueness: { scope: :provider }
   validates :user_id, uniqueness: { scope: :provider }
+
+  def is_ldap?
+    provider.starts_with?('ldap')
+  end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index 67b47b0f329..5eed9cf91c7 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -196,6 +196,7 @@ class User < ActiveRecord::Base
   state_machine :state, initial: :active do
     event :block do
       transition active: :blocked
+      transition ldap_blocked: :blocked
     end
 
     event :ldap_block do
-- 
cgit v1.2.1


From 58867eff46dc6886b85bfe5a787341f224d09421 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <mail@zjvandeweg.nl>
Date: Wed, 9 Dec 2015 11:59:25 +0100
Subject: Unsubscribe from thread through link in email footer

---
 app/models/concerns/issuable.rb | 6 ++++++
 app/models/sent_notification.rb | 8 +++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'app/models')

diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index 18a00f95b48..04650a9e67a 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -119,6 +119,12 @@ module Issuable
       update(subscribed: !subscribed?(user))
   end
 
+  def unsubscribe(user)
+    subscriptions.
+      find_or_initialize_by(user_id: user.id).
+      update(subscribed: false)
+  end
+
   def to_hook_data(user)
     {
       object_kind: self.class.name.underscore,
diff --git a/app/models/sent_notification.rb b/app/models/sent_notification.rb
index f36eda1531b..fd12615717b 100644
--- a/app/models/sent_notification.rb
+++ b/app/models/sent_notification.rb
@@ -25,8 +25,6 @@ class SentNotification < ActiveRecord::Base
 
   class << self
     def reply_key
-      return nil unless Gitlab::IncomingEmail.enabled?
-
       SecureRandom.hex(16)
     end
 
@@ -59,7 +57,7 @@ class SentNotification < ActiveRecord::Base
 
     def record_note(note, recipient_id, reply_key, params = {})
       params[:line_code] = note.line_code
-      
+
       record(note.noteable, recipient_id, reply_key, params)
     end
   end
@@ -75,4 +73,8 @@ class SentNotification < ActiveRecord::Base
       super
     end
   end
+
+  def to_param
+    self.reply_key
+  end
 end
-- 
cgit v1.2.1


From 36d858bcf98868426256ce51a28e7029b38e0c2d Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <mail@zjvandeweg.nl>
Date: Sat, 9 Jan 2016 12:47:31 +0100
Subject: Add #can_unsubscribe? to SentNotification

---
 app/models/sent_notification.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'app/models')

diff --git a/app/models/sent_notification.rb b/app/models/sent_notification.rb
index fd12615717b..03108da17be 100644
--- a/app/models/sent_notification.rb
+++ b/app/models/sent_notification.rb
@@ -62,6 +62,10 @@ class SentNotification < ActiveRecord::Base
     end
   end
 
+  def can_unsubscribe?
+    !for_commit?
+  end
+
   def for_commit?
     noteable_type == "Commit"
   end
-- 
cgit v1.2.1


From 4b4fdf58c7f358fb06bed6dae166b758465850d0 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Mon, 4 Jan 2016 23:18:23 -0800
Subject: Fix Error 500 when visiting build page of project with nil
 runners_token

Properly ensure that the token exists and add defensively check for a
non-nil value.

Closes #4294
---
 app/models/ci/build.rb |  2 +-
 app/models/project.rb  | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'app/models')

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 30f79fd3bfa..a4779d06de8 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -206,7 +206,7 @@ module Ci
 
     def trace
       trace = raw_trace
-      if project && trace.present?
+      if project && trace.present? && project.runners_token.present?
         trace.gsub(project.runners_token, 'xxxxxx')
       else
         trace
diff --git a/app/models/project.rb b/app/models/project.rb
index 7626c698816..0d7341e1384 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -50,6 +50,7 @@ class Project < ActiveRecord::Base
   include Sortable
   include AfterCommitQueue
   include CaseSensitivity
+  include TokenAuthenticatable
 
   extend Gitlab::ConfigHelper
 
@@ -193,10 +194,7 @@ class Project < ActiveRecord::Base
     if: ->(project) { project.avatar.present? && project.avatar_changed? }
   validates :avatar, file_size: { maximum: 200.kilobytes.to_i }
 
-  before_validation :set_runners_token_token
-  def set_runners_token_token
-    self.runners_token = SecureRandom.hex(15) if self.runners_token.blank?
-  end
+  add_authentication_token_field :runners_token
 
   mount_uploader :avatar, AvatarUploader
 
@@ -900,4 +898,8 @@ class Project < ActiveRecord::Base
     return true unless forked?
     Gitlab::VisibilityLevel.allowed_fork_levels(forked_from_project.visibility_level).include?(level.to_i)
   end
+
+  def runners_token
+    ensure_runners_token!
+  end
 end
-- 
cgit v1.2.1


From b7aa13a0cfdcd2ebd5f0dab2bc5cad222f9f379b Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Fri, 8 Jan 2016 08:00:45 -0800
Subject: Before project save ensure that a runners_token exists

---
 app/models/project.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/models')

diff --git a/app/models/project.rb b/app/models/project.rb
index 0d7341e1384..31990485f7d 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -195,6 +195,7 @@ class Project < ActiveRecord::Base
   validates :avatar, file_size: { maximum: 200.kilobytes.to_i }
 
   add_authentication_token_field :runners_token
+  before_save :ensure_runners_token
 
   mount_uploader :avatar, AvatarUploader
 
-- 
cgit v1.2.1


From be08490863b76026b8f3ffbc422cb7f5d8b4a6a4 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <mail@zjvandeweg.nl>
Date: Mon, 11 Jan 2016 14:23:45 +0100
Subject: #can_unsubscribe? -> #?unsubscribable?

---
 app/models/sent_notification.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/models')

diff --git a/app/models/sent_notification.rb b/app/models/sent_notification.rb
index 03108da17be..77115597d71 100644
--- a/app/models/sent_notification.rb
+++ b/app/models/sent_notification.rb
@@ -62,7 +62,7 @@ class SentNotification < ActiveRecord::Base
     end
   end
 
-  def can_unsubscribe?
+  def unsubscribable?
     !for_commit?
   end
 
-- 
cgit v1.2.1


From 932a247f5fb4a14b3e096ec88a73f8fce481eebb Mon Sep 17 00:00:00 2001
From: Jason Lee <huacnlee@gmail.com>
Date: Tue, 12 Jan 2016 17:32:25 +0800
Subject: Use CGI.escape instead of URI.escape, because URI is obsoleted.

ref: https://github.com/ruby/ruby/commit/238b979f1789f95262a267d8df6239806f2859cc
---
 app/models/hooks/web_hook.rb                   | 4 ++--
 app/models/project_services/hipchat_service.rb | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'app/models')

diff --git a/app/models/hooks/web_hook.rb b/app/models/hooks/web_hook.rb
index d0aadfc330a..3bb50c63cac 100644
--- a/app/models/hooks/web_hook.rb
+++ b/app/models/hooks/web_hook.rb
@@ -48,8 +48,8 @@ class WebHook < ActiveRecord::Base
     else
       post_url = url.gsub("#{parsed_url.userinfo}@", "")
       auth = {
-        username: URI.decode(parsed_url.user),
-        password: URI.decode(parsed_url.password),
+        username: CGI.unescape(parsed_url.user),
+        password: CGI.unescape(parsed_url.password),
       }
       response = WebHook.post(post_url,
                               body: data.to_json,
diff --git a/app/models/project_services/hipchat_service.rb b/app/models/project_services/hipchat_service.rb
index 32a81808930..0e3fa4a40fe 100644
--- a/app/models/project_services/hipchat_service.rb
+++ b/app/models/project_services/hipchat_service.rb
@@ -120,13 +120,13 @@ class HipchatService < Service
     message << "#{push[:user_name]} "
     if Gitlab::Git.blank_ref?(before)
       message << "pushed new #{ref_type} <a href=\""\
-                 "#{project_url}/commits/#{URI.escape(ref)}\">#{ref}</a>"\
+                 "#{project_url}/commits/#{CGI.escape(ref)}\">#{ref}</a>"\
                  " to #{project_link}\n"
     elsif Gitlab::Git.blank_ref?(after)
       message << "removed #{ref_type} <b>#{ref}</b> from <a href=\"#{project.web_url}\">#{project_name}</a> \n"
     else
       message << "pushed to #{ref_type} <a href=\""\
-                  "#{project.web_url}/commits/#{URI.escape(ref)}\">#{ref}</a> "
+                  "#{project.web_url}/commits/#{CGI.escape(ref)}\">#{ref}</a> "
       message << "of <a href=\"#{project.web_url}\">#{project.name_with_namespace.gsub!(/\s/,'')}</a> "
       message << "(<a href=\"#{project.web_url}/compare/#{before}...#{after}\">Compare changes</a>)"
 
@@ -255,8 +255,8 @@ class HipchatService < Service
     status = data[:commit][:status]
     duration = data[:commit][:duration]
 
-    branch_link = "<a href=\"#{project_url}/commits/#{URI.escape(ref)}\">#{ref}</a>"
-    commit_link = "<a href=\"#{project_url}/commit/#{URI.escape(sha)}/builds\">#{Commit.truncate_sha(sha)}</a>"
+    branch_link = "<a href=\"#{project_url}/commits/#{CGI.escape(ref)}\">#{ref}</a>"
+    commit_link = "<a href=\"#{project_url}/commit/#{CGI.escape(sha)}/builds\">#{Commit.truncate_sha(sha)}</a>"
 
     "#{project_link}: Commit #{commit_link} of #{branch_link} #{ref_type} by #{user_name} #{humanized_status(status)} in #{duration} second(s)"
   end
-- 
cgit v1.2.1


From ac6a10f3e88c5d2081b8638df63016089517a844 Mon Sep 17 00:00:00 2001
From: Gabriel Mazetto <gabriel@gitlab.com>
Date: Tue, 12 Jan 2016 12:29:10 -0200
Subject: Codestyle changes

---
 app/models/identity.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/models')

diff --git a/app/models/identity.rb b/app/models/identity.rb
index 830b99fa3f2..e1915b079d4 100644
--- a/app/models/identity.rb
+++ b/app/models/identity.rb
@@ -19,7 +19,7 @@ class Identity < ActiveRecord::Base
   validates :extern_uid, allow_blank: true, uniqueness: { scope: :provider }
   validates :user_id, uniqueness: { scope: :provider }
 
-  def is_ldap?
+  def ldap?
     provider.starts_with?('ldap')
   end
 end
-- 
cgit v1.2.1


From 4819de1e7026849e10a0a05939152dfa01b5ba85 Mon Sep 17 00:00:00 2001
From: Landon <landogbland@gmail.com>
Date: Tue, 12 Jan 2016 15:54:09 -0700
Subject: Mention channel/key bug in irkerd docs

Per this issue: https://gitlab.com/esr/irker/issues/2

A documentation update was added to irkerd (https://gitlab.com/esr/irker/commit/190808c37d4ab5f0f16fe35352ff36863c2732d5) but the bug is still there. Making a note of it here could save someone a lot of hassle.

This could probably be worded better if someone else wants to take a stab at it.
---
 app/models/project_services/irker_service.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'app/models')

diff --git a/app/models/project_services/irker_service.rb b/app/models/project_services/irker_service.rb
index bd9b580038f..04c714bfaad 100644
--- a/app/models/project_services/irker_service.rb
+++ b/app/models/project_services/irker_service.rb
@@ -73,9 +73,10 @@ class IrkerService < Service
         'irc[s]://irc.network.net[:port]/#channel. Special cases: if '\
         'you want the channel to be a nickname instead, append ",isnick" to ' \
         'the channel name; if the channel is protected by a secret password, ' \
-        ' append "?key=secretpassword" to the URI. Note that if you specify a ' \
-        ' default IRC URI to prepend before each recipient, you can just give ' \
-        ' a channel name.'  },
+        ' append "?key=secretpassword" to the URI (Note that due to a bug, if you ' \
+        ' want to use a password, you have to omit the "#" on the channel). If you ' \
+        ' specify a default IRC URI to prepend before each recipient, you can just ' \
+        ' give a channel name.'  },
       { type: 'checkbox', name: 'colorize_messages' },
     ]
   end
-- 
cgit v1.2.1


From da40274fdc60fe17f928b80eb71c211e27523d5e Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Tue, 12 Jan 2016 20:48:16 -0500
Subject: Block the reported user before destroying the record

This is intended to prevent the user from creating new objects while the
transaction that removes them is being run, resulting in objects with
nil authors which can then not be edited.

See https://gitlab.com/gitlab-org/gitlab-ce/issues/7117
---
 app/models/abuse_report.rb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'app/models')

diff --git a/app/models/abuse_report.rb b/app/models/abuse_report.rb
index 55864236b2f..2bc15c60d57 100644
--- a/app/models/abuse_report.rb
+++ b/app/models/abuse_report.rb
@@ -19,6 +19,11 @@ class AbuseReport < ActiveRecord::Base
   validates :message, presence: true
   validates :user_id, uniqueness: true
 
+  def remove_user
+    user.block
+    user.destroy
+  end
+
   def notify
     return unless self.persisted?
 
-- 
cgit v1.2.1


From 9d7f88c12258e27a189e8229090920db0627e88b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Tue, 12 Jan 2016 18:10:06 +0100
Subject: Show referenced MRs & Issues only when the current viewer can access
 them

---
 app/models/issue.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/models')

diff --git a/app/models/issue.rb b/app/models/issue.rb
index f52e47f3e62..7beba984608 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -85,10 +85,10 @@ class Issue < ActiveRecord::Base
     reference
   end
 
-  def referenced_merge_requests
+  def referenced_merge_requests(current_user = nil)
     Gitlab::ReferenceExtractor.lazily do
       [self, *notes].flat_map do |note|
-        note.all_references.merge_requests
+        note.all_references(current_user).merge_requests
       end
     end.sort_by(&:iid)
   end
-- 
cgit v1.2.1


From d44653da1f74c2c15fe7ec3f8aa9b16563ffebd6 Mon Sep 17 00:00:00 2001
From: Tomasz Maczukin <tomasz@maczukin.pl>
Date: Wed, 13 Jan 2016 12:16:27 +0100
Subject: Add some fixes after review

---
 app/models/ci/trigger.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'app/models')

diff --git a/app/models/ci/trigger.rb b/app/models/ci/trigger.rb
index 23516709a41..3328459c4c5 100644
--- a/app/models/ci/trigger.rb
+++ b/app/models/ci/trigger.rb
@@ -32,6 +32,10 @@ module Ci
       trigger_requests.last
     end
 
+    def last_used
+      last_trigger_request.try(:created_at)
+    end
+
     def short_token
       token[0...10]
     end
-- 
cgit v1.2.1


From 5efbfa14d4666655edd6d79a3a352a134382b664 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Wed, 13 Jan 2016 16:37:17 +0100
Subject: Move complex view condition to a model method

This is moved to a model method rather than an helper method because the
API will need it too.
---
 app/models/note.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'app/models')

diff --git a/app/models/note.rb b/app/models/note.rb
index 3d5b663c99f..3e1375e5ad6 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -358,6 +358,10 @@ class Note < ActiveRecord::Base
     !system? && !is_award
   end
 
+  def cross_reference_not_visible_for?(user)
+    cross_reference? && referenced_mentionables(user).empty?
+  end
+
   # Checks if note is an award added as a comment
   #
   # If note is an award, this method sets is_award to true
-- 
cgit v1.2.1


From 6ae39c2cd1edcc845136739d42baf032120e3ddc Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Thu, 31 Dec 2015 15:56:15 -0500
Subject: Remove alert_type attribute from BroadcastMessage

---
 app/models/broadcast_message.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'app/models')

diff --git a/app/models/broadcast_message.rb b/app/models/broadcast_message.rb
index ad514706160..da0d8a2d65f 100644
--- a/app/models/broadcast_message.rb
+++ b/app/models/broadcast_message.rb
@@ -6,7 +6,6 @@
 #  message    :text             not null
 #  starts_at  :datetime
 #  ends_at    :datetime
-#  alert_type :integer
 #  created_at :datetime
 #  updated_at :datetime
 #  color      :string(255)
-- 
cgit v1.2.1


From df496fcaf08b085816a45d31d02f1ea230454b63 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Thu, 31 Dec 2015 17:07:11 -0500
Subject: Update BroadcastMessage model

- Adds default values for `color` and `font` attributes
- Adds `active?`, `started?`, `ended?`, and 'status' methods
---
 app/models/broadcast_message.rb | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

(limited to 'app/models')

diff --git a/app/models/broadcast_message.rb b/app/models/broadcast_message.rb
index da0d8a2d65f..188545f9ae5 100644
--- a/app/models/broadcast_message.rb
+++ b/app/models/broadcast_message.rb
@@ -22,7 +22,32 @@ class BroadcastMessage < ActiveRecord::Base
   validates :color, allow_blank: true, color: true
   validates :font,  allow_blank: true, color: true
 
+  default_value_for :color, '#E75E40'
+  default_value_for :font,  '#FFFFFF'
+
   def self.current
-    where("ends_at > :now AND starts_at < :now", now: Time.zone.now).last
+    where("ends_at > :now AND starts_at <= :now", now: Time.zone.now).last
+  end
+
+  def active?
+    started? && !ended?
+  end
+
+  def started?
+    Time.zone.now >= starts_at
+  end
+
+  def ended?
+    ends_at < Time.zone.now
+  end
+
+  def status
+    if active?
+      'Active'
+    elsif ended?
+      'Expired'
+    else
+      'Pending'
+    end
   end
 end
-- 
cgit v1.2.1


From 843662821ddbf2d06aa2da72ce32717cebecb7c6 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Wed, 13 Jan 2016 11:46:32 -0500
Subject: Move `BroadcastMessage#status` to a helper since it's presentational

---
 app/models/broadcast_message.rb | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'app/models')

diff --git a/app/models/broadcast_message.rb b/app/models/broadcast_message.rb
index 188545f9ae5..61119633717 100644
--- a/app/models/broadcast_message.rb
+++ b/app/models/broadcast_message.rb
@@ -40,14 +40,4 @@ class BroadcastMessage < ActiveRecord::Base
   def ended?
     ends_at < Time.zone.now
   end
-
-  def status
-    if active?
-      'Active'
-    elsif ended?
-      'Expired'
-    else
-      'Pending'
-    end
-  end
 end
-- 
cgit v1.2.1


From d11ca78cdcd761f7f9b6388474765ede51011085 Mon Sep 17 00:00:00 2001
From: DJ Mountney <dmountney@perforce.com>
Date: Wed, 13 Jan 2016 17:01:05 -0800
Subject: Fix the undefinded variable error in Project's safe_import_url method

---
 app/models/project.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/models')

diff --git a/app/models/project.rb b/app/models/project.rb
index 31990485f7d..7e131151513 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -397,7 +397,7 @@ class Project < ActiveRecord::Base
     result.password = '*****' unless result.password.nil?
     result.to_s
   rescue
-    original_url
+    self.import_url
   end
 
   def check_limit
-- 
cgit v1.2.1


From dd6fc01ff8a073880b67a323a547edeb5d63f167 Mon Sep 17 00:00:00 2001
From: Gabriel Mazetto <gabriel@gitlab.com>
Date: Thu, 14 Jan 2016 03:31:27 -0200
Subject: fixed LDAP activation on login to use new ldap_blocked state

---
 app/models/user.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/models')

diff --git a/app/models/user.rb b/app/models/user.rb
index 5eed9cf91c7..592468933ed 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -205,6 +205,7 @@ class User < ActiveRecord::Base
 
     event :activate do
       transition blocked: :active
+      transition ldap_blocked: :active
     end
 
     state :blocked, :ldap_blocked do
-- 
cgit v1.2.1


From a1cfd2754e66365f601e6ee88eb09724dd60084c Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Thu, 17 Dec 2015 09:09:46 +0100
Subject: Add `artifacts_metadata` field to `Ci::Build`

This will contain serialized array of files inside artifacts tarball.
---
 app/models/ci/build.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'app/models')

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index a4779d06de8..a2dca97ad31 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -30,6 +30,7 @@
 #  description        :string(255)
 #  artifacts_file     :text
 #  gl_project_id      :integer
+#  artifacts_metadata :text
 #
 
 module Ci
@@ -40,6 +41,7 @@ module Ci
     belongs_to :trigger_request, class_name: 'Ci::TriggerRequest'
 
     serialize :options
+    serialize :artifacts_metadata
 
     validates :coverage, numericality: true, allow_blank: true
     validates_presence_of :ref
-- 
cgit v1.2.1


From 79fe18d9e7290fb880f1feb5f2c9f3f96b2d74fe Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Thu, 17 Dec 2015 14:24:43 +0100
Subject: Move build artifacts implementation to separate controller

---
 app/models/ci/build.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/models')

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index a2dca97ad31..b928416aa11 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -326,7 +326,7 @@ module Ci
     def download_url
       if artifacts_file.exists?
         Gitlab::Application.routes.url_helpers.
-          download_namespace_project_build_path(project.namespace, project, self)
+          download_namespace_project_build_artifacts_path(project.namespace, project, self)
       end
     end
 
-- 
cgit v1.2.1


From a96d45c694bd8fe7d07283d0b46725ca8e4c281b Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Thu, 17 Dec 2015 15:17:00 +0100
Subject: Add view action to artifacts controller

---
 app/models/ci/build.rb | 2 --
 1 file changed, 2 deletions(-)

(limited to 'app/models')

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index b928416aa11..11b707e57a0 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -336,8 +336,6 @@ module Ci
       project.execute_services(build_data.dup, :build_hooks)
     end
 
-
-
     private
 
     def yaml_variables
-- 
cgit v1.2.1


From ebd69c5fc1296f30238326b901ad73c891d696da Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 28 Dec 2015 10:35:51 +0100
Subject: Remove artifacts metadata column from database

---
 app/models/ci/build.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'app/models')

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 11b707e57a0..347022ff29b 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -30,7 +30,6 @@
 #  description        :string(255)
 #  artifacts_file     :text
 #  gl_project_id      :integer
-#  artifacts_metadata :text
 #
 
 module Ci
@@ -41,7 +40,6 @@ module Ci
     belongs_to :trigger_request, class_name: 'Ci::TriggerRequest'
 
     serialize :options
-    serialize :artifacts_metadata
 
     validates :coverage, numericality: true, allow_blank: true
     validates_presence_of :ref
@@ -336,6 +334,10 @@ module Ci
       project.execute_services(build_data.dup, :build_hooks)
     end
 
+    def artifacts_metadata(path)
+      []
+    end
+
     private
 
     def yaml_variables
-- 
cgit v1.2.1


From d8cc9e4ef7da6ac971d44361546188eebfb3beff Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 28 Dec 2015 11:10:39 +0100
Subject: Add button to CI build artifacts browser into build summary

---
 app/models/ci/build.rb | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'app/models')

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 347022ff29b..c69cb661746 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -328,6 +328,13 @@ module Ci
       end
     end
 
+    def artifacts_browse_url
+      if artifacts_file.exists?
+        Gitlab::Application.routes.url_helpers.
+          browse_namespace_project_build_artifacts_path(project.namespace, project, self)
+      end
+    end
+
     def execute_hooks
       build_data = Gitlab::BuildDataBuilder.build(self)
       project.execute_hooks(build_data.dup, :build_hooks)
-- 
cgit v1.2.1


From 612ab584bf919a96eaaaf86ef474f8ffe7cbf2b2 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 28 Dec 2015 11:13:28 +0100
Subject: Mix `url_helpers` into `Ci::Build`

---
 app/models/ci/build.rb | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'app/models')

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index c69cb661746..e576f94fd4e 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -34,6 +34,7 @@
 
 module Ci
   class Build < CommitStatus
+    include Gitlab::Application.routes.url_helpers
     LAZY_ATTRIBUTES = ['trace']
 
     belongs_to :runner, class_name: 'Ci::Runner'
@@ -291,21 +292,18 @@ module Ci
     end
 
     def target_url
-      Gitlab::Application.routes.url_helpers.
-        namespace_project_build_url(project.namespace, project, self)
+      namespace_project_build_url(project.namespace, project, self)
     end
 
     def cancel_url
       if active?
-        Gitlab::Application.routes.url_helpers.
-          cancel_namespace_project_build_path(project.namespace, project, self)
+        cancel_namespace_project_build_path(project.namespace, project, self)
       end
     end
 
     def retry_url
       if retryable?
-        Gitlab::Application.routes.url_helpers.
-          retry_namespace_project_build_path(project.namespace, project, self)
+        retry_namespace_project_build_path(project.namespace, project, self)
       end
     end
 
@@ -323,15 +321,13 @@ module Ci
 
     def download_url
       if artifacts_file.exists?
-        Gitlab::Application.routes.url_helpers.
-          download_namespace_project_build_artifacts_path(project.namespace, project, self)
+        download_namespace_project_build_artifacts_path(project.namespace, project, self)
       end
     end
 
     def artifacts_browse_url
       if artifacts_file.exists?
-        Gitlab::Application.routes.url_helpers.
-          browse_namespace_project_build_artifacts_path(project.namespace, project, self)
+        browse_namespace_project_build_artifacts_path(project.namespace, project, self)
       end
     end
 
-- 
cgit v1.2.1


From 9e0e9342a47022a9caaa4a5596ec3ddb91fddc58 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 28 Dec 2015 11:21:01 +0100
Subject: Rename method that returns url to CI build artifacts download

---
 app/models/ci/build.rb      | 2 +-
 app/models/commit_status.rb | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'app/models')

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index e576f94fd4e..9adbfdd2c92 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -319,7 +319,7 @@ module Ci
       pending? && !any_runners_online?
     end
 
-    def download_url
+    def artifacts_download_url
       if artifacts_file.exists?
         download_namespace_project_build_artifacts_path(project.namespace, project, self)
       end
diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index ff479493474..4ce9b998dfc 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -131,7 +131,11 @@ class CommitStatus < ActiveRecord::Base
     false
   end
 
-  def download_url
+  def artifacts_download_url
+    nil
+  end
+
+  def artifacts_browse_url
     nil
   end
 end
-- 
cgit v1.2.1


From 8eeed761a9c25ea8ccfc347fbd3f5894b5957d9e Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 28 Dec 2015 11:43:15 +0100
Subject: Update specs for CI Build, add `artifacts?` method

`artifacts?` method checks if artifacts archive is available.
---
 app/models/ci/build.rb | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

(limited to 'app/models')

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 9adbfdd2c92..327114e0350 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -319,24 +319,26 @@ module Ci
       pending? && !any_runners_online?
     end
 
-    def artifacts_download_url
-      if artifacts_file.exists?
-        download_namespace_project_build_artifacts_path(project.namespace, project, self)
-      end
-    end
-
-    def artifacts_browse_url
-      if artifacts_file.exists?
-        browse_namespace_project_build_artifacts_path(project.namespace, project, self)
-      end
-    end
-
     def execute_hooks
       build_data = Gitlab::BuildDataBuilder.build(self)
       project.execute_hooks(build_data.dup, :build_hooks)
       project.execute_services(build_data.dup, :build_hooks)
     end
 
+    def artifacts?
+      artifacts_file.exists?
+    end
+
+    def artifacts_download_url
+      download_namespace_project_build_artifacts_path(project.namespace, project, self) if
+        artifacts?
+    end
+
+    def artifacts_browse_url
+      browse_namespace_project_build_artifacts_path(project.namespace, project, self) if
+        artifacts?
+    end
+
     def artifacts_metadata(path)
       []
     end
-- 
cgit v1.2.1


From 5ff7ec42dc8759717c485478261128d61ea70b9a Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 28 Dec 2015 12:06:27 +0100
Subject: Add method that checks if artifacts browser is supported

This is needed because of backward compatibility. Previously artifacts
archive had `.tar.gz` format, but artifacts browser requires ZIP format
now.
---
 app/models/ci/build.rb | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'app/models')

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 327114e0350..1506e957b3c 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -339,6 +339,12 @@ module Ci
         artifacts?
     end
 
+    def artifacts_browser_supported?
+      # TODO, since carrierwave 0.10.0 we will be able to check mime type here
+      #
+      artifacts? && artifacts_file.path.end_with?('zip')
+    end
+
     def artifacts_metadata(path)
       []
     end
-- 
cgit v1.2.1


From c33b105f11ce2b9232de8c7d07f810c29edd3f5b Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Tue, 29 Dec 2015 11:34:46 +0100
Subject: Make some conditions in `Ci::Build` more readable

---
 app/models/ci/build.rb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'app/models')

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 1506e957b3c..ee82fe824c5 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -330,13 +330,15 @@ module Ci
     end
 
     def artifacts_download_url
-      download_namespace_project_build_artifacts_path(project.namespace, project, self) if
-        artifacts?
+      if artifacts?
+        download_namespace_project_build_artifacts_path(project.namespace, project, self)
+      end
     end
 
     def artifacts_browse_url
-      browse_namespace_project_build_artifacts_path(project.namespace, project, self) if
-        artifacts?
+      if artifacts?
+        browse_namespace_project_build_artifacts_path(project.namespace, project, self)
+      end
     end
 
     def artifacts_browser_supported?
-- 
cgit v1.2.1


From 662f4b9e1dec8e461c4ea8da3ccc46a259d9d205 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Wed, 30 Dec 2015 14:41:44 +0100
Subject: Add artifacts metadata uploader filed

Artifacts metadata field will be used to store a filename of gzipped
file containing metadata definition for given artifacts archive.
---
 app/models/ci/build.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'app/models')

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index ee82fe824c5..98f9e6911f2 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -30,6 +30,7 @@
 #  description        :string(255)
 #  artifacts_file     :text
 #  gl_project_id      :integer
+#  artifacts_metadata :text
 #
 
 module Ci
@@ -50,6 +51,7 @@ module Ci
     scope :similar, ->(build) { where(ref: build.ref, tag: build.tag, trigger_request_id: build.trigger_request_id) }
 
     mount_uploader :artifacts_file, ArtifactUploader
+    mount_uploader :artifacts_metadata, ArtifactUploader
 
     acts_as_taggable
 
@@ -344,11 +346,11 @@ module Ci
     def artifacts_browser_supported?
       # TODO, since carrierwave 0.10.0 we will be able to check mime type here
       #
-      artifacts? && artifacts_file.path.end_with?('zip')
+      artifacts? && artifacts_file.path.end_with?('zip') && artifacts_metadata.exists?
     end
 
-    def artifacts_metadata(path)
-      []
+    def artifacts_metadata_for(path)
+      {}
     end
 
     private
-- 
cgit v1.2.1


From 447f56036e837fc9a9c2bcaf382d38dc513a9733 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Thu, 31 Dec 2015 09:25:59 +0100
Subject: Use metadata stored in artifacats metadata file

---
 app/models/ci/build.rb | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'app/models')

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 98f9e6911f2..2c389bbdf61 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -349,8 +349,23 @@ module Ci
       artifacts? && artifacts_file.path.end_with?('zip') && artifacts_metadata.exists?
     end
 
-    def artifacts_metadata_for(path)
-      {}
+    def artifacts_metadata_for_path(path)
+      return {} unless artifacts_metadata.exists?
+      metadata = []
+      meta_path = path.sub(/^\.\//, '')
+
+      File.open(artifacts_metadata.path) do |file|
+        gzip = Zlib::GzipReader.new(file)
+        gzip.each_line do |line|
+          if line =~ %r{^#{meta_path}[^/]+/?\s}
+            path, meta = line.split(' ')
+            metadata << path
+          end
+        end
+        gzip.close
+      end
+
+      metadata
     end
 
     private
-- 
cgit v1.2.1


From 3de8a4620a70c886c815576dc0a30a745cbb8ccb Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Thu, 31 Dec 2015 12:21:56 +0100
Subject: Parse artifacts metadata stored in JSON format

---
 app/models/ci/build.rb | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'app/models')

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 2c389bbdf61..f6783e21d90 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -350,22 +350,23 @@ module Ci
     end
 
     def artifacts_metadata_for_path(path)
-      return {} unless artifacts_metadata.exists?
-      metadata = []
+      return [] unless artifacts_metadata.exists?
+      paths, metadata = [], []
       meta_path = path.sub(/^\.\//, '')
 
       File.open(artifacts_metadata.path) do |file|
         gzip = Zlib::GzipReader.new(file)
         gzip.each_line do |line|
           if line =~ %r{^#{meta_path}[^/]+/?\s}
-            path, meta = line.split(' ')
-            metadata << path
+            path, meta =  line.split(' ')
+            paths << path
+            metadata << JSON.parse(meta)
           end
         end
         gzip.close
       end
 
-      metadata
+      [paths, metadata]
     end
 
     private
-- 
cgit v1.2.1


From df41148662142ce20a77b092665f48dd4dfa7bfb Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Sat, 2 Jan 2016 20:09:21 +0100
Subject: Improve path sanitization in `StringPath`

---
 app/models/ci/build.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'app/models')

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index f6783e21d90..df51a5ce079 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -352,15 +352,15 @@ module Ci
     def artifacts_metadata_for_path(path)
       return [] unless artifacts_metadata.exists?
       paths, metadata = [], []
-      meta_path = path.sub(/^\.\//, '')
 
+      metadata_path = path.sub(/^\.\//, '')
       File.open(artifacts_metadata.path) do |file|
         gzip = Zlib::GzipReader.new(file)
         gzip.each_line do |line|
-          if line =~ %r{^#{meta_path}[^/]+/?\s}
-            path, meta =  line.split(' ')
-            paths << path
-            metadata << JSON.parse(meta)
+          if line =~ %r{^#{Regexp.escape(metadata_path)}[^/\s]+/?\s}
+            matched_path, matched_meta =  line.split(' ')
+            paths << matched_path
+            metadata << JSON.parse(matched_meta)
           end
         end
         gzip.close
-- 
cgit v1.2.1


From a7f99b67a0bf1160f41ebf4dc92c618eb13a7a10 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 4 Jan 2016 13:08:49 +0100
Subject: Extract artifacts metadata implementation to separate class

---
 app/models/ci/build.rb | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

(limited to 'app/models')

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index df51a5ce079..7983ce0e88e 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -349,24 +349,10 @@ module Ci
       artifacts? && artifacts_file.path.end_with?('zip') && artifacts_metadata.exists?
     end
 
-    def artifacts_metadata_for_path(path)
-      return [] unless artifacts_metadata.exists?
-      paths, metadata = [], []
-
-      metadata_path = path.sub(/^\.\//, '')
-      File.open(artifacts_metadata.path) do |file|
-        gzip = Zlib::GzipReader.new(file)
-        gzip.each_line do |line|
-          if line =~ %r{^#{Regexp.escape(metadata_path)}[^/\s]+/?\s}
-            matched_path, matched_meta =  line.split(' ')
-            paths << matched_path
-            metadata << JSON.parse(matched_meta)
-          end
-        end
-        gzip.close
-      end
 
-      [paths, metadata]
+    def artifacts_metadata_string_path(path)
+      file = artifacts_metadata.path
+      Gitlab::Ci::Build::Artifacts::Metadata.new(file, path).to_string_path
     end
 
     private
-- 
cgit v1.2.1


From 61fb47a43202332fe9ac57847996da929ba42d3f Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Sat, 9 Jan 2016 14:41:43 +0100
Subject: Simplify implementation of build artifacts browser (refactoring)

---
 app/models/ci/build.rb | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'app/models')

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 7983ce0e88e..2d2206cc4d7 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -338,21 +338,19 @@ module Ci
     end
 
     def artifacts_browse_url
-      if artifacts?
+      if artifacts_browser_supported?
         browse_namespace_project_build_artifacts_path(project.namespace, project, self)
       end
     end
 
     def artifacts_browser_supported?
-      # TODO, since carrierwave 0.10.0 we will be able to check mime type here
-      #
       artifacts? && artifacts_file.path.end_with?('zip') && artifacts_metadata.exists?
     end
 
 
-    def artifacts_metadata_string_path(path)
-      file = artifacts_metadata.path
-      Gitlab::Ci::Build::Artifacts::Metadata.new(file, path).to_string_path
+    def artifacts_metadata_path(path)
+      metadata_file = artifacts_metadata.path
+      Gitlab::Ci::Build::Artifacts::Metadata.new(metadata_file, path).to_path
     end
 
     private
-- 
cgit v1.2.1


From 09a4a5aff8c53dd5930044ddbb285a95ef177d8a Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 11 Jan 2016 09:57:03 +0100
Subject: Render only valid paths in artifacts metadata

In this version we will support only relative paths in artifacts
metadata. Support for absolute paths will be introduced later.
---
 app/models/ci/build.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'app/models')

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 2d2206cc4d7..7593ceda488 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -347,10 +347,8 @@ module Ci
       artifacts? && artifacts_file.path.end_with?('zip') && artifacts_metadata.exists?
     end
 
-
     def artifacts_metadata_path(path)
-      metadata_file = artifacts_metadata.path
-      Gitlab::Ci::Build::Artifacts::Metadata.new(metadata_file, path).to_path
+      Gitlab::Ci::Build::Artifacts::Metadata.new(artifacts_metadata.path, path).to_path
     end
 
     private
-- 
cgit v1.2.1


From 487b0a026f9efe2d8214c19a7b95b391708ba3f4 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Tue, 12 Jan 2016 11:02:15 +0100
Subject: Improvements, readability for artifacts browser

---
 app/models/ability.rb  | 2 +-
 app/models/ci/build.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/models')

diff --git a/app/models/ability.rb b/app/models/ability.rb
index 5a1a67db8e1..5375148a654 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -175,7 +175,7 @@ class Ability
         :create_merge_request,
         :create_wiki,
         :manage_builds,
-        :download_build_artifacts,
+        :read_build_artifacts,
         :push_code
       ]
     end
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 7593ceda488..fef667f865e 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -344,7 +344,7 @@ module Ci
     end
 
     def artifacts_browser_supported?
-      artifacts? && artifacts_file.path.end_with?('zip') && artifacts_metadata.exists?
+      artifacts? && artifacts_metadata.exists?
     end
 
     def artifacts_metadata_path(path)
-- 
cgit v1.2.1


From 6b0a43aff36f0bbb9050b3c04155a3ccd9c1a75b Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Wed, 13 Jan 2016 21:17:28 +0100
Subject: Improve readability of artifacts browser `Entry` related code

---
 app/models/ci/build.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/models')

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index fef667f865e..6cc26abce66 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -347,8 +347,8 @@ module Ci
       artifacts? && artifacts_metadata.exists?
     end
 
-    def artifacts_metadata_path(path)
-      Gitlab::Ci::Build::Artifacts::Metadata.new(artifacts_metadata.path, path).to_path
+    def artifacts_metadata_entry(path)
+      Gitlab::Ci::Build::Artifacts::Metadata.new(artifacts_metadata.path, path).to_entry
     end
 
     private
-- 
cgit v1.2.1


From 2c7d9cfa7dbd4e7716793bdb1ee9e081f13c33b2 Mon Sep 17 00:00:00 2001
From: Tomasz Maczukin <tomasz@maczukin.pl>
Date: Thu, 14 Jan 2016 14:59:04 +0100
Subject: Move Ci::Build#available_statuses to AVAILABLE_STATUSES constant in
 CommitStatus

---
 app/models/ci/build.rb      | 4 ----
 app/models/commit_status.rb | 2 ++
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'app/models')

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 90d9669faca..a4779d06de8 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -97,10 +97,6 @@ module Ci
         new_build.save
         new_build
       end
-
-      def available_statuses
-        state_machines[:status].states.map &:value
-      end
     end
 
     state_machine :status, initial: :pending do
diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index ff479493474..de1e3eb7eaf 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -56,6 +56,8 @@ class CommitStatus < ActiveRecord::Base
   scope :ordered, -> { order(:ref, :stage_idx, :name) }
   scope :for_ref, ->(ref) { where(ref: ref) }
 
+  AVAILABLE_STATUSES = ['pending', 'running', 'success', 'failed', 'canceled']
+
   state_machine :status, initial: :pending do
     event :run do
       transition pending: :running
-- 
cgit v1.2.1


From aac6598482036e12a20b4c75f2a508bd6a017245 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Fri, 8 Jan 2016 14:23:45 -0200
Subject: Relax constraints for wiki slug
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Since GitHub doesn’t apply these constraints to theirs wiki slug
allowing characters like `,`, `:`, `*`, etc, we need to relax our
constraints or some wiki pages will not be available after they were
imported.

For an example the Devise project have a wiki page with the following
slug: “How To: Add sign_in, sign_out, and sign_up links to your layout
template”
---
 app/models/wiki_page.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/models')

diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index e9413c34bae..2a65f0431c4 100644
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -169,7 +169,7 @@ class WikiPage
   private
 
   def set_attributes
-    attributes[:slug] = @page.escaped_url_path
+    attributes[:slug] = @page.url_path
     attributes[:title] = @page.title
     attributes[:format] = @page.format
   end
-- 
cgit v1.2.1


From a6a5990ee5f504107944c3bba5c18dbdea9f5207 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Tue, 12 Jan 2016 02:05:18 -0200
Subject: Add Banzai::Filter::GollumTagsFilter for parsing Gollum's tags in
 HTML

---
 app/models/project_wiki.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'app/models')

diff --git a/app/models/project_wiki.rb b/app/models/project_wiki.rb
index b5fec38378b..8ce47495971 100644
--- a/app/models/project_wiki.rb
+++ b/app/models/project_wiki.rb
@@ -38,6 +38,10 @@ class ProjectWiki
     [Gitlab.config.gitlab.url, "/", path_with_namespace, ".git"].join('')
   end
 
+  def wiki_base_path
+    ["/", @project.path_with_namespace, "/wikis"].join('')
+  end
+
   # Returns the Gollum::Wiki object.
   def wiki
     @wiki ||= begin
-- 
cgit v1.2.1