From 39e54e21cb5dfaddaf4c83bc4509c951675091ea Mon Sep 17 00:00:00 2001
From: jubianchi <contact@jubianchi.fr>
Date: Sun, 18 Jan 2015 22:17:10 +0100
Subject: Handle errors on API when a project does not have a repository
 (Closes #6289)

---
 lib/api/repositories.rb | 37 +++++++++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 8 deletions(-)

(limited to 'lib')

diff --git a/lib/api/repositories.rb b/lib/api/repositories.rb
index 03a556a2c55..b259914a01c 100644
--- a/lib/api/repositories.rb
+++ b/lib/api/repositories.rb
@@ -58,11 +58,13 @@ module API
       #   ref_name (optional) - The name of a repository branch or tag, if not given the default branch is used
       # Example Request:
       #   GET /projects/:id/repository/tree
-      get ":id/repository/tree" do
+      get ':id/repository/tree' do
         ref = params[:ref_name] || user_project.try(:default_branch) || 'master'
         path = params[:path] || nil
 
         commit = user_project.repository.commit(ref)
+        not_found!('Tree') unless commit
+
         tree = user_project.repository.tree(commit.id, path)
 
         present tree.sorted_entries, with: Entities::RepoTreeObject
@@ -100,14 +102,18 @@ module API
       #   sha (required) - The blob's sha
       # Example Request:
       #   GET /projects/:id/repository/raw_blobs/:sha
-      get ":id/repository/raw_blobs/:sha" do
+      get ':id/repository/raw_blobs/:sha' do
         ref = params[:sha]
 
         repo = user_project.repository
 
-        blob = Gitlab::Git::Blob.raw(repo, ref)
+        begin
+          blob = Gitlab::Git::Blob.raw(repo, ref)
+        rescue
+          not_found! 'Blob'
+        end
 
-        not_found! "Blob" unless blob
+        not_found! 'Blob' unless blob
 
         env['api.format'] = :txt
 
@@ -122,13 +128,23 @@ module API
       #   sha (optional) - the commit sha to download defaults to the tip of the default branch
       # Example Request:
       #   GET /projects/:id/repository/archive
-      get ":id/repository/archive", requirements: { format: Gitlab::Regex.archive_formats_regex } do
+      get ':id/repository/archive',
+          requirements: { format: Gitlab::Regex.archive_formats_regex } do
         authorize! :download_code, user_project
-        file_path = ArchiveRepositoryService.new.execute(user_project, params[:sha], params[:format])
+
+        begin
+          file_path = ArchiveRepositoryService.new.execute(
+              user_project,
+              params[:sha],
+              params[:format])
+        rescue
+          not_found!('File')
+        end
 
         if file_path && File.exists?(file_path)
           data = File.open(file_path, 'rb').read
-          header["Content-Disposition"] = "attachment; filename=\"#{File.basename(file_path)}\""
+          basename = File.basename(file_path)
+          header['Content-Disposition'] = "attachment; filename=\"#{basename}\""
           content_type MIME::Types.type_for(file_path).first.content_type
           env['api.format'] = :binary
           present data
@@ -161,7 +177,12 @@ module API
       get ':id/repository/contributors' do
         authorize! :download_code, user_project
 
-        present user_project.repository.contributors, with: Entities::Contributor
+        begin
+          present user_project.repository.contributors,
+                  with: Entities::Contributor
+        rescue
+          not_found!
+        end
       end
     end
   end
-- 
cgit v1.2.1


From 103a1bb06d00c0b3ee1f0148ee8fc809f4f276f8 Mon Sep 17 00:00:00 2001
From: Marin Jankovski <maxlazio@gmail.com>
Date: Fri, 23 Jan 2015 10:28:38 -0800
Subject: Use service settings instead of config file settings to present
 issues.

---
 lib/gitlab/markdown.rb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb
index 068c342398b..5987ee8da99 100644
--- a/lib/gitlab/markdown.rb
+++ b/lib/gitlab/markdown.rb
@@ -208,7 +208,7 @@ module Gitlab
     end
 
     def reference_issue(identifier, project = @project, prefix_text = nil)
-      if project.used_default_issues_tracker? || !external_issues_tracker_enabled?
+      if project.used_default_issues_tracker? || !project.external_issues_tracker_enabled?
         if project.issue_exists? identifier
           url = url_for_issue(identifier, project)
           title = title_for_issue(identifier, project)
@@ -220,8 +220,7 @@ module Gitlab
           link_to("#{prefix_text}##{identifier}", url, options)
         end
       else
-        config = Gitlab.config
-        external_issue_tracker = config.issues_tracker[project.issues_tracker]
+        external_issue_tracker = project.external_issue_tracker
         if external_issue_tracker.present?
           reference_external_issue(identifier, external_issue_tracker, project,
                                    prefix_text)
@@ -270,7 +269,7 @@ module Gitlab
     def reference_external_issue(identifier, issue_tracker, project = @project,
                                  prefix_text = nil)
       url = url_for_issue(identifier, project)
-      title = issue_tracker['title']
+      title = issue_tracker.title
 
       options = html_options.merge(
         title: "Issue in #{title}",
-- 
cgit v1.2.1


From 7c701acf573f95cce7f8b1b7756de5d73404f09b Mon Sep 17 00:00:00 2001
From: Marin Jankovski <maxlazio@gmail.com>
Date: Fri, 23 Jan 2015 11:01:09 -0800
Subject: Do a check which issue tracker is used inside the project.

---
 lib/gitlab/markdown.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb
index 5987ee8da99..6ba7a0c18fb 100644
--- a/lib/gitlab/markdown.rb
+++ b/lib/gitlab/markdown.rb
@@ -208,7 +208,7 @@ module Gitlab
     end
 
     def reference_issue(identifier, project = @project, prefix_text = nil)
-      if project.used_default_issues_tracker? || !project.external_issues_tracker_enabled?
+      if project.using_issue_tracker?
         if project.issue_exists? identifier
           url = url_for_issue(identifier, project)
           title = title_for_issue(identifier, project)
-- 
cgit v1.2.1


From 65e700472b471242475eb9d9e3a340c6ce24615a Mon Sep 17 00:00:00 2001
From: Marin Jankovski <maxlazio@gmail.com>
Date: Mon, 26 Jan 2015 11:39:32 -0800
Subject: Update the issue tracker attribute on issue tracker change.

---
 lib/gitlab/markdown.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb
index 6ba7a0c18fb..2f041336471 100644
--- a/lib/gitlab/markdown.rb
+++ b/lib/gitlab/markdown.rb
@@ -208,7 +208,7 @@ module Gitlab
     end
 
     def reference_issue(identifier, project = @project, prefix_text = nil)
-      if project.using_issue_tracker?
+      if project.default_issues_tracker?
         if project.issue_exists? identifier
           url = url_for_issue(identifier, project)
           title = title_for_issue(identifier, project)
-- 
cgit v1.2.1


From 3e47ea5064f7e93cadb0ef347dfa27517552a4a0 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 26 Jan 2015 13:31:20 -0800
Subject: Files::CreateService can now commit file to empty repository

---
 lib/gitlab/satellite/files/new_file_action.rb | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/gitlab/satellite/files/new_file_action.rb b/lib/gitlab/satellite/files/new_file_action.rb
index 15e9b7a6f77..c230239d390 100644
--- a/lib/gitlab/satellite/files/new_file_action.rb
+++ b/lib/gitlab/satellite/files/new_file_action.rb
@@ -14,7 +14,14 @@ module Gitlab
           prepare_satellite!(repo)
 
           # create target branch in satellite at the corresponding commit from bare repo
-          repo.git.checkout({raise: true, timeout: true, b: true}, ref, "origin/#{ref}")
+          current_ref =
+            if repo.commits.any?
+              repo.git.checkout({raise: true, timeout: true, b: true}, ref, "origin/#{ref}")
+              ref
+            else
+              # skip this step if we want to add first file to empty repo
+              Satellite::PARKING_BRANCH
+            end
 
           file_path_in_satellite = File.join(repo.working_dir, file_path)
           dir_name_in_satellite = File.dirname(file_path_in_satellite)
@@ -38,10 +45,9 @@ module Gitlab
           # will raise CommandFailed when commit fails
           repo.git.commit(raise: true, timeout: true, a: true, m: commit_message)
 
-
           # push commit back to bare repo
           # will raise CommandFailed when push fails
-          repo.git.push({raise: true, timeout: true}, :origin, ref)
+          repo.git.push({raise: true, timeout: true}, :origin, "#{current_ref}:#{ref}")
 
           # everything worked
           true
-- 
cgit v1.2.1


From c916124178645412a554a6b8b39c05bbd42269c8 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 26 Jan 2015 15:01:51 -0800
Subject: Explicitly set before_filter for ref-related controllers

---
 lib/extracts_path.rb | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'lib')

diff --git a/lib/extracts_path.rb b/lib/extracts_path.rb
index e51cb30bdd9..19215cfb7e6 100644
--- a/lib/extracts_path.rb
+++ b/lib/extracts_path.rb
@@ -1,17 +1,9 @@
 # Module providing methods for dealing with separating a tree-ish string and a
 # file path string when combined in a request parameter
 module ExtractsPath
-  extend ActiveSupport::Concern
-
   # Raised when given an invalid file path
   class InvalidPathError < StandardError; end
 
-  included do
-    if respond_to?(:before_filter)
-      before_filter :assign_ref_vars
-    end
-  end
-
   # Given a string containing both a Git tree-ish, such as a branch or tag, and
   # a filesystem path joined by forward slashes, attempts to separate the two.
   #
-- 
cgit v1.2.1


From 00a0d5aeeaf19ea4d72fd1890afac099026f1706 Mon Sep 17 00:00:00 2001
From: Marin Jankovski <maxlazio@gmail.com>
Date: Mon, 26 Jan 2015 16:24:11 -0800
Subject: Move repetition to the parent.

---
 lib/gitlab/markdown.rb | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb
index 2f041336471..c0e83fb3078 100644
--- a/lib/gitlab/markdown.rb
+++ b/lib/gitlab/markdown.rb
@@ -220,9 +220,8 @@ module Gitlab
           link_to("#{prefix_text}##{identifier}", url, options)
         end
       else
-        external_issue_tracker = project.external_issue_tracker
-        if external_issue_tracker.present?
-          reference_external_issue(identifier, external_issue_tracker, project,
+        if project.external_issue_tracker.present?
+          reference_external_issue(identifier, project,
                                    prefix_text)
         end
       end
@@ -266,10 +265,10 @@ module Gitlab
       end
     end
 
-    def reference_external_issue(identifier, issue_tracker, project = @project,
+    def reference_external_issue(identifier, project = @project,
                                  prefix_text = nil)
       url = url_for_issue(identifier, project)
-      title = issue_tracker.title
+      title = project.external_issue_tracker.title
 
       options = html_options.merge(
         title: "Issue in #{title}",
-- 
cgit v1.2.1


From a3d879d427c1236d26832dcd0312b3e0d6158bbe Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 26 Jan 2015 20:57:42 -0800
Subject: Refactor web editor

---
 lib/gitlab/satellite/files/new_file_action.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/gitlab/satellite/files/new_file_action.rb b/lib/gitlab/satellite/files/new_file_action.rb
index c230239d390..5b657c7aba2 100644
--- a/lib/gitlab/satellite/files/new_file_action.rb
+++ b/lib/gitlab/satellite/files/new_file_action.rb
@@ -15,12 +15,12 @@ module Gitlab
 
           # create target branch in satellite at the corresponding commit from bare repo
           current_ref =
-            if repo.commits.any?
-              repo.git.checkout({raise: true, timeout: true, b: true}, ref, "origin/#{ref}")
-              ref
-            else
+            if @project.empty_repo?
               # skip this step if we want to add first file to empty repo
               Satellite::PARKING_BRANCH
+            else
+              repo.git.checkout({raise: true, timeout: true, b: true}, ref, "origin/#{ref}")
+              ref
             end
 
           file_path_in_satellite = File.join(repo.working_dir, file_path)
-- 
cgit v1.2.1


From 54f6d8c7b5a1c67a222011c35ad70909da0e686d Mon Sep 17 00:00:00 2001
From: Valery Sizov <valery@gitlab.com>
Date: Tue, 27 Jan 2015 15:37:19 -0800
Subject: an ability to clone project with oauth2 token

---
 lib/gitlab/backend/grack_auth.rb | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/gitlab/backend/grack_auth.rb b/lib/gitlab/backend/grack_auth.rb
index 1f71906bc8e..2e393f753e8 100644
--- a/lib/gitlab/backend/grack_auth.rb
+++ b/lib/gitlab/backend/grack_auth.rb
@@ -34,7 +34,7 @@ module Grack
     def auth!
       if @auth.provided?
         return bad_request unless @auth.basic?
-
+        
         # Authentication with username and password
         login, password = @auth.credentials
 
@@ -71,8 +71,20 @@ module Grack
       false
     end
 
+    def oauth_access_token_check(login, password)
+      if login == "oauth2" && git_cmd == 'git-upload-pack' && password.present?
+        token = Doorkeeper::AccessToken.by_token(password)
+        token && token.accessible? && User.find_by(id: token.resource_owner_id)
+      end
+    end
+
     def authenticate_user(login, password)
       user = Gitlab::Auth.new.find(login, password)
+      
+      unless user
+        user = oauth_access_token_check(login, password)
+      end
+      
       return user if user.present?
 
       # At this point, we know the credentials were wrong. We let Rack::Attack
-- 
cgit v1.2.1


From 792ced2f4190226c3335967a8e5a30d3b72bd4ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Rosen=C3=B6gger?= <123haynes@gmail.com>
Date: Wed, 28 Jan 2015 22:18:22 +0100
Subject: Add a commit calendar to the user profile

---
 lib/gitlab/commits_calendar.rb | 79 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 lib/gitlab/commits_calendar.rb

(limited to 'lib')

diff --git a/lib/gitlab/commits_calendar.rb b/lib/gitlab/commits_calendar.rb
new file mode 100644
index 00000000000..a862e67a598
--- /dev/null
+++ b/lib/gitlab/commits_calendar.rb
@@ -0,0 +1,79 @@
+module Gitlab
+  class CommitsCalendar
+    def self.create_timestamp(repositories, user, show_activity)
+      timestamps = {}
+      repositories.each do |raw_repository|
+        if raw_repository.exists?
+          commits_log = raw_repository.commits_log_of_user_by_date(user)
+
+          populated_timestamps =
+            if show_activity
+              populate_timestamps_by_project(
+                commits_log,
+                timestamps,
+                raw_repository
+              )
+            else
+              populate_timestamps(commits_log, timestamps)
+            end
+          timestamps.merge!(populated_timestamps)
+        end
+      end
+      timestamps
+    end
+
+    def self.populate_timestamps(commits_log, timestamps)
+      commits_log.each do |timestamp_date, commits_count|
+        hash = { "#{timestamp_date}" => commits_count }
+        if timestamps.has_key?("#{timestamp_date}")
+          timestamps.merge!(hash) do |timestamp_date, commits_count,
+            new_commits_count| commits_count = commits_count.to_i +
+            new_commits_count
+          end
+        else
+          timestamps.merge!(hash)
+        end
+      end
+      timestamps
+    end
+
+    def self.populate_timestamps_by_project(commits_log, timestamps,
+                                            project)
+      commits_log.each do |timestamp_date, commits_count|
+        if timestamps.has_key?("#{timestamp_date}")
+          timestamps["#{timestamp_date}"].
+            merge!(project.path_with_namespace => commits_count)
+        else
+          hash = { "#{timestamp_date}" => { project.path_with_namespace =>
+                                            commits_count } }
+          timestamps.merge!(hash)
+        end
+      end
+      timestamps
+    end
+
+    def self.latest_commit_date(timestamps)
+      if timestamps.nil? || timestamps.empty?
+        DateTime.now.to_date
+      else
+        Time.at(timestamps.keys.first.to_i).to_date
+      end
+    end
+
+    def self.starting_year(timestamps)
+       DateTime.now.to_date - 1
+    end
+
+    def self.starting_month(timestamps)
+       Date.today.strftime("%m").to_i
+    end
+
+    def self.last_commit_date(timestamps)
+      latest_commit_date(timestamps).to_formatted_s(:long).to_s
+    end
+
+    def self.commit_activity_match(user_activities, date)
+      user_activities.select { |x| Time.at(x.to_i) == Time.parse(date) }
+    end
+  end
+end
-- 
cgit v1.2.1


From 953c1fff8f242f09f3f16998112931d48d6a5ecc Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 28 Jan 2015 17:00:40 -0800
Subject: Be more careful with parsing changes from gitlab-shell

---
 lib/gitlab/git_access.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/gitlab/git_access.rb b/lib/gitlab/git_access.rb
index c7bf2efc628..ea96d04c5ab 100644
--- a/lib/gitlab/git_access.rb
+++ b/lib/gitlab/git_access.rb
@@ -73,7 +73,7 @@ module Gitlab
       changes = changes.lines if changes.kind_of?(String)
 
       # Iterate over all changes to find if user allowed all of them to be applied
-      changes.each do |change|
+      changes.map(&:strip).reject(&:blank?).each do |change|
         status = change_access_check(user, project, change)
         unless status.allowed?
           # If user does not have access to make at least one change - cancel all push
-- 
cgit v1.2.1


From c39f80bdb412bc9cc7646de0929efe8cb5b870d4 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 28 Jan 2015 23:00:41 -0800
Subject: Refactor commit calendar a bit. Fixed dates

---
 lib/gitlab/commits_calendar.rb | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'lib')

diff --git a/lib/gitlab/commits_calendar.rb b/lib/gitlab/commits_calendar.rb
index a862e67a598..93256187fd2 100644
--- a/lib/gitlab/commits_calendar.rb
+++ b/lib/gitlab/commits_calendar.rb
@@ -60,14 +60,6 @@ module Gitlab
       end
     end
 
-    def self.starting_year(timestamps)
-       DateTime.now.to_date - 1
-    end
-
-    def self.starting_month(timestamps)
-       Date.today.strftime("%m").to_i
-    end
-
     def self.last_commit_date(timestamps)
       latest_commit_date(timestamps).to_formatted_s(:long).to_s
     end
-- 
cgit v1.2.1


From a9288e554e55e843b95ab6f8109a4c610af64c83 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 29 Jan 2015 00:53:43 -0800
Subject: Cleanup and make contribution calendar faster

---
 lib/gitlab/commits_calendar.rb | 72 ++++++++----------------------------------
 1 file changed, 13 insertions(+), 59 deletions(-)

(limited to 'lib')

diff --git a/lib/gitlab/commits_calendar.rb b/lib/gitlab/commits_calendar.rb
index 93256187fd2..b6699c585f6 100644
--- a/lib/gitlab/commits_calendar.rb
+++ b/lib/gitlab/commits_calendar.rb
@@ -1,71 +1,25 @@
 module Gitlab
   class CommitsCalendar
-    def self.create_timestamp(repositories, user, show_activity)
-      timestamps = {}
-      repositories.each do |raw_repository|
-        if raw_repository.exists?
-          commits_log = raw_repository.commits_log_of_user_by_date(user)
+    attr_reader :timestamps
 
-          populated_timestamps =
-            if show_activity
-              populate_timestamps_by_project(
-                commits_log,
-                timestamps,
-                raw_repository
-              )
-            else
-              populate_timestamps(commits_log, timestamps)
-            end
-          timestamps.merge!(populated_timestamps)
-        end
-      end
-      timestamps
-    end
+    def initialize(repositories, user)
+      @timestamps = {}
+      date_timestamps = []
 
-    def self.populate_timestamps(commits_log, timestamps)
-      commits_log.each do |timestamp_date, commits_count|
-        hash = { "#{timestamp_date}" => commits_count }
-        if timestamps.has_key?("#{timestamp_date}")
-          timestamps.merge!(hash) do |timestamp_date, commits_count,
-            new_commits_count| commits_count = commits_count.to_i +
-            new_commits_count
-          end
-        else
-          timestamps.merge!(hash)
-        end
+      repositories.select(&:exists?).reject(&:empty?).each do |raw_repository|
+        commits_log = raw_repository.commits_per_day_for_user(user)
+        date_timestamps << commits_log
       end
-      timestamps
-    end
 
-    def self.populate_timestamps_by_project(commits_log, timestamps,
-                                            project)
-      commits_log.each do |timestamp_date, commits_count|
-        if timestamps.has_key?("#{timestamp_date}")
-          timestamps["#{timestamp_date}"].
-            merge!(project.path_with_namespace => commits_count)
-        else
-          hash = { "#{timestamp_date}" => { project.path_with_namespace =>
-                                            commits_count } }
-          timestamps.merge!(hash)
-        end
+      date_timestamps = date_timestamps.inject do |collection, date|
+        collection.merge(date) { |k, old_v, new_v| old_v + new_v }
       end
-      timestamps
-    end
 
-    def self.latest_commit_date(timestamps)
-      if timestamps.nil? || timestamps.empty?
-        DateTime.now.to_date
-      else
-        Time.at(timestamps.keys.first.to_i).to_date
+      date_timestamps ||= []
+      date_timestamps.each do |date, commits|
+        timestamp = Date.parse(date).to_time.to_i.to_s
+        @timestamps[timestamp] = commits
       end
     end
-
-    def self.last_commit_date(timestamps)
-      latest_commit_date(timestamps).to_formatted_s(:long).to_s
-    end
-
-    def self.commit_activity_match(user_activities, date)
-      user_activities.select { |x| Time.at(x.to_i) == Time.parse(date) }
-    end
   end
 end
-- 
cgit v1.2.1


From c9f18d4587f16eb16b8b902d69576520c08b7f5a Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 29 Jan 2015 01:03:20 -0800
Subject: Make sure we dont have exception on date parsing

---
 lib/gitlab/commits_calendar.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/gitlab/commits_calendar.rb b/lib/gitlab/commits_calendar.rb
index b6699c585f6..ccc80d080af 100644
--- a/lib/gitlab/commits_calendar.rb
+++ b/lib/gitlab/commits_calendar.rb
@@ -17,8 +17,8 @@ module Gitlab
 
       date_timestamps ||= []
       date_timestamps.each do |date, commits|
-        timestamp = Date.parse(date).to_time.to_i.to_s
-        @timestamps[timestamp] = commits
+        timestamp = Date.parse(date).to_time.to_i.to_s rescue nil
+        @timestamps[timestamp] = commits if timestamp
       end
     end
   end
-- 
cgit v1.2.1


From ca701a964971a3291270e60669757c9853e3cf66 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 29 Jan 2015 13:28:41 -0800
Subject: Improvements to LDAP::User model

* method #changed? also tracks changes of identites (fixes issue with email mapping)
* find ldap identity before initialize one
---
 lib/gitlab/ldap/user.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/gitlab/ldap/user.rb b/lib/gitlab/ldap/user.rb
index 3ef494ba137..cfa8692659d 100644
--- a/lib/gitlab/ldap/user.rb
+++ b/lib/gitlab/ldap/user.rb
@@ -40,12 +40,16 @@ module Gitlab
 
       def update_user_attributes
         gl_user.email = auth_hash.email
-        gl_user.identities.build(provider: auth_hash.provider, extern_uid: auth_hash.uid)
+
+        # Build new identity only if we dont have have same one
+        gl_user.identities.find_or_initialize_by(provider: auth_hash.provider,
+                                                 extern_uid: auth_hash.uid)
+
         gl_user
       end
 
       def changed?
-        gl_user.changed?
+        gl_user.changed? || gl_user.identities.any?(&:changed?)
       end
 
       def needs_blocking?
-- 
cgit v1.2.1