From b75f6c68e591b1a6a279c454b7c5d1f6f8ecbbf8 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Fri, 22 Jan 2016 11:42:29 +0100
Subject: Add tests for clicking a row in build artifacts browser

---
 features/project/builds/artifacts.feature  |  9 +++++++++
 features/steps/project/builds/artifacts.rb | 10 ++++++++++
 2 files changed, 19 insertions(+)

diff --git a/features/project/builds/artifacts.feature b/features/project/builds/artifacts.feature
index 1185854453a..52dc15f2eb6 100644
--- a/features/project/builds/artifacts.feature
+++ b/features/project/builds/artifacts.feature
@@ -51,3 +51,12 @@ Feature: Project Builds Artifacts
     And I click artifacts browse button
     And I click a link to file within build artifacts
     Then download of a file extracted from build artifacts should start
+
+  @javascript
+  Scenario: I click on a row in an artifacts table
+    Given recent build has artifacts available
+    And recent build has artifacts metadata available
+    When I visit recent build details page
+    And I click artifacts browse button
+    And I click a first row within build artifacts table
+    Then page with a coresponding path is loading
diff --git a/features/steps/project/builds/artifacts.rb b/features/steps/project/builds/artifacts.rb
index 25f2f4e837c..1bdb57af9d1 100644
--- a/features/steps/project/builds/artifacts.rb
+++ b/features/steps/project/builds/artifacts.rb
@@ -73,4 +73,14 @@ class Spinach::Features::ProjectBuildsArtifacts < Spinach::FeatureSteps
     expect(response_json[:archive]).to end_with('build_artifacts.zip')
     expect(response_json[:entry]).to eq Base64.encode64('ci_artifacts.txt')
   end
+
+  step 'I click a first row within build artifacts table' do
+    row = first('tr[data-link]')
+    @row_path = row['data-link']
+    row.click
+  end
+
+  step 'page with a coresponding path is loading' do
+    expect(current_path).to eq @row_path
+  end
 end
-- 
cgit v1.2.1


From a7c4d0da8c7a340efd7b92718cd0f9436f2ec56f Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sat, 23 Jan 2016 16:08:15 -0800
Subject: Make the `/groups` route behave as expected

The route is supposed to redirect the Groups#index request based on
whether or not a user was logged in. If they are, we redirect them to
their groups dashboard; if they're not, we redirect them to the public
Explore page.

But due to overly aggressive `before_action`s that weren't excluding the
`index` action, the request always resulted in a 404, whether a user was
logged in or not.

Closes #12660
---
 app/controllers/groups_controller.rb       |  9 +++++----
 spec/controllers/groups_controller_spec.rb | 23 +++++++++++++++++++++++
 2 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 spec/controllers/groups_controller_spec.rb

diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index fb26a4e6fc3..f7c9e619755 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -2,17 +2,18 @@ class GroupsController < Groups::ApplicationController
   include IssuesAction
   include MergeRequestsAction
 
-  skip_before_action :authenticate_user!, only: [:show, :issues, :merge_requests]
   respond_to :html
-  before_action :group, except: [:new, :create]
+
+  skip_before_action :authenticate_user!, only: [:index, :show, :issues, :merge_requests]
+  before_action :group, except: [:index, :new, :create]
 
   # Authorize
-  before_action :authorize_read_group!, except: [:show, :new, :create, :autocomplete]
+  before_action :authorize_read_group!, except: [:index, :show, :new, :create, :autocomplete]
   before_action :authorize_admin_group!, only: [:edit, :update, :destroy, :projects]
   before_action :authorize_create_group!, only: [:new, :create]
 
   # Load group projects
-  before_action :load_projects, except: [:new, :create, :projects, :edit, :update, :autocomplete]
+  before_action :load_projects, except: [:index, :new, :create, :projects, :edit, :update, :autocomplete]
   before_action :event_filter, only: :show
 
   layout :determine_layout
diff --git a/spec/controllers/groups_controller_spec.rb b/spec/controllers/groups_controller_spec.rb
new file mode 100644
index 00000000000..938e97298b6
--- /dev/null
+++ b/spec/controllers/groups_controller_spec.rb
@@ -0,0 +1,23 @@
+require 'rails_helper'
+
+describe GroupsController do
+  describe 'GET index' do
+    context 'as a user' do
+      it 'redirects to Groups Dashboard' do
+        sign_in(create(:user))
+
+        get :index
+
+        expect(response).to redirect_to(dashboard_groups_path)
+      end
+    end
+
+    context 'as a guest' do
+      it 'redirects to Explore Groups' do
+        get :index
+
+        expect(response).to redirect_to(explore_groups_path)
+      end
+    end
+  end
+end
-- 
cgit v1.2.1


From 2e911721d2d288a4b2015a55dedd19b2313a452f Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sun, 24 Jan 2016 15:06:46 -0800
Subject: Update text_color_for_bg helper to support RGB triplet color codes

Closes #12677
---
 app/helpers/labels_helper.rb       | 6 +++++-
 spec/helpers/labels_helper_spec.rb | 5 +++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb
index a2c3d4d2f32..92eac0560bd 100644
--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
@@ -83,7 +83,11 @@ module LabelsHelper
   end
 
   def text_color_for_bg(bg_color)
-    r, g, b = bg_color.slice(1,7).scan(/.{2}/).map(&:hex)
+    if bg_color.length == 4
+      r, g, b = bg_color[1, 4].scan(/./).map { |v| (v * 2).hex }
+    else
+      r, g, b = bg_color[1, 7].scan(/.{2}/).map(&:hex)
+    end
 
     if (r + g + b) > 500
       '#333333'
diff --git a/spec/helpers/labels_helper_spec.rb b/spec/helpers/labels_helper_spec.rb
index 0c8d06b7059..0b9176357bc 100644
--- a/spec/helpers/labels_helper_spec.rb
+++ b/spec/helpers/labels_helper_spec.rb
@@ -66,5 +66,10 @@ describe LabelsHelper do
     it 'uses dark text on light backgrounds' do
       expect(text_color_for_bg('#EEEEEE')).to eq('#333333')
     end
+
+    it 'supports RGB triplets' do
+      expect(text_color_for_bg('#FFF')).to eq '#333333'
+      expect(text_color_for_bg('#000')).to eq '#FFFFFF'
+    end
   end
 end
-- 
cgit v1.2.1


From 446fed4d83c4d0a6f1f7bd1930d884636eda0be5 Mon Sep 17 00:00:00 2001
From: Valery Sizov <valery@gitlab.com>
Date: Mon, 25 Jan 2016 16:52:00 +0200
Subject: monkey patch for mysql 5.7

---
 config/initializers/monkey_patch.rb | 48 +++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 config/initializers/monkey_patch.rb

diff --git a/config/initializers/monkey_patch.rb b/config/initializers/monkey_patch.rb
new file mode 100644
index 00000000000..62b05a55285
--- /dev/null
+++ b/config/initializers/monkey_patch.rb
@@ -0,0 +1,48 @@
+## This patch is from rails 4.2-stable. Remove it when 4.2.6 is released
+## https://github.com/rails/rails/issues/21108
+
+module ActiveRecord
+  module ConnectionAdapters
+    class AbstractMysqlAdapter < AbstractAdapter
+      # SHOW VARIABLES LIKE 'name'
+      def show_variable(name)
+        variables = select_all("select @@#{name} as 'Value'", 'SCHEMA')
+        variables.first['Value'] unless variables.empty?
+      rescue ActiveRecord::StatementInvalid
+        nil
+      end
+
+      
+      # MySQL is too stupid to create a temporary table for use subquery, so we have
+      # to give it some prompting in the form of a subsubquery. Ugh!
+      def subquery_for(key, select)
+        subsubselect = select.clone
+        subsubselect.projections = [key]
+
+        subselect = Arel::SelectManager.new(select.engine)
+        subselect.project Arel.sql(key.name)
+        # Materialized subquery by adding distinct
+        # to work with MySQL 5.7.6 which sets optimizer_switch='derived_merge=on'
+        subselect.from subsubselect.distinct.as('__active_record_temp')
+      end
+    end
+  end
+end
+
+module ActiveRecord
+  module ConnectionAdapters
+    class MysqlAdapter < AbstractMysqlAdapter
+      ADAPTER_NAME = 'MySQL'.freeze
+
+      # Get the client encoding for this database
+      def client_encoding
+        return @client_encoding if @client_encoding
+
+        result = exec_query(
+          "select @@character_set_client",
+          'SCHEMA')
+        @client_encoding = ENCODINGS[result.rows.last.last]
+      end
+    end
+  end
+end
-- 
cgit v1.2.1


From 6dd88e090e94f7f36fafd3e35c35a2868f89eebe Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Thu, 21 Jan 2016 16:09:32 -0200
Subject: Extract Projects::ImportService service from RepositoryImportWorker

---
 app/services/projects/import_service.rb       |  71 +++++++++++++++++
 app/workers/repository_import_worker.rb       |  46 ++---------
 spec/services/projects/import_service_spec.rb | 106 ++++++++++++++++++++++++++
 3 files changed, 184 insertions(+), 39 deletions(-)
 create mode 100644 app/services/projects/import_service.rb
 create mode 100644 spec/services/projects/import_service_spec.rb

diff --git a/app/services/projects/import_service.rb b/app/services/projects/import_service.rb
new file mode 100644
index 00000000000..7a9508ef085
--- /dev/null
+++ b/app/services/projects/import_service.rb
@@ -0,0 +1,71 @@
+module Projects
+  class ImportService < BaseService
+    include Gitlab::ShellAdapter
+
+    class Error < StandardError; end
+
+    ALLOWED_TYPES = [
+      'bitbucket',
+      'fogbugz',
+      'gitlab',
+      'github',
+      'google_code'
+    ]
+
+    def execute
+      if unknown_url?
+        # In this case, we only want to import issues, not a repository.
+        create_repository
+      else
+        import_repository
+      end
+
+      import_data
+
+      success
+    rescue Error => e
+      error(e.message)
+    end
+
+    private
+
+    def create_repository
+      unless project.create_repository
+        raise Error, 'The repository could not be created.'
+      end
+    end
+
+    def import_repository
+      begin
+        gitlab_shell.import_repository(project.path_with_namespace, project.import_url)
+      rescue Gitlab::Shell::Error => e
+        raise Error, e.message
+      end
+    end
+
+    def import_data
+      return unless has_importer?
+
+      unless importer.execute
+        raise Error, 'The remote data could not be imported.'
+      end
+
+      if project.import_type == 'bitbucket'
+        Gitlab::BitbucketImport::KeyDeleter.new(project).execute
+      end
+    end
+
+    def has_importer?
+      ALLOWED_TYPES.include?(project.import_type)
+    end
+
+    def importer
+      class_name = "Gitlab::#{project.import_type.camelize}Import::Importer"
+      class_name.constantize.new(project)
+    end
+
+    def unknown_url?
+      project.import_url == Project::UNKNOWN_IMPORT_URL
+    end
+  end
+end
diff --git a/app/workers/repository_import_worker.rb b/app/workers/repository_import_worker.rb
index d18c0706b30..e295a9ddd14 100644
--- a/app/workers/repository_import_worker.rb
+++ b/app/workers/repository_import_worker.rb
@@ -4,52 +4,20 @@ class RepositoryImportWorker
 
   sidekiq_options queue: :gitlab_shell
 
-  def perform(project_id)
-    project = Project.find(project_id)
+  attr_accessor :project, :current_user
 
-    if project.import_url == Project::UNKNOWN_IMPORT_URL
-      # In this case, we only want to import issues, not a repository.
-      unless project.create_repository
-        project.update(import_error: "The repository could not be created.")
-        project.import_fail
-        return
-      end
-    else
-      begin
-        gitlab_shell.import_repository(project.path_with_namespace, project.import_url)
-      rescue Gitlab::Shell::Error => e
-        project.update(import_error: e.message)
-        project.import_fail
-        return
-      end
-    end
+  def perform(project_id)
+    @project = Project.find(project_id)
+    @current_user = @project.creator
 
-    data_import_result =
-      case project.import_type
-      when 'github'
-        Gitlab::GithubImport::Importer.new(project).execute
-      when 'gitlab'
-        Gitlab::GitlabImport::Importer.new(project).execute
-      when 'bitbucket'
-        Gitlab::BitbucketImport::Importer.new(project).execute
-      when 'google_code'
-        Gitlab::GoogleCodeImport::Importer.new(project).execute
-      when 'fogbugz'
-        Gitlab::FogbugzImport::Importer.new(project).execute
-      else
-        true
-      end
+    result = Projects::ImportService.new(project, current_user).execute
 
-    unless data_import_result
-      project.update(import_error: "The remote issue data could not be imported.")
+    if result[:status] == :error
+      project.update(import_error: result[:message])
       project.import_fail
       return
     end
 
-    if project.import_type == 'bitbucket'
-      Gitlab::BitbucketImport::KeyDeleter.new(project).execute
-    end
-
     project.import_finish
   end
 end
diff --git a/spec/services/projects/import_service_spec.rb b/spec/services/projects/import_service_spec.rb
new file mode 100644
index 00000000000..04f474c736c
--- /dev/null
+++ b/spec/services/projects/import_service_spec.rb
@@ -0,0 +1,106 @@
+require 'spec_helper'
+
+describe Projects::ImportService, services: true do
+  let!(:project) { create(:empty_project) }
+  let(:user) { project.creator }
+
+  subject { described_class.new(project, user) }
+
+  describe '#execute' do
+    context 'with unknown url' do
+      before do
+        project.import_url = Project::UNKNOWN_IMPORT_URL
+      end
+
+      it 'succeeds if repository is created successfully' do
+        expect(project).to receive(:create_repository).and_return(true)
+
+        result = subject.execute
+
+        expect(result[:status]).to eq :success
+      end
+
+      it 'fails if repository creation fails' do
+        expect(project).to receive(:create_repository).and_return(false)
+
+        result = subject.execute
+
+        expect(result[:status]).to eq :error
+        expect(result[:message]).to eq 'The repository could not be created.'
+      end
+    end
+
+    context 'with known url' do
+      before do
+        project.import_url = 'https://github.com/vim/vim.git'
+      end
+
+      it 'succeeds if repository import is successfully' do
+        expect_any_instance_of(Gitlab::Shell).to receive(:import_repository).with(project.path_with_namespace, project.import_url).and_return(true)
+
+        result = subject.execute
+
+        expect(result[:status]).to eq :success
+      end
+
+      it 'fails if repository import fails' do
+        expect_any_instance_of(Gitlab::Shell).to receive(:import_repository).with(project.path_with_namespace, project.import_url).and_raise(Gitlab::Shell::Error.new('Failed to import the repository'))
+
+        result = subject.execute
+
+        expect(result[:status]).to eq :error
+        expect(result[:message]).to eq 'Failed to import the repository'
+      end
+    end
+
+    context 'with valid importer' do
+      before do
+        stub_github_omniauth_provider
+
+        project.import_url = 'https://github.com/vim/vim.git'
+        project.import_type = 'github'
+
+        allow(project).to receive(:import_data).and_return(double.as_null_object)
+      end
+
+      it 'succeeds if importer succeeds' do
+        expect_any_instance_of(Gitlab::Shell).to receive(:import_repository).with(project.path_with_namespace, project.import_url).and_return(true)
+        expect_any_instance_of(Gitlab::GithubImport::Importer).to receive(:execute).and_return(true)
+
+        result = subject.execute
+
+        expect(result[:status]).to eq :success
+      end
+
+      it 'fails if importer fails' do
+        expect_any_instance_of(Gitlab::Shell).to receive(:import_repository).with(project.path_with_namespace, project.import_url).and_return(true)
+        expect_any_instance_of(Gitlab::GithubImport::Importer).to receive(:execute).and_return(false)
+
+        result = subject.execute
+
+        expect(result[:status]).to eq :error
+        expect(result[:message]).to eq 'The remote data could not be imported.'
+      end
+
+      it 'fails if importer raise an error' do
+        expect_any_instance_of(Gitlab::Shell).to receive(:import_repository).with(project.path_with_namespace, project.import_url).and_return(true)
+        expect_any_instance_of(Gitlab::GithubImport::Importer).to receive(:execute).and_raise(Projects::ImportService::Error.new('Github: failed to connect API'))
+
+        result = subject.execute
+
+        expect(result[:status]).to eq :error
+        expect(result[:message]).to eq 'Github: failed to connect API'
+      end
+    end
+
+    def stub_github_omniauth_provider
+      provider = OpenStruct.new(
+        name: 'github',
+        app_id: 'asd123',
+        app_secret: 'asd123'
+      )
+
+      Gitlab.config.omniauth.providers << provider
+    end
+  end
+end
-- 
cgit v1.2.1


From 28aa7158118d73e60a86e8986e499e13197c4069 Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Mon, 25 Jan 2016 22:34:34 -0500
Subject: Clicks the edit button instead of opening the dropdown

Fixes #2307
---
 app/assets/javascripts/shortcuts_issuable.coffee | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/shortcuts_issuable.coffee b/app/assets/javascripts/shortcuts_issuable.coffee
index bb532194682..f717a753cf8 100644
--- a/app/assets/javascripts/shortcuts_issuable.coffee
+++ b/app/assets/javascripts/shortcuts_issuable.coffee
@@ -5,11 +5,11 @@ class @ShortcutsIssuable extends ShortcutsNavigation
   constructor: (isMergeRequest) ->
     super()
     Mousetrap.bind('a', ->
-      $('.js-assignee').select2('open')
+      $('.block.assignee .edit-link').trigger('click')
       return false
     )
     Mousetrap.bind('m', ->
-      $('.js-milestone').select2('open')
+      $('.block.milestone .edit-link').trigger('click')
       return false
     )
     Mousetrap.bind('r', =>
-- 
cgit v1.2.1


From 5e88d7357f48bec823c27abb0776aa217672d979 Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Mon, 25 Jan 2016 23:51:40 -0500
Subject: Placeholder now visible completely. Fixes #2498

---
 app/assets/stylesheets/pages/groups.scss | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/assets/stylesheets/pages/groups.scss b/app/assets/stylesheets/pages/groups.scss
index 263993f59a5..fdd86979a36 100644
--- a/app/assets/stylesheets/pages/groups.scss
+++ b/app/assets/stylesheets/pages/groups.scss
@@ -1,5 +1,15 @@
 .member-search-form {
   float: left;
+
+  input[type='search'] {
+    width: 225px;
+    vertical-align: bottom;
+    
+    @media (max-width: $screen-xs-max) {
+      width: 100px;
+      vertical-align: bottom;
+    }
+  }
 }
 
 .milestone-row {
-- 
cgit v1.2.1


From 8d397862cd90f39cc70dd775d613635a542ab72c Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Sat, 23 Jan 2016 19:33:18 +0100
Subject: Use generic method to checks if artifacts are available

---
 app/views/projects/commit_statuses/_commit_status.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/projects/commit_statuses/_commit_status.html.haml b/app/views/projects/commit_statuses/_commit_status.html.haml
index 1736dccaf3c..2e3c956ddc4 100644
--- a/app/views/projects/commit_statuses/_commit_status.html.haml
+++ b/app/views/projects/commit_statuses/_commit_status.html.haml
@@ -66,7 +66,7 @@
 
   %td
     .pull-right
-      - if current_user && can?(current_user, :read_build_artifacts, commit_status.project) && commit_status.artifacts?
+      - if current_user && can?(current_user, :read_build_artifacts, commit_status.project) && commit_status.artifacts_download_url
         = link_to commit_status.artifacts_download_url, title: 'Download artifacts' do
           %i.fa.fa-download
       - if current_user && can?(current_user, :manage_builds, commit_status.project)
-- 
cgit v1.2.1


From 5583b9526baa17b3f2e86322ee36fc1f94b322dd Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Tue, 26 Jan 2016 08:32:36 +0100
Subject: Add specs for build created using generic commit status

---
 spec/factories/commit_statuses.rb |   9 ++-
 spec/features/commits_spec.rb     | 127 ++++++++++++++++++++++----------------
 2 files changed, 81 insertions(+), 55 deletions(-)

diff --git a/spec/factories/commit_statuses.rb b/spec/factories/commit_statuses.rb
index 8898b71e2a3..45b11edcef3 100644
--- a/spec/factories/commit_statuses.rb
+++ b/spec/factories/commit_statuses.rb
@@ -1,11 +1,16 @@
 FactoryGirl.define do
   factory :commit_status, class: CommitStatus do
-    started_at 'Di 29. Okt 09:51:28 CET 2013'
-    finished_at 'Di 29. Okt 09:53:28 CET 2013'
     name 'default'
+    ref 'master'
     status 'success'
     description 'commit status'
     commit factory: :ci_commit_with_one_job
+    started_at 'Tue, 26 Jan 2016 08:23:42 +0100'
+    finished_at 'Tue, 26 Jan 2016 08:23:42 +0100'
+
+    after(:build) do |build, evaluator|
+      build.project = build.commit.project
+    end
 
     factory :generic_commit_status, class: GenericCommitStatus do
       name 'generic'
diff --git a/spec/features/commits_spec.rb b/spec/features/commits_spec.rb
index fe7f07f5b75..5a62da10619 100644
--- a/spec/features/commits_spec.rb
+++ b/spec/features/commits_spec.rb
@@ -16,83 +16,104 @@ describe 'Commits' do
       FactoryGirl.create :ci_commit, project: project, sha: project.commit.sha
     end
 
-    let!(:build) { FactoryGirl.create :ci_build, commit: commit }
+    context 'commit status is Generic Commit Status' do
+      let!(:status) { FactoryGirl.create :generic_commit_status, commit: commit }
 
-    describe 'Project commits' do
-      before do
-        visit namespace_project_commits_path(project.namespace, project, :master)
-      end
+      describe 'Commit builds' do
+        before do
+          visit ci_status_path(commit)
+        end
 
-      it 'should show build status' do
-        page.within("//li[@id='commit-#{commit.short_sha}']") do
-          expect(page).to have_css(".ci-status-link")
+        it { expect(page).to have_content commit.sha[0..7] }
+
+        it 'contains generic commit status build' do
+          page.within('.table-holder') do
+            expect(page).to have_content "##{status.id}" # build id
+            expect(page).to have_content 'generic'       # build name
+          end
         end
       end
     end
 
-    describe 'Commit builds' do
-      before do
-        visit ci_status_path(commit)
-      end
-
-      it { expect(page).to have_content commit.sha[0..7] }
-      it { expect(page).to have_content commit.git_commit_message }
-      it { expect(page).to have_content commit.git_author_name }
-    end
+    context 'commit status is Ci Build' do
+      let!(:build) { FactoryGirl.create :ci_build, commit: commit }
 
-    context 'Download artifacts' do
-      let(:artifacts_file) { fixture_file_upload(Rails.root + 'spec/fixtures/banana_sample.gif', 'image/gif') }
+      describe 'Project commits' do
+        before do
+          visit namespace_project_commits_path(project.namespace, project, :master)
+        end
 
-      before do
-        build.update_attributes(artifacts_file: artifacts_file)
+        it 'should show build status' do
+          page.within("//li[@id='commit-#{commit.short_sha}']") do
+            expect(page).to have_css(".ci-status-link")
+          end
+        end
       end
 
-      it do
-        visit ci_status_path(commit)
-        click_on 'Download artifacts'
-        expect(page.response_headers['Content-Type']).to eq(artifacts_file.content_type)
-      end
-    end
+      describe 'Commit builds' do
+        before do
+          visit ci_status_path(commit)
+        end
 
-    describe 'Cancel all builds' do
-      it 'cancels commit' do
-        visit ci_status_path(commit)
-        click_on 'Cancel running'
-        expect(page).to have_content 'canceled'
+        it { expect(page).to have_content commit.sha[0..7] }
+        it { expect(page).to have_content commit.git_commit_message }
+        it { expect(page).to have_content commit.git_author_name }
       end
-    end
 
-    describe 'Cancel build' do
-      it 'cancels build' do
-        visit ci_status_path(commit)
-        click_on 'Cancel'
-        expect(page).to have_content 'canceled'
-      end
-    end
+      context 'Download artifacts' do
+        let(:artifacts_file) { fixture_file_upload(Rails.root + 'spec/fixtures/banana_sample.gif', 'image/gif') }
+
+        before do
+          build.update_attributes(artifacts_file: artifacts_file)
+        end
 
-    describe '.gitlab-ci.yml not found warning' do
-      context 'ci builds enabled' do
-        it "does not show warning" do
+        it do
           visit ci_status_path(commit)
-          expect(page).not_to have_content '.gitlab-ci.yml not found in this commit'
+          click_on 'Download artifacts'
+          expect(page.response_headers['Content-Type']).to eq(artifacts_file.content_type)
         end
+      end
 
-        it 'shows warning' do
-          stub_ci_commit_yaml_file(nil)
+      describe 'Cancel all builds' do
+        it 'cancels commit' do
           visit ci_status_path(commit)
-          expect(page).to have_content '.gitlab-ci.yml not found in this commit'
+          click_on 'Cancel running'
+          expect(page).to have_content 'canceled'
         end
       end
 
-      context 'ci builds disabled' do
-        before do
-          stub_ci_builds_disabled
-          stub_ci_commit_yaml_file(nil)
+      describe 'Cancel build' do
+        it 'cancels build' do
           visit ci_status_path(commit)
+          click_on 'Cancel'
+          expect(page).to have_content 'canceled'
         end
+      end
+
+      describe '.gitlab-ci.yml not found warning' do
+        context 'ci builds enabled' do
+          it "does not show warning" do
+            visit ci_status_path(commit)
+            expect(page).not_to have_content '.gitlab-ci.yml not found in this commit'
+          end
+
+          it 'shows warning' do
+            stub_ci_commit_yaml_file(nil)
+            visit ci_status_path(commit)
+            expect(page).to have_content '.gitlab-ci.yml not found in this commit'
+          end
+        end
+
+        context 'ci builds disabled' do
+          before do
+            stub_ci_builds_disabled
+            stub_ci_commit_yaml_file(nil)
+            visit ci_status_path(commit)
+          end
 
-        it 'does not show warning' do
-          expect(page).not_to have_content '.gitlab-ci.yml not found in this commit'
+          it 'does not show warning' do
+            expect(page).not_to have_content '.gitlab-ci.yml not found in this commit'
+          end
         end
       end
     end
-- 
cgit v1.2.1


From 88d59d0161ac2f4890cfe77bb81c687a561b17ac Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Tue, 26 Jan 2016 08:36:54 +0100
Subject: Add Changelog entry for undefined method fix in commit builds

---
 CHANGELOG | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 8d1f8d59b3c..ed018e5ebbb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,9 @@ v 8.5.0 (unreleased)
   - Whitelist raw "abbr" elements when parsing Markdown (Benedict Etzel)
   - Don't vendor minified JS
 
+v 8.4.2 (unreleased)
+  - Fix method undefined when using external commit status in builds
+
 v 8.4.1
   - Apply security updates for Rails (4.2.5.1), rails-html-sanitizer (1.0.3),
     and Nokogiri (1.6.7.2)
-- 
cgit v1.2.1


From 89154880e56c34e94cdd7326c6cfc67bdb256f74 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <mail@zjvandeweg.nl>
Date: Tue, 26 Jan 2016 09:45:12 +0100
Subject: Save button on app settings now btn-save

---
 app/views/admin/application_settings/_form.html.haml | 2 +-
 app/views/admin/applications/_form.html.haml         | 2 +-
 app/views/admin/groups/_form.html.haml               | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml
index c4020c8273b..dde35f8742a 100644
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -268,4 +268,4 @@
         = f.text_field :sentry_dsn, class: 'form-control'
 
   .form-actions
-    = f.submit 'Save', class: 'btn btn-primary'
+    = f.submit 'Save', class: 'btn btn-save'
diff --git a/app/views/admin/applications/_form.html.haml b/app/views/admin/applications/_form.html.haml
index fa4e6335c73..e18f7b499dd 100644
--- a/app/views/admin/applications/_form.html.haml
+++ b/app/views/admin/applications/_form.html.haml
@@ -22,5 +22,5 @@
           %code= Doorkeeper.configuration.native_redirect_uri
           for local tests
   .form-actions
-    = f.submit 'Submit', class: "btn btn-primary wide"
+    = f.submit 'Submit', class: "btn btn-save wide"
     = link_to "Cancel", admin_applications_path, class: "btn btn-default"
diff --git a/app/views/admin/groups/_form.html.haml b/app/views/admin/groups/_form.html.haml
index 8de2ba74a79..198026a1f75 100644
--- a/app/views/admin/groups/_form.html.haml
+++ b/app/views/admin/groups/_form.html.haml
@@ -21,6 +21,5 @@
 
   - else
     .form-actions
-      = f.submit 'Save changes', class: "btn btn-primary"
+      = f.submit 'Save changes', class: "btn btn-save"
       = link_to  'Cancel', admin_group_path(@group), class: "btn btn-cancel"
-
-- 
cgit v1.2.1


From c0403234193dcb2033bd57160bb0ab6893bb8d77 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Thu, 21 Jan 2016 16:53:34 -0200
Subject: Move Gitlab::BitbucketImport::KeyDeleter to it's own importer

---
 app/services/projects/import_service.rb |  4 ---
 lib/gitlab/bitbucket_import/importer.rb | 47 ++++++++++++++++++++-------------
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/app/services/projects/import_service.rb b/app/services/projects/import_service.rb
index 7a9508ef085..2015897dd19 100644
--- a/app/services/projects/import_service.rb
+++ b/app/services/projects/import_service.rb
@@ -49,10 +49,6 @@ module Projects
       unless importer.execute
         raise Error, 'The remote data could not be imported.'
       end
-
-      if project.import_type == 'bitbucket'
-        Gitlab::BitbucketImport::KeyDeleter.new(project).execute
-      end
     end
 
     def has_importer?
diff --git a/lib/gitlab/bitbucket_import/importer.rb b/lib/gitlab/bitbucket_import/importer.rb
index 2355b3c6ddc..e8c6d89764c 100644
--- a/lib/gitlab/bitbucket_import/importer.rb
+++ b/lib/gitlab/bitbucket_import/importer.rb
@@ -13,12 +13,34 @@ module Gitlab
       end
 
       def execute
-        project_identifier = project.import_source
+        import_issues if has_issues?
 
-        return true unless client.project(project_identifier)["has_issues"]
+        true
+      ensure
+        Gitlab::BitbucketImport::KeyDeleter.new(project).execute
+      end
 
-        #Issues && Comments
-        issues = client.issues(project_identifier)
+      private
+
+      def gl_user_id(project, bitbucket_id)
+        if bitbucket_id
+          user = User.joins(:identities).find_by("identities.extern_uid = ? AND identities.provider = 'bitbucket'", bitbucket_id.to_s)
+          (user && user.id) || project.creator_id
+        else
+          project.creator_id
+        end
+      end
+
+      def identifier
+        project.import_source
+      end
+
+      def has_issues?
+        client.project(identifier)["has_issues"]
+      end
+
+      def import_issues
+        issues = client.issues(identifier)
 
         issues.each do |issue|
           body = ''
@@ -33,7 +55,7 @@ module Gitlab
           body = @formatter.author_line(author)
           body += issue["content"]
 
-          comments = client.issue_comments(project_identifier, issue["local_id"])
+          comments = client.issue_comments(identifier, issue["local_id"])
 
           if comments.any?
             body += @formatter.comments_header
@@ -56,20 +78,9 @@ module Gitlab
             author_id: gl_user_id(project, reporter)
           )
         end
-
-        true
+      rescue ActiveRecord::RecordInvalid => e
+        raise Projects::ImportService::Error, e.message
       end
-
-      private
-
-      def gl_user_id(project, bitbucket_id)
-        if bitbucket_id
-          user = User.joins(:identities).find_by("identities.extern_uid = ? AND identities.provider = 'bitbucket'", bitbucket_id.to_s)
-          (user && user.id) || project.creator_id
-        else
-          project.creator_id
-        end
-       end
     end
   end
 end
-- 
cgit v1.2.1


From b58a2e30b214ffc98f492aab88137cc3fd48355d Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Fri, 22 Jan 2016 13:00:00 -0200
Subject: Wrap errors on GitHub importer to raise
 Projects::ImportService::Error

---
 lib/gitlab/bitbucket_import/importer.rb |  2 ++
 lib/gitlab/github_import/importer.rb    | 17 ++++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/lib/gitlab/bitbucket_import/importer.rb b/lib/gitlab/bitbucket_import/importer.rb
index e8c6d89764c..3f483847efa 100644
--- a/lib/gitlab/bitbucket_import/importer.rb
+++ b/lib/gitlab/bitbucket_import/importer.rb
@@ -16,6 +16,8 @@ module Gitlab
         import_issues if has_issues?
 
         true
+      rescue ActiveRecord::RecordInvalid => e
+        raise Projects::ImportService::Error.new, e.message
       ensure
         Gitlab::BitbucketImport::KeyDeleter.new(project).execute
       end
diff --git a/lib/gitlab/github_import/importer.rb b/lib/gitlab/github_import/importer.rb
index 663402e8197..e2a85f29825 100644
--- a/lib/gitlab/github_import/importer.rb
+++ b/lib/gitlab/github_import/importer.rb
@@ -35,8 +35,8 @@ module Gitlab
         end
 
         true
-      rescue ActiveRecord::RecordInvalid
-        false
+      rescue ActiveRecord::RecordInvalid => e
+        raise Projects::ImportService::Error, e.message
       end
 
       def import_pull_requests
@@ -53,8 +53,8 @@ module Gitlab
         end
 
         true
-      rescue ActiveRecord::RecordInvalid
-        false
+      rescue ActiveRecord::RecordInvalid => e
+        raise Projects::ImportService::Error, e.message
       end
 
       def import_comments(issue_number, noteable)
@@ -83,10 +83,13 @@ module Gitlab
 
         true
       rescue Gitlab::Shell::Error => e
-        if e.message =~ /repository not exported/
-          true
+        # GitHub error message when the wiki repo has not been created,
+        # this means that repo has wiki enabled, but have no pages. So,
+        # we can skip the import.
+        if e.message !~ /repository not exported/
+          raise Projects::ImportService::Error, e.message
         else
-          false
+          true
         end
       end
     end
-- 
cgit v1.2.1


From 4941f64653eb336ec1b9e05fb184199a9b2a7836 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Fri, 22 Jan 2016 13:00:40 -0200
Subject: Update CHANGELOG

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index b3b4aa380d5..5505f2dbd9c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@ v 8.5.0 (unreleased)
   - Fix diff comments loaded by AJAX to load comment with diff in discussion tab
   - Whitelist raw "abbr" elements when parsing Markdown (Benedict Etzel)
   - Don't vendor minified JS
+  - Track project import failure
 
 v 8.4.0
   - Allow LDAP users to change their email if it was not set by the LDAP server
-- 
cgit v1.2.1


From a14089485ff697d58dddb61e6da2d1b6c64a803e Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Tue, 26 Jan 2016 08:45:18 -0500
Subject: Styles for file list change.

New download btn WIP.
---
 app/assets/stylesheets/framework/buttons.scss      |  4 ++
 app/assets/stylesheets/pages/tree.scss             |  6 +++
 .../repositories/_download_archive.html.haml       | 60 +++++++++-------------
 app/views/projects/tree/show.html.haml             |  3 +-
 4 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss
index c99292c3f83..64854a67678 100644
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -191,3 +191,7 @@
     @include btn-green
   }
 }
+
+.btn-icon {
+  
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss
index 6a6dd7dfc85..4ff549ade1f 100644
--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
@@ -14,9 +14,15 @@
   .tree-table {
     margin-bottom: 0;
 
+    tr:nth-child(odd) {
+      background-color: #F7F9FB;
+    }
+
     tr {
       > td, > th {
         line-height: 26px;
+        border-top: 1px solid #EEF0F2;
+        border-bottom: 1px solid #EEF0F2;
       }
 
       &:hover {
diff --git a/app/views/projects/repositories/_download_archive.html.haml b/app/views/projects/repositories/_download_archive.html.haml
index b9486a9b492..fb4250be901 100644
--- a/app/views/projects/repositories/_download_archive.html.haml
+++ b/app/views/projects/repositories/_download_archive.html.haml
@@ -1,37 +1,27 @@
 - ref = ref || nil
 - btn_class = btn_class || ''
-- split_button = split_button || false
-- if split_button == true
-  %span.btn-group{class: btn_class}
-    = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'zip'), class: 'btn col-xs-10', rel: 'nofollow' do
-      %i.fa.fa-download
-      %span Download zip
-    %a.col-xs-2.btn.dropdown-toggle{ 'data-toggle' => 'dropdown' }
-      %span.caret
-      %span.sr-only
-        Select Archive Format
-    %ul.col-xs-10.dropdown-menu{ role: 'menu' }
-      %li
-        = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'zip'), rel: 'nofollow' do
-          %i.fa.fa-download
-          %span Download zip
-      %li
-        = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'tar.gz'), rel: 'nofollow' do
-          %i.fa.fa-download
-          %span Download tar.gz
-      %li
-        = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'tar.bz2'), rel: 'nofollow' do
-          %i.fa.fa-download
-          %span Download tar.bz2
-      %li
-        = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'tar'), rel: 'nofollow' do
-          %i.fa.fa-download
-          %span Download tar
-- else
-  %span.btn-group{class: btn_class}
-    = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'zip'), class: 'btn', rel: 'nofollow' do
-      %i.fa.fa-download
-      %span zip
-    = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'tar.gz'), class: 'btn', rel: 'nofollow' do
-      %i.fa.fa-download
-      %span tar.gz
+
+.btn-group
+  %button.btn.dropdown-toggle{ 'data-toggle' => 'dropdown', class: btn_class }
+    =icon('download')
+    Download
+    %span.caret
+    %span.sr-only
+      Select Archive Format
+  %ul.col-xs-10.dropdown-menu{ role: 'menu' }
+    %li
+      = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'zip'), rel: 'nofollow' do
+        %i.fa.fa-download
+        %span Download zip
+    %li
+      = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'tar.gz'), rel: 'nofollow' do
+        %i.fa.fa-download
+        %span Download tar.gz
+    %li
+      = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'tar.bz2'), rel: 'nofollow' do
+        %i.fa.fa-download
+        %span Download tar.bz2
+    %li
+      = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'tar'), rel: 'nofollow' do
+        %i.fa.fa-download
+        %span Download tar
\ No newline at end of file
diff --git a/app/views/projects/tree/show.html.haml b/app/views/projects/tree/show.html.haml
index 91fb2a44594..3e9256f6d5f 100644
--- a/app/views/projects/tree/show.html.haml
+++ b/app/views/projects/tree/show.html.haml
@@ -6,9 +6,8 @@
 = render 'projects/last_push'
 
 .tree-controls
-  = render 'projects/find_file_link'
   - if can? current_user, :download_code, @project
-    = render 'projects/repositories/download_archive', ref: @ref, btn_class: 'hidden-xs hidden-sm btn-grouped', split_button: true
+    = render 'projects/repositories/download_archive', ref: @ref, btn_class: 'hidden-xs hidden-sm btn-grouped btn-success'
 
 #tree-holder.tree-holder.clearfix
   .nav-block
-- 
cgit v1.2.1


From c10296f92d581f54cbd32c156806ad72eddcab77 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <mail@zjvandeweg.nl>
Date: Tue, 26 Jan 2016 09:36:13 +0100
Subject: Fix visibility level texts on application settings

Introduced by me through !2005
---
 CHANGELOG                                            | 1 +
 app/views/admin/application_settings/_form.html.haml | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 2a4b32f2519..858c5dd96a2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,7 @@ v 8.5.0 (unreleased)
   - Whitelist raw "abbr" elements when parsing Markdown (Benedict Etzel)
   - Don't vendor minified JS
   - Track project import failure
+  - Fix visibility level text in admin area (Zeger-Jan van de Weg)
 
 v 8.4.1
   - Apply security updates for Rails (4.2.5.1), rails-html-sanitizer (1.0.3),
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml
index dde35f8742a..baadca09518 100644
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -14,11 +14,11 @@
     .form-group.project-visibility-level-holder
       = f.label :default_project_visibility, class: 'control-label col-sm-2'
       .col-sm-10
-        = render('shared/visibility_radios', model_method: :default_project_visibility, form: f, selected_level: @application_setting.default_project_visibility, form_model: Project)
+        = render('shared/visibility_radios', model_method: :default_project_visibility, form: f, selected_level: @application_setting.default_project_visibility, form_model: Project.new)
     .form-group.project-visibility-level-holder
       = f.label :default_snippet_visibility, class: 'control-label col-sm-2'
       .col-sm-10
-        = render('shared/visibility_radios', model_method: :default_snippet_visibility, form: f, selected_level: @application_setting.default_snippet_visibility, form_model: PersonalSnippet)
+        = render('shared/visibility_radios', model_method: :default_snippet_visibility, form: f, selected_level: @application_setting.default_snippet_visibility, form_model: ProjectSnippet.new)
     .form-group
       = f.label :restricted_visibility_levels, class: 'control-label col-sm-2'
       .col-sm-10
-- 
cgit v1.2.1


From 966176512797f037eb933691a2a21a8c3bb280b7 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Tue, 26 Jan 2016 15:23:57 +0100
Subject: Update commit status factory to reflect recent changes

---
 spec/factories/commit_statuses.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/spec/factories/commit_statuses.rb b/spec/factories/commit_statuses.rb
index 45b11edcef3..b7c2b32cb13 100644
--- a/spec/factories/commit_statuses.rb
+++ b/spec/factories/commit_statuses.rb
@@ -1,11 +1,10 @@
 FactoryGirl.define do
   factory :commit_status, class: CommitStatus do
     name 'default'
-    ref 'master'
     status 'success'
     description 'commit status'
     commit factory: :ci_commit_with_one_job
-    started_at 'Tue, 26 Jan 2016 08:23:42 +0100'
+    started_at 'Tue, 26 Jan 2016 08:21:42 +0100'
     finished_at 'Tue, 26 Jan 2016 08:23:42 +0100'
 
     after(:build) do |build, evaluator|
-- 
cgit v1.2.1


From 111834883d287c89a24ae395900786d771214bdb Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Tue, 26 Jan 2016 11:20:18 -0500
Subject: Adjusts styles of table tree

Fixes #12725
---
 app/assets/stylesheets/framework/buttons.scss |  7 +++--
 app/assets/stylesheets/pages/tree.scss        | 37 ++++++++++++++++++++++-----
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss
index 64854a67678..0e67e35b606 100644
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -127,6 +127,9 @@
     &.btn-xs {
       margin-right: 3px;
     }
+    i {
+      font-size: 11px;
+    }
   }
   &.disabled {
     pointer-events: auto !important;
@@ -190,8 +193,4 @@
   .btn-green {
     @include btn-green
   }
-}
-
-.btn-icon {
-  
 }
\ No newline at end of file
diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss
index 4ff549ade1f..ab12f2d55e0 100644
--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
@@ -1,6 +1,12 @@
 .tree-holder {
   > .nav-block {
-    margin: 11px 0;
+    margin: 22px 0 0 0;
+    background: #F8FAFC;
+    padding: 9px 9px 4px 14px;
+    border: 1px solid #EBECF0;
+    border-top-left-radius: 3px;
+    border-top-right-radius: 3px;
+    border-bottom-width: 0;
   }
 
   .file-finder {
@@ -13,7 +19,18 @@
 
   .tree-table {
     margin-bottom: 0;
-
+    border: 1px solid #EEF0F2;
+    thead {
+      th {
+        background-color: white;
+
+        &:last-child {
+          .light {
+            color: #8C9AAC;
+          }
+        }
+      }
+    }
     tr:nth-child(odd) {
       background-color: #F7F9FB;
     }
@@ -28,8 +45,6 @@
       &:hover {
         td {
           background: $hover;
-          border-top: 1px solid #ADF;
-          border-bottom: 1px solid #ADF;
         }
         cursor: pointer;
       }
@@ -48,10 +63,14 @@
       max-width: 320px;
       vertical-align: middle;
 
-      i, a {
+      a {
         color: $gl-link-color;
       }
 
+      i {
+        color: #797B7D;
+      }
+
       img {
         position: relative;
         top:-1px;
@@ -60,10 +79,16 @@
 
     .tree_commit {
       max-width: 320px;
+      a {
+        color: #8C9AAC;
+      }
     }
 
     .tree_time_ago {
       min-width: 135px;
+      time {
+        color: #8C9AAC;
+      }
     }
   }
 
@@ -129,5 +154,5 @@
 
 .tree-controls {
   float: right;
-  margin-top: 11px;
+  margin: 32px 7px 0 0;
 }
-- 
cgit v1.2.1


From 9a1ec97fc47c7d621d3b3332a21c9c9be589ab79 Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Tue, 26 Jan 2016 11:52:09 -0500
Subject: Revert "Adjusts styles of table tree"

This reverts commit 111834883d287c89a24ae395900786d771214bdb.
---
 app/assets/stylesheets/framework/buttons.scss |  7 ++---
 app/assets/stylesheets/pages/tree.scss        | 37 +++++----------------------
 2 files changed, 10 insertions(+), 34 deletions(-)

diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss
index 0e67e35b606..64854a67678 100644
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -127,9 +127,6 @@
     &.btn-xs {
       margin-right: 3px;
     }
-    i {
-      font-size: 11px;
-    }
   }
   &.disabled {
     pointer-events: auto !important;
@@ -193,4 +190,8 @@
   .btn-green {
     @include btn-green
   }
+}
+
+.btn-icon {
+  
 }
\ No newline at end of file
diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss
index ab12f2d55e0..4ff549ade1f 100644
--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
@@ -1,12 +1,6 @@
 .tree-holder {
   > .nav-block {
-    margin: 22px 0 0 0;
-    background: #F8FAFC;
-    padding: 9px 9px 4px 14px;
-    border: 1px solid #EBECF0;
-    border-top-left-radius: 3px;
-    border-top-right-radius: 3px;
-    border-bottom-width: 0;
+    margin: 11px 0;
   }
 
   .file-finder {
@@ -19,18 +13,7 @@
 
   .tree-table {
     margin-bottom: 0;
-    border: 1px solid #EEF0F2;
-    thead {
-      th {
-        background-color: white;
-
-        &:last-child {
-          .light {
-            color: #8C9AAC;
-          }
-        }
-      }
-    }
+
     tr:nth-child(odd) {
       background-color: #F7F9FB;
     }
@@ -45,6 +28,8 @@
       &:hover {
         td {
           background: $hover;
+          border-top: 1px solid #ADF;
+          border-bottom: 1px solid #ADF;
         }
         cursor: pointer;
       }
@@ -63,14 +48,10 @@
       max-width: 320px;
       vertical-align: middle;
 
-      a {
+      i, a {
         color: $gl-link-color;
       }
 
-      i {
-        color: #797B7D;
-      }
-
       img {
         position: relative;
         top:-1px;
@@ -79,16 +60,10 @@
 
     .tree_commit {
       max-width: 320px;
-      a {
-        color: #8C9AAC;
-      }
     }
 
     .tree_time_ago {
       min-width: 135px;
-      time {
-        color: #8C9AAC;
-      }
     }
   }
 
@@ -154,5 +129,5 @@
 
 .tree-controls {
   float: right;
-  margin: 32px 7px 0 0;
+  margin-top: 11px;
 }
-- 
cgit v1.2.1


From 2b98b7faa10d235734d53c15e1c6f47c88db871f Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Tue, 26 Jan 2016 11:52:30 -0500
Subject: Revert "Styles for file list change."

This reverts commit a14089485ff697d58dddb61e6da2d1b6c64a803e.
---
 app/assets/stylesheets/framework/buttons.scss      |  4 --
 app/assets/stylesheets/pages/tree.scss             |  6 ---
 .../repositories/_download_archive.html.haml       | 60 +++++++++++++---------
 app/views/projects/tree/show.html.haml             |  3 +-
 4 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss
index 64854a67678..c99292c3f83 100644
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -191,7 +191,3 @@
     @include btn-green
   }
 }
-
-.btn-icon {
-  
-}
\ No newline at end of file
diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss
index 4ff549ade1f..6a6dd7dfc85 100644
--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
@@ -14,15 +14,9 @@
   .tree-table {
     margin-bottom: 0;
 
-    tr:nth-child(odd) {
-      background-color: #F7F9FB;
-    }
-
     tr {
       > td, > th {
         line-height: 26px;
-        border-top: 1px solid #EEF0F2;
-        border-bottom: 1px solid #EEF0F2;
       }
 
       &:hover {
diff --git a/app/views/projects/repositories/_download_archive.html.haml b/app/views/projects/repositories/_download_archive.html.haml
index fb4250be901..b9486a9b492 100644
--- a/app/views/projects/repositories/_download_archive.html.haml
+++ b/app/views/projects/repositories/_download_archive.html.haml
@@ -1,27 +1,37 @@
 - ref = ref || nil
 - btn_class = btn_class || ''
-
-.btn-group
-  %button.btn.dropdown-toggle{ 'data-toggle' => 'dropdown', class: btn_class }
-    =icon('download')
-    Download
-    %span.caret
-    %span.sr-only
-      Select Archive Format
-  %ul.col-xs-10.dropdown-menu{ role: 'menu' }
-    %li
-      = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'zip'), rel: 'nofollow' do
-        %i.fa.fa-download
-        %span Download zip
-    %li
-      = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'tar.gz'), rel: 'nofollow' do
-        %i.fa.fa-download
-        %span Download tar.gz
-    %li
-      = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'tar.bz2'), rel: 'nofollow' do
-        %i.fa.fa-download
-        %span Download tar.bz2
-    %li
-      = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'tar'), rel: 'nofollow' do
-        %i.fa.fa-download
-        %span Download tar
\ No newline at end of file
+- split_button = split_button || false
+- if split_button == true
+  %span.btn-group{class: btn_class}
+    = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'zip'), class: 'btn col-xs-10', rel: 'nofollow' do
+      %i.fa.fa-download
+      %span Download zip
+    %a.col-xs-2.btn.dropdown-toggle{ 'data-toggle' => 'dropdown' }
+      %span.caret
+      %span.sr-only
+        Select Archive Format
+    %ul.col-xs-10.dropdown-menu{ role: 'menu' }
+      %li
+        = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'zip'), rel: 'nofollow' do
+          %i.fa.fa-download
+          %span Download zip
+      %li
+        = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'tar.gz'), rel: 'nofollow' do
+          %i.fa.fa-download
+          %span Download tar.gz
+      %li
+        = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'tar.bz2'), rel: 'nofollow' do
+          %i.fa.fa-download
+          %span Download tar.bz2
+      %li
+        = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'tar'), rel: 'nofollow' do
+          %i.fa.fa-download
+          %span Download tar
+- else
+  %span.btn-group{class: btn_class}
+    = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'zip'), class: 'btn', rel: 'nofollow' do
+      %i.fa.fa-download
+      %span zip
+    = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'tar.gz'), class: 'btn', rel: 'nofollow' do
+      %i.fa.fa-download
+      %span tar.gz
diff --git a/app/views/projects/tree/show.html.haml b/app/views/projects/tree/show.html.haml
index 3e9256f6d5f..91fb2a44594 100644
--- a/app/views/projects/tree/show.html.haml
+++ b/app/views/projects/tree/show.html.haml
@@ -6,8 +6,9 @@
 = render 'projects/last_push'
 
 .tree-controls
+  = render 'projects/find_file_link'
   - if can? current_user, :download_code, @project
-    = render 'projects/repositories/download_archive', ref: @ref, btn_class: 'hidden-xs hidden-sm btn-grouped btn-success'
+    = render 'projects/repositories/download_archive', ref: @ref, btn_class: 'hidden-xs hidden-sm btn-grouped', split_button: true
 
 #tree-holder.tree-holder.clearfix
   .nav-block
-- 
cgit v1.2.1


From dd60590a3c90d5d12c4aba8a78338da5dd85310f Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Tue, 26 Jan 2016 11:54:31 -0500
Subject: Fix border color.

Uses `$border-color`
---
 app/assets/stylesheets/pages/tree.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss
index 6a6dd7dfc85..11e6d67a082 100644
--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
@@ -17,6 +17,7 @@
     tr {
       > td, > th {
         line-height: 26px;
+        border-bottom: 1px solid $border-color;
       }
 
       &:hover {
-- 
cgit v1.2.1


From 224c3197e159ea37e730f8b277a2bebe6f9ace03 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Tue, 26 Jan 2016 17:57:06 +0100
Subject: Bump Workhorse version to 0.6.2

Fix for #12634 has been introduced in gitlab-org/gitlab-workhorse!34.
---
 GITLAB_WORKHORSE_VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GITLAB_WORKHORSE_VERSION b/GITLAB_WORKHORSE_VERSION
index ee6cdce3c29..b6160487433 100644
--- a/GITLAB_WORKHORSE_VERSION
+++ b/GITLAB_WORKHORSE_VERSION
@@ -1 +1 @@
-0.6.1
+0.6.2
-- 
cgit v1.2.1


From 33af1478439b06810ed09260d7393e891ac5c07e Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Tue, 26 Jan 2016 18:01:34 +0100
Subject: Add Changelog entry for missing artifacts in browser fix

This has been fixed in Workhorse [ci skip]
---
 CHANGELOG | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 858c5dd96a2..e20330cd60a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,9 @@ v 8.5.0 (unreleased)
   - Track project import failure
   - Fix visibility level text in admin area (Zeger-Jan van de Weg)
 
+v 8.4.2 (unreleased)
+  - Fix missing artifacts in build artifacts browser (fixed in Workhorse)
+
 v 8.4.1
   - Apply security updates for Rails (4.2.5.1), rails-html-sanitizer (1.0.3),
     and Nokogiri (1.6.7.2)
-- 
cgit v1.2.1


From 2cc20853c97b48b9353fae2bdb0c1f51d73bb33c Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Tue, 26 Jan 2016 14:40:52 -0500
Subject: adds border color to tables globally.

---
 app/assets/stylesheets/framework/tables.scss | 2 +-
 app/assets/stylesheets/pages/tree.scss       | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/framework/tables.scss b/app/assets/stylesheets/framework/tables.scss
index b5134f44ded..75b770ae5a2 100644
--- a/app/assets/stylesheets/framework/tables.scss
+++ b/app/assets/stylesheets/framework/tables.scss
@@ -38,7 +38,7 @@ table {
 
       td {
         border-color: $table-border-color;
-        border-bottom: 1px solid;
+        border-bottom: 1px solid $border-color;
       }
     }
   }
diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss
index 11e6d67a082..c7411617cb3 100644
--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
@@ -17,14 +17,11 @@
     tr {
       > td, > th {
         line-height: 26px;
-        border-bottom: 1px solid $border-color;
       }
 
       &:hover {
         td {
           background: $hover;
-          border-top: 1px solid #ADF;
-          border-bottom: 1px solid #ADF;
         }
         cursor: pointer;
       }
-- 
cgit v1.2.1


From a98bf00ca6be419ba3406dcce0d78d23b297d006 Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Tue, 26 Jan 2016 14:51:55 -0500
Subject: Adds margin top to readme holder so not flush.

---
 app/assets/stylesheets/framework/files.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss
index a4791cf6b34..00cb756b376 100644
--- a/app/assets/stylesheets/framework/files.scss
+++ b/app/assets/stylesheets/framework/files.scss
@@ -7,6 +7,7 @@
   border: 1px solid $border-color;
 
   &.readme-holder {
+    margin-top: 10px;
     border-bottom: 0;
   }
 
-- 
cgit v1.2.1


From 4be65c3231f1bc260134d1c301b24baf87ef1552 Mon Sep 17 00:00:00 2001
From: Blake Hitchcock <rbhitchcock@gmail.com>
Date: Mon, 25 Jan 2016 11:27:03 -0500
Subject: Update ExternalIssue regex for JIRA integration

The pattern in the `::reference_pattern` class method in the
ExternalIssue model does not match all valid forms of JIRA project
names. I have updated the regex to match JIRA project names with numbers
and underscores. More information on valid JIRA project names can be
found here:
https://confluence.atlassian.com/jira/changing-the-project-key-format-192534.html

* The first character must be a letter,
* All letters used in the project key must be from the Modern Roman Alphabet and upper case, and
* Only letters, numbers or the underscore character can be used.
---
 CHANGELOG                                       |  1 +
 app/models/external_issue.rb                    |  2 +-
 config/initializers/1_settings.rb               |  2 +-
 spec/lib/gitlab/closing_issue_extractor_spec.rb | 11 +++++++++++
 spec/models/external_issue_spec.rb              | 15 +++++++++++++++
 5 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index e20330cd60a..6660b33bb69 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -19,6 +19,7 @@ v 8.4.1
     and Nokogiri (1.6.7.2)
   - Fix redirect loop during import
   - Fix diff highlighting for all syntax themes
+  - Update the ExternalIssue regex pattern (Blake Hitchcock)
 
 v 8.4.0
   - Allow LDAP users to change their email if it was not set by the LDAP server
diff --git a/app/models/external_issue.rb b/app/models/external_issue.rb
index 49f6c95e045..2ca79df0a29 100644
--- a/app/models/external_issue.rb
+++ b/app/models/external_issue.rb
@@ -31,7 +31,7 @@ class ExternalIssue
 
   # Pattern used to extract `JIRA-123` issue references from text
   def self.reference_pattern
-    %r{(?<issue>([A-Z\-]+-)\d+)}
+    %r{(?<issue>\b([A-Z][A-Z0-9_]+-)\d+)}
   end
 
   def to_reference(_from_project = nil)
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 04a7c16ebde..d8170557f7e 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -176,7 +176,7 @@ Settings.gitlab['signin_enabled'] ||= true if Settings.gitlab['signin_enabled'].
 Settings.gitlab['twitter_sharing_enabled'] ||= true if Settings.gitlab['twitter_sharing_enabled'].nil?
 Settings.gitlab['restricted_visibility_levels'] = Settings.send(:verify_constant_array, Gitlab::VisibilityLevel, Settings.gitlab['restricted_visibility_levels'], [])
 Settings.gitlab['username_changing_enabled'] = true if Settings.gitlab['username_changing_enabled'].nil?
-Settings.gitlab['issue_closing_pattern'] = '((?:[Cc]los(?:e[sd]?|ing)|[Ff]ix(?:e[sd]|ing)?|[Rr]esolv(?:e[sd]?|ing)) +(?:(?:issues? +)?%{issue_ref}(?:(?:, *| +and +)?)|([A-Z]*-\d*))+)' if Settings.gitlab['issue_closing_pattern'].nil?
+Settings.gitlab['issue_closing_pattern'] = '((?:[Cc]los(?:e[sd]?|ing)|[Ff]ix(?:e[sd]|ing)?|[Rr]esolv(?:e[sd]?|ing)) +(?:(?:issues? +)?%{issue_ref}(?:(?:, *| +and +)?)|([A-Z][A-Z0-9_]+-\d+))+)' if Settings.gitlab['issue_closing_pattern'].nil?
 Settings.gitlab['default_projects_features'] ||= {}
 Settings.gitlab['webhook_timeout'] ||= 10
 Settings.gitlab['max_attachment_size'] ||= 10
diff --git a/spec/lib/gitlab/closing_issue_extractor_spec.rb b/spec/lib/gitlab/closing_issue_extractor_spec.rb
index 99288da1e43..04cf11fc6f1 100644
--- a/spec/lib/gitlab/closing_issue_extractor_spec.rb
+++ b/spec/lib/gitlab/closing_issue_extractor_spec.rb
@@ -135,6 +135,17 @@ describe Gitlab::ClosingIssueExtractor, lib: true do
         message = "resolve #{reference}"
         expect(subject.closed_by_message(message)).to eq([issue])
       end
+
+      context 'with an external issue tracker reference' do
+        it 'extracts the referenced issue' do
+          jira_project = create(:jira_project, name: 'JIRA_EXT1')
+          jira_issue = ExternalIssue.new("#{jira_project.name}-1", project: jira_project)
+          closing_issue_extractor = described_class.new jira_project
+          message = "Resolve #{jira_issue.to_reference}"
+
+          expect(closing_issue_extractor.closed_by_message(message)).to eq([jira_issue])
+        end
+      end
     end
 
     context "with a cross-project reference" do
diff --git a/spec/models/external_issue_spec.rb b/spec/models/external_issue_spec.rb
index 6ec6b9037a4..9b144dd1ecc 100644
--- a/spec/models/external_issue_spec.rb
+++ b/spec/models/external_issue_spec.rb
@@ -10,6 +10,21 @@ describe ExternalIssue, models: true do
     it { is_expected.to include_module(Referable) }
   end
 
+  describe '.reference_pattern' do
+    it 'allows underscores in the project name' do
+      expect(ExternalIssue.reference_pattern.match('EXT_EXT-1234')[0]).to eq 'EXT_EXT-1234'
+    end
+
+    it 'allows numbers in the project name' do
+      expect(ExternalIssue.reference_pattern.match('EXT3_EXT-1234')[0]).to eq 'EXT3_EXT-1234'
+    end
+
+    it 'requires the project name to begin with A-Z' do
+      expect(ExternalIssue.reference_pattern.match('3EXT_EXT-1234')).to eq nil
+      expect(ExternalIssue.reference_pattern.match('EXT_EXT-1234')[0]).to eq 'EXT_EXT-1234'
+    end
+  end
+
   describe '#to_reference' do
     it 'returns a String reference to the object' do
       expect(issue.to_reference).to eq issue.id
-- 
cgit v1.2.1


From 84427dc6d5cd708834316888f611ce5c5347f9bc Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Tue, 26 Jan 2016 16:18:10 -0800
Subject: Update CHANGELOG

[ci skip]
---
 CHANGELOG | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 6660b33bb69..8e70081e7cc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,16 +10,22 @@ v 8.5.0 (unreleased)
   - Don't vendor minified JS
   - Track project import failure
   - Fix visibility level text in admin area (Zeger-Jan van de Weg)
+  - Update the ExternalIssue regex pattern (Blake Hitchcock)
 
 v 8.4.2 (unreleased)
-  - Fix missing artifacts in build artifacts browser (fixed in Workhorse)
+  - Bump required gitlab-workhorse version to bring in a fix for missing
+    artifacts in the build artifacts browser
+  - Get rid of those ugly borders on the file tree view
+  - Bump gitlab_git version to 7.2.24 in order to bring in a performance
+    improvement when checking if a repository was empty
+  - Add instrumentation for Gitlab::Git::Repository instance methods so we can
+    track them in Performance Monitoring.
 
 v 8.4.1
   - Apply security updates for Rails (4.2.5.1), rails-html-sanitizer (1.0.3),
     and Nokogiri (1.6.7.2)
   - Fix redirect loop during import
   - Fix diff highlighting for all syntax themes
-  - Update the ExternalIssue regex pattern (Blake Hitchcock)
 
 v 8.4.0
   - Allow LDAP users to change their email if it was not set by the LDAP server
-- 
cgit v1.2.1


From a427ab9faa9dbc33e1b2a0c86c92360ef546524c Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Wed, 27 Jan 2016 09:01:05 +0100
Subject: Fix typo on artifacts doc

[ci skip]
---
 doc/ci/build_artifacts/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/ci/build_artifacts/README.md b/doc/ci/build_artifacts/README.md
index 58cbe653c34..71db5aa5dc8 100644
--- a/doc/ci/build_artifacts/README.md
+++ b/doc/ci/build_artifacts/README.md
@@ -13,8 +13,8 @@ ability of downloading the files separately.
 
 **Note:**
 The artifacts browser will be available only for new artifacts that are sent
-to GitLab using GitLab Runner version 1.0 and up. You will not be available to
-see the browser for old artifacts already uploaded to GitLab.
+to GitLab using GitLab Runner version 1.0 and up. It will not be possible to
+browse old artifacts already uploaded to GitLab.
 
 ## Enabling build artifacts
 
-- 
cgit v1.2.1