Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-09-27

# Conflicts:
#	app/assets/javascripts/boards/boards_bundle.js
#	app/finders/issuable_finder.rb
#	app/services/ci/create_pipeline_service.rb
#	app/views/shared/boards/_show.html.haml
#	doc/user/project/integrations/kubernetes.md
[ci skip]

Gemfile

@@ -26,7 +26,7 @@ gem 'doorkeeper', '~> 4.2.0'
 gem 'doorkeeper-openid_connect', '~> 1.1.0'
 gem 'omniauth', '~> 1.4.2'
 gem 'omniauth-auth0', '~> 1.4.1'
-gem 'omniauth-azure-oauth2', '~> 0.0.6'
+gem 'omniauth-azure-oauth2', '~> 0.0.9'
 gem 'omniauth-cas3', '~> 1.1.4'
 gem 'omniauth-facebook', '~> 4.0.0'
 gem 'omniauth-github', '~> 1.1.1'

Gemfile.lock

@@ -215,7 +215,7 @@ GEM
     factory_girl_rails (4.7.0)
       factory_girl (~> 4.7.0)
       railties (>= 3.0.0)
-    faraday (0.12.1)
+    faraday (0.12.2)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.11.0.1)
       faraday (>= 0.7.4, < 1.0)
@@ -545,10 +545,10 @@ GEM
       omniauth-oauth2 (~> 1.1)
     omniauth-authentiq (0.3.1)
       omniauth-oauth2 (~> 1.3, >= 1.3.1)
-    omniauth-azure-oauth2 (0.0.6)
+    omniauth-azure-oauth2 (0.0.9)
       jwt (~> 1.0)
       omniauth (~> 1.0)
-      omniauth-oauth2 (~> 1.1)
+      omniauth-oauth2 (~> 1.4)
     omniauth-cas3 (1.1.4)
       addressable (~> 2.3)
       nokogiri (~> 1.7, >= 1.7.1)
@@ -574,7 +574,7 @@ GEM
     omniauth-oauth (1.1.0)
       oauth
       omniauth (~> 1.0)
-    omniauth-oauth2 (1.3.1)
+    omniauth-oauth2 (1.4.0)
       oauth2 (~> 1.0)
       omniauth (~> 1.2)
     omniauth-oauth2-generic (0.2.2)
@@ -1113,7 +1113,7 @@ DEPENDENCIES
   omniauth (~> 1.4.2)
   omniauth-auth0 (~> 1.4.1)
   omniauth-authentiq (~> 0.3.1)
-  omniauth-azure-oauth2 (~> 0.0.6)
+  omniauth-azure-oauth2 (~> 0.0.9)
   omniauth-cas3 (~> 1.1.4)
   omniauth-facebook (~> 4.0.0)
   omniauth-github (~> 1.1.1)

app/assets/javascripts/boards/boards_bundle.js

@@ -95,9 +95,12 @@ $(() => {
       });
       Store.rootPath = this.boardsEndpoint;
 
+<<<<<<< HEAD
       this.filterManager = new FilteredSearchBoards(Store.filter, true, [(this.milestoneTitle ? 'milestone' : null)]);
       this.filterManager.setup();
 
+=======
+>>>>>>> upstream/master
       // Listen for updateTokens event
       eventHub.$on('updateTokens', this.updateTokens);
     },
@@ -105,6 +108,9 @@ $(() => {
       eventHub.$off('updateTokens', this.updateTokens);
     },
     mounted () {
+      this.filterManager = new FilteredSearchBoards(Store.filter, true);
+      this.filterManager.setup();
+
       Store.disabled = this.disabled;
       gl.boardService.all()
         .then(response => response.json())

app/assets/javascripts/line_highlighter.js

@@ -28,148 +28,149 @@
 //     </div>
 //   </div>
 //
-(function() {
-  this.LineHighlighter = (function() {
-    // CSS class applied to highlighted lines
-    LineHighlighter.prototype.highlightClass = 'hll';
-
-    // Internal copy of location.hash so we're not dependent on `location` in tests
-    LineHighlighter.prototype._hash = '';
-
-    function LineHighlighter(hash) {
-      if (hash == null) {
-        // Initialize a LineHighlighter object
-        //
-        // hash - String URL hash for dependency injection in tests
-        hash = location.hash;
-      }
-      this.setHash = this.setHash.bind(this);
-      this.highlightLine = this.highlightLine.bind(this);
-      this.clickHandler = this.clickHandler.bind(this);
-      this.highlightHash = this.highlightHash.bind(this);
-      this._hash = hash;
-      this.bindEvents();
-      this.highlightHash();
-    }
 
-    LineHighlighter.prototype.bindEvents = function() {
-      const $fileHolder = $('.file-holder');
-      $fileHolder.on('click', 'a[data-line-number]', this.clickHandler);
-      $fileHolder.on('highlight:line', this.highlightHash);
-    };
-
-    LineHighlighter.prototype.highlightHash = function() {
-      var range;
-      if (this._hash !== '') {
-        range = this.hashToRange(this._hash);
-        if (range[0]) {
-          this.highlightRange(range);
-          $.scrollTo("#L" + range[0], {
-            // Scroll to the first highlighted line on initial load
-            // Offset -50 for the sticky top bar, and another -100 for some context
-            offset: -150
-          });
-        }
-      }
-    };
-
-    LineHighlighter.prototype.clickHandler = function(event) {
-      var current, lineNumber, range;
-      event.preventDefault();
-      this.clearHighlight();
-      lineNumber = $(event.target).closest('a').data('line-number');
-      current = this.hashToRange(this._hash);
-      if (!(current[0] && event.shiftKey)) {
-        // If there's no current selection, or there is but Shift wasn't held,
-        // treat this like a single-line selection.
-        this.setHash(lineNumber);
-        return this.highlightLine(lineNumber);
-      } else if (event.shiftKey) {
-        if (lineNumber < current[0]) {
-          range = [lineNumber, current[0]];
-        } else {
-          range = [current[0], lineNumber];
-        }
-        this.setHash(range[0], range[1]);
-        return this.highlightRange(range);
-      }
-    };
-
-    LineHighlighter.prototype.clearHighlight = function() {
-      return $("." + this.highlightClass).removeClass(this.highlightClass);
-    // Unhighlight previously highlighted lines
-    };
-
-    // Convert a URL hash String into line numbers
-    //
-    // hash - Hash String
-    //
-    // Examples:
-    //
-    //   hashToRange('#L5')    # => [5, null]
-    //   hashToRange('#L5-15') # => [5, 15]
-    //   hashToRange('#foo')   # => [null, null]
-    //
-    // Returns an Array
-    LineHighlighter.prototype.hashToRange = function(hash) {
-      var first, last, matches;
-      // ?L(\d+)(?:-(\d+))?$/)
-      matches = hash.match(/^#?L(\d+)(?:-(\d+))?$/);
-      if (matches && matches.length) {
-        first = parseInt(matches[1], 10);
-        last = matches[2] ? parseInt(matches[2], 10) : null;
-        return [first, last];
-      } else {
-        return [null, null];
-      }
-    };
-
-    // Highlight a single line
-    //
-    // lineNumber - Line number to highlight
-    LineHighlighter.prototype.highlightLine = function(lineNumber) {
-      return $("#LC" + lineNumber).addClass(this.highlightClass);
-    };
-
-    // Highlight all lines within a range
-    //
-    // range - Array containing the starting and ending line numbers
-    LineHighlighter.prototype.highlightRange = function(range) {
-      var i, lineNumber, ref, ref1, results;
-      if (range[1]) {
-        results = [];
-        for (lineNumber = i = ref = range[0], ref1 = range[1]; ref <= ref1 ? i <= ref1 : i >= ref1; lineNumber = ref <= ref1 ? (i += 1) : (i -= 1)) {
-          results.push(this.highlightLine(lineNumber));
-        }
-        return results;
-      } else {
-        return this.highlightLine(range[0]);
-      }
-    };
+const LineHighlighter = function(options = {}) {
+  options.highlightLineClass = options.highlightLineClass || 'hll';
+  options.fileHolderSelector = options.fileHolderSelector || '.file-holder';
+  options.scrollFileHolder = options.scrollFileHolder || false;
+  options.hash = options.hash || location.hash;
 
-    // Set the URL hash string
-    LineHighlighter.prototype.setHash = function(firstLineNumber, lastLineNumber) {
-      var hash;
-      if (lastLineNumber) {
-        hash = "#L" + firstLineNumber + "-" + lastLineNumber;
+  this.options = options;
+  this._hash = options.hash;
+  this.highlightLineClass = options.highlightLineClass;
+  this.setHash = this.setHash.bind(this);
+  this.highlightLine = this.highlightLine.bind(this);
+  this.clickHandler = this.clickHandler.bind(this);
+  this.highlightHash = this.highlightHash.bind(this);
+
+  this.bindEvents();
+  this.highlightHash();
+};
+
+LineHighlighter.prototype.bindEvents = function() {
+  const $fileHolder = $(this.options.fileHolderSelector);
+
+  $fileHolder.on('click', 'a[data-line-number]', this.clickHandler);
+  $fileHolder.on('highlight:line', this.highlightHash);
+};
+
+LineHighlighter.prototype.highlightHash = function() {
+  var range;
+
+  if (this._hash !== '') {
+    range = this.hashToRange(this._hash);
+
+    if (range[0]) {
+      this.highlightRange(range);
+      const lineSelector = `#L${range[0]}`;
+      const scrollOptions = {
+        // Scroll to the first highlighted line on initial load
+        // Offset -50 for the sticky top bar, and another -100 for some context
+        offset: -150
+      };
+      if (this.options.scrollFileHolder) {
+        $(this.options.fileHolderSelector).scrollTo(lineSelector, scrollOptions);
       } else {
-        hash = "#L" + firstLineNumber;
+        $.scrollTo(lineSelector, scrollOptions);
       }
-      this._hash = hash;
-      return this.__setLocationHash__(hash);
-    };
-
-    // Make the actual hash change in the browser
-    //
-    // This method is stubbed in tests.
-    LineHighlighter.prototype.__setLocationHash__ = function(value) {
-      return history.pushState({
-        url: value
-      // We're using pushState instead of assigning location.hash directly to
-      // prevent the page from scrolling on the hashchange event
-      }, document.title, value);
-    };
-
-    return LineHighlighter;
-  })();
-}).call(window);
+    }
+  }
+};
+
+LineHighlighter.prototype.clickHandler = function(event) {
+  var current, lineNumber, range;
+  event.preventDefault();
+  this.clearHighlight();
+  lineNumber = $(event.target).closest('a').data('line-number');
+  current = this.hashToRange(this._hash);
+  if (!(current[0] && event.shiftKey)) {
+    // If there's no current selection, or there is but Shift wasn't held,
+    // treat this like a single-line selection.
+    this.setHash(lineNumber);
+    return this.highlightLine(lineNumber);
+  } else if (event.shiftKey) {
+    if (lineNumber < current[0]) {
+      range = [lineNumber, current[0]];
+    } else {
+      range = [current[0], lineNumber];
+    }
+    this.setHash(range[0], range[1]);
+    return this.highlightRange(range);
+  }
+};
+
+LineHighlighter.prototype.clearHighlight = function() {
+  return $("." + this.highlightLineClass).removeClass(this.highlightLineClass);
+};
+
+// Convert a URL hash String into line numbers
+//
+// hash - Hash String
+//
+// Examples:
+//
+//   hashToRange('#L5')    # => [5, null]
+//   hashToRange('#L5-15') # => [5, 15]
+//   hashToRange('#foo')   # => [null, null]
+//
+// Returns an Array
+LineHighlighter.prototype.hashToRange = function(hash) {
+  var first, last, matches;
+  // ?L(\d+)(?:-(\d+))?$/)
+  matches = hash.match(/^#?L(\d+)(?:-(\d+))?$/);
+  if (matches && matches.length) {
+    first = parseInt(matches[1], 10);
+    last = matches[2] ? parseInt(matches[2], 10) : null;
+    return [first, last];
+  } else {
+    return [null, null];
+  }
+};
+
+// Highlight a single line
+//
+// lineNumber - Line number to highlight
+LineHighlighter.prototype.highlightLine = function(lineNumber) {
+  return $("#LC" + lineNumber).addClass(this.highlightLineClass);
+};
+
+// Highlight all lines within a range
+//
+// range - Array containing the starting and ending line numbers
+LineHighlighter.prototype.highlightRange = function(range) {
+  var i, lineNumber, ref, ref1, results;
+  if (range[1]) {
+    results = [];
+    for (lineNumber = i = ref = range[0], ref1 = range[1]; ref <= ref1 ? i <= ref1 : i >= ref1; lineNumber = ref <= ref1 ? (i += 1) : (i -= 1)) {
+      results.push(this.highlightLine(lineNumber));
+    }
+    return results;
+  } else {
+    return this.highlightLine(range[0]);
+  }
+};
+
+// Set the URL hash string
+LineHighlighter.prototype.setHash = function(firstLineNumber, lastLineNumber) {
+  var hash;
+  if (lastLineNumber) {
+    hash = "#L" + firstLineNumber + "-" + lastLineNumber;
+  } else {
+    hash = "#L" + firstLineNumber;
+  }
+  this._hash = hash;
+  return this.__setLocationHash__(hash);
+};
+
+// Make the actual hash change in the browser
+//
+// This method is stubbed in tests.
+LineHighlighter.prototype.__setLocationHash__ = function(value) {
+  return history.pushState({
+    url: value
+  // We're using pushState instead of assigning location.hash directly to
+  // prevent the page from scrolling on the hashchange event
+  }, document.title, value);
+};
+
+window.LineHighlighter = LineHighlighter;

app/assets/javascripts/merge_request_tabs.js

@@ -352,7 +352,7 @@ import {
     }
 
     expandViewContainer() {
-      const $wrapper = $('.content-wrapper .container-fluid');
+      const $wrapper = $('.content-wrapper .container-fluid').not('.breadcrumbs');
       if (this.fixedLayoutPref === null) {
         this.fixedLayoutPref = $wrapper.hasClass('container-limited');
       }

app/assets/javascripts/repo/components/repo_preview.vue

 <script>
+/* global LineHighlighter */
+
 import Store from '../stores/repo_store';
 
 export default {
   data: () => Store,
-  mounted() {
-    this.highlightFile();
-  },
   computed: {
     html() {
       return this.activeFile.html;
     },
   },
-
   methods: {
     highlightFile() {
       $(this.$el).find('.file-content').syntaxHighlight();
     },
   },
-
+  mounted() {
+    this.highlightFile();
+    this.lineHighlighter = new LineHighlighter({
+      fileHolderSelector: '.blob-viewer-container',
+      scrollFileHolder: true,
+    });
+  },
   watch: {
     html() {
       this.$nextTick(() => {

app/assets/stylesheets/framework/new-nav.scss

@@ -306,6 +306,8 @@ header.navbar-gitlab-new {
   display: flex;
   width: 100%;
   position: relative;
+  padding-top: $gl-padding / 2;
+  padding-bottom: $gl-padding / 2;
   align-items: center;
   border-bottom: 1px solid $border-color;
 }
@@ -317,11 +319,6 @@ header.navbar-gitlab-new {
   align-self: center;
   color: $gl-text-color-secondary;
 
-  @media (max-width: $screen-xs-max) {
-    padding-left: 17px;
-    border-left: 1px solid $gl-text-color-quaternary;
-  }
-
   .avatar-tile {
     margin-right: 4px;
     border: 1px solid $border-color;
@@ -351,6 +348,7 @@ header.navbar-gitlab-new {
     display: flex;
     align-items: center;
     position: relative;
+    padding: 2px 0;
 
     &:not(:last-child) {
       margin-right: 20px;
@@ -386,7 +384,7 @@ header.navbar-gitlab-new {
   margin: 0;
   font-size: 12px;
   font-weight: 600;
-  line-height: 1;
+  line-height: 16px;
 
   a {
     color: $gl-text-color;

app/assets/stylesheets/framework/new-sidebar.scss

@@ -461,6 +461,13 @@ $new-sidebar-collapsed-width: 50px;
       font-size: 18px;
     }
   }
+
+  @media (max-width: $screen-xs-max) {
+    + .breadcrumbs-links {
+      padding-left: 17px;
+      border-left: 1px solid $gl-text-color-quaternary;
+    }
+  }
 }
 
 @media (max-width: $screen-xs-max) {

app/assets/stylesheets/framework/variables.scss

@@ -7,6 +7,7 @@ $gutter_inner_width: 250px;
 $sidebar-transition-duration: .15s;
 $sidebar-breakpoint: 1024px;
 $default-transition-duration: .15s;
+$right-sidebar-transition-duration: .3s;
 
 /*
  * Color schema

app/assets/stylesheets/pages/boards.scss

@@ -85,6 +85,15 @@
 
 .boards-app {
   position: relative;
+
+  @media (min-width: $screen-sm-min) {
+    transition: width $right-sidebar-transition-duration;
+    width: 100%;
+
+    &.is-compact {
+      width: calc(100% - #{$gutter_width});
+    }
+  }
 }
 
 .boards-app-loading {
@@ -108,11 +117,6 @@
     height: calc(100vh - 222px);
     // scss-lint:enable DuplicateProperty
     min-height: 475px;
-    transition: width .2s;
-
-    &.is-compact {
-      width: calc(100% - 290px);
-    }
   }
 }
 
@@ -469,14 +473,6 @@
 
 .page-with-layout-nav.page-with-sub-nav .issue-boards-sidebar,
 .page-with-new-sidebar.page-with-sidebar .issue-boards-sidebar {
-  position: absolute;
-
-  &.right-sidebar {
-    top: 0;
-    bottom: 0;
-    height: 100%;
-  }
-
   .issuable-sidebar-header {
     position: relative;
   }
@@ -514,8 +510,8 @@
 .right-sidebar.right-sidebar-expanded {
   &.boards-sidebar-slide-enter-active,
   &.boards-sidebar-slide-leave-active {
-    transition: width .2s,
-                padding .2s;
+    transition: width $right-sidebar-transition-duration,
+                padding $right-sidebar-transition-duration;
   }
 
   &.boards-sidebar-slide-enter,

app/assets/stylesheets/pages/issuable.scss

@@ -223,14 +223,14 @@
   top: $new-navbar-height;
   bottom: 0;
   right: 0;
-  transition: width .3s;
+  transition: width $right-sidebar-transition-duration;
   background: $gray-light;
   z-index: 200;
   overflow: hidden;
 
   .issuable-sidebar {
     width: calc(100% + 100px);
-    height: calc(100% - #{$new-navbar-height});
+    height: 100%;
     overflow-y: scroll;
     overflow-x: hidden;
     -webkit-overflow-scrolling: touch;

app/assets/stylesheets/pages/repo.scss

@@ -54,6 +54,10 @@
   border-radius: $border-radius-default;
   color: $almost-black;
 
+  .code.white pre .hll {
+    background-color: $well-light-border !important;
+  }
+
   .tree-content-holder {
     display: flex;
     min-height: 300px;

app/finders/issuable_finder.rb

@@ -45,11 +45,15 @@ class IssuableFinder
   ].freeze
   ARRAY_PARAMS = { label_name: [], iids: [], assignee_username: [] }.freeze
 
+<<<<<<< HEAD
   EE_SCALAR_PARAMS = %i[
     weight
   ].freeze
 
   VALID_PARAMS = (SCALAR_PARAMS + [ARRAY_PARAMS] + EE_SCALAR_PARAMS).freeze
+=======
+  VALID_PARAMS = (SCALAR_PARAMS + [ARRAY_PARAMS]).freeze
+>>>>>>> upstream/master
 
   attr_accessor :current_user, :params
 

app/models/ci/pipeline.rb

@@ -447,7 +447,7 @@ module Ci
     def update_duration
       return unless started_at
 
-      self.duration = Gitlab::Ci::PipelineDuration.from_pipeline(self)
+      self.duration = Gitlab::Ci::Pipeline::Duration.from_pipeline(self)
     end
 
     def execute_hooks

app/models/commit.rb

@@ -25,8 +25,8 @@ class Commit
   DIFF_HARD_LIMIT_FILES = 1000
   DIFF_HARD_LIMIT_LINES = 50000
 
-  # The SHA can be between 7 and 40 hex characters.
-  COMMIT_SHA_PATTERN = '\h{7,40}'.freeze
+  MIN_SHA_LENGTH = 7
+  COMMIT_SHA_PATTERN = /\h{#{MIN_SHA_LENGTH},40}/.freeze
 
   def banzai_render_context(field)
     context = { pipeline: :single_line, project: self.project }
@@ -53,7 +53,7 @@ class Commit
 
     # Truncate sha to 8 characters
     def truncate_sha(sha)
-      sha[0..7]
+      sha[0..MIN_SHA_LENGTH]
     end
 
     def max_diff_options
@@ -100,7 +100,7 @@ class Commit
   def self.reference_pattern
     @reference_pattern ||= %r{
       (?:#{Project.reference_pattern}#{reference_prefix})?
-      (?<commit>\h{7,40})
+      (?<commit>#{COMMIT_SHA_PATTERN})
     }x
   end
 
@@ -216,9 +216,8 @@ class Commit
     @raw.respond_to?(method, include_private) || super
   end
 
-  # Truncate sha to 8 characters
   def short_id
-    @raw.short_id(7)
+    @raw.short_id(MIN_SHA_LENGTH)
   end
 
   def diff_refs

app/models/repository.rb

@@ -541,8 +541,11 @@ class Repository
   cache_method :tag_count, fallback: 0
 
   def avatar
-    if tree = file_on_head(:avatar)
-      tree.path
+    # n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/38327
+    Gitlab::GitalyClient.allow_n_plus_1_calls do
+      if tree = file_on_head(:avatar)
+        tree.path
+      end
     end
   end
   cache_method :avatar

app/services/ci/create_pipeline_service.rb

@@ -2,51 +2,60 @@ module Ci
   class CreatePipelineService < BaseService
     attr_reader :pipeline
 
+<<<<<<< HEAD
     def execute(source, ignore_skip_ci: false, save_on_errors: true, trigger_request: nil, schedule: nil, mirror_update: false)
+=======
+    SEQUENCE = [Gitlab::Ci::Pipeline::Chain::Validate::Abilities,
+                Gitlab::Ci::Pipeline::Chain::Validate::Repository,
+                Gitlab::Ci::Pipeline::Chain::Validate::Config,
+                Gitlab::Ci::Pipeline::Chain::Skip,
+                Gitlab::Ci::Pipeline::Chain::Create].freeze
+
+    def execute(source, ignore_skip_ci: false, save_on_errors: true, trigger_request: nil, schedule: nil, &block)
+>>>>>>> upstream/master
       @pipeline = Ci::Pipeline.new(
         source: source,
         project: project,
         ref: ref,
         sha: sha,
         before_sha: before_sha,
-        tag: tag?,
+        tag: tag_exists?,
         trigger_requests: Array(trigger_request),
         user: current_user,
         pipeline_schedule: schedule,
         protected: project.protected_for?(ref)
       )
 
+<<<<<<< HEAD
       result = validate_project_and_git_items(mirror_update: mirror_update) ||
         validate_pipeline(ignore_skip_ci: ignore_skip_ci,
                           save_on_errors: save_on_errors)
+=======
+      command = OpenStruct.new(ignore_skip_ci: ignore_skip_ci,
+                               save_incompleted: save_on_errors,
+                               seeds_block: block,
+                               project: project,
+                               current_user: current_user)
+>>>>>>> upstream/master
 
-      return result if result
+      sequence = Gitlab::Ci::Pipeline::Chain::Sequence
+        .new(pipeline, command, SEQUENCE)
 
-      begin
-        Ci::Pipeline.transaction do
-          pipeline.save!
+      sequence.build! do |pipeline, sequence|
+        update_merge_requests_head_pipeline if pipeline.persisted?
 
-          yield(pipeline) if block_given?
+        if sequence.complete?
+          cancel_pending_pipelines if project.auto_cancel_pending_pipelines?
+          pipeline_created_counter.increment(source: source)
 
-          Ci::CreatePipelineStagesService
-            .new(project, current_user)
-            .execute(pipeline)
+          pipeline.process!
         end
-      rescue ActiveRecord::RecordInvalid => e
-        return error("Failed to persist the pipeline: #{e}")
       end
-
-      update_merge_requests_head_pipeline
-
-      cancel_pending_pipelines if project.auto_cancel_pending_pipelines?
-
-      pipeline_created_counter.increment(source: source)
-
-      pipeline.tap(&:process!)
     end
 
     private
 
+<<<<<<< HEAD
     def validate_project_and_git_items(mirror_update: false)
       unless project.builds_enabled?
         return error('Pipeline is disabled')
@@ -97,19 +106,14 @@ module Ci
       else # legacy triggers don't have a corresponding user
         !project.protected_for?(ref)
       end
+=======
+    def commit
+      @commit ||= project.commit(origin_sha || origin_ref)
+>>>>>>> upstream/master
     end
 
-    def allowed_to_create?
-      return unless can?(current_user, :create_pipeline, project)
-
-      access = Gitlab::UserAccess.new(current_user, project: project)
-      if branch?
-        access.can_update_branch?(ref)
-      elsif tag?
-        access.can_create_tag?(ref)
-      else
-        true # Allow it for now and we'll reject when we check ref existence
-      end
+    def sha
+      commit.try(:id)
     end
 
     def update_merge_requests_head_pipeline
@@ -119,11 +123,6 @@ module Ci
         .update_all(head_pipeline_id: @pipeline.id)
     end
 
-    def skip_ci?
-      return false unless pipeline.git_commit_message
-      pipeline.git_commit_message =~ /\[(ci[ _-]skip|skip[ _-]ci)\]/i
-    end
-
     def cancel_pending_pipelines
       Gitlab::OptimisticLocking.retry_lock(auto_cancelable_pipelines) do |cancelables|
         cancelables.find_each do |cancelable|
@@ -140,14 +139,6 @@ module Ci
         .created_or_pending
     end
 
-    def commit
-      @commit ||= project.commit(origin_sha || origin_ref)
-    end
-
-    def sha
-      commit.try(:id)
-    end
-
     def before_sha
       params[:checkout_sha] || params[:before] || Gitlab::Git::BLANK_SHA
     end
@@ -160,41 +151,17 @@ module Ci
       params[:ref]
     end
 
-    def branch?
-      return @is_branch if defined?(@is_branch)
-
-      @is_branch =
-        project.repository.ref_exists?(Gitlab::Git::BRANCH_REF_PREFIX + ref)
-    end
-
-    def tag?
-      return @is_tag if defined?(@is_tag)
-
-      @is_tag =
-        project.repository.ref_exists?(Gitlab::Git::TAG_REF_PREFIX + ref)
+    def tag_exists?
+      project.repository.tag_exists?(ref)
     end
 
     def ref
       @ref ||= Gitlab::Git.ref_name(origin_ref)
     end
 
-    def valid_sha?
-      origin_sha && origin_sha != Gitlab::Git::BLANK_SHA
-    end
-
-    def error(message, save: false)
-      pipeline.tap do
-        pipeline.errors.add(:base, message)
-
-        if save
-          pipeline.drop
-          update_merge_requests_head_pipeline
-        end
-      end
-    end
-
     def pipeline_created_counter
-      @pipeline_created_counter ||= Gitlab::Metrics.counter(:pipelines_created_total, "Counter of pipelines created")
+      @pipeline_created_counter ||= Gitlab::Metrics
+        .counter(:pipelines_created_total, "Counter of pipelines created")
     end
   end
 end

app/views/shared/_auto_devops_callout.html.haml

@@ -6,10 +6,10 @@
     .svg-container
       = custom_icon('icon_autodevops')
     .user-callout-copy
-      %h4= _('Auto DevOps (Beta)')
-      %p= _('Auto DevOps can be activated for this project. It will automatically build, test, and deploy your application based on a predefined CI/CD configuration.')
+      %h4= s_('AutoDevOps|Auto DevOps (Beta)')
+      %p= s_('AutoDevOps|Auto DevOps can be activated for this project. It will automatically build, test, and deploy your application based on a predefined CI/CD configuration.')
       %p
-        #{s_('AutoDevOps|Learn more in the')}
-        = link_to _('Auto DevOps documentation'), help_page_path('topics/autodevops/index.md'), target: '_blank', rel: 'noopener noreferrer'
+        - link = link_to(s_('AutoDevOps|Auto DevOps documentation'), help_page_path('topics/autodevops/index.md'), target: '_blank', rel: 'noopener noreferrer')
+        = s_('AutoDevOps|Learn more in the %{link_to_documentation}').html_safe % { link_to_documentation: link }
 
-      = link_to _('Enable in settings'), project_settings_ci_cd_path(@project, anchor: 'js-general-pipeline-settings'), class: 'btn btn-primary js-close-callout'
+      = link_to s_('AutoDevOps|Enable in settings'), project_settings_ci_cd_path(@project, anchor: 'js-general-pipeline-settings'), class: 'btn btn-primary js-close-callout'

app/views/shared/boards/_show.html.haml

@@ -14,11 +14,16 @@
   %script#js-board-modal-filter{ type: "text/x-template" }= render "shared/issuable/search_bar", type: :boards_modal
   %script#js-board-promotion{ type: "text/x-template" }= render "shared/promotions/promote_issue_board"
 
+<<<<<<< HEAD
 .hidden-xs.hidden-sm
   = render 'shared/issuable/search_bar', type: :boards, board: board
+=======
+#board-app.boards-app{ "v-cloak" => true, data: board_data, ":class" => "{ 'is-compact': detailIssueVisible }" }
+  .hidden-xs.hidden-sm
+    = render 'shared/issuable/search_bar', type: :boards
+>>>>>>> upstream/master
 
-#board-app.boards-app{ "v-cloak" => true, data: board_data }
-  .boards-list{ ":class" => "{ 'is-compact': detailIssueVisible }" }
+  .boards-list
     .boards-app-loading.text-center{ "v-if" => "loading" }
       = icon("spinner spin")
     %board{ "v-cloak" => true,

changelogs/unreleased/3523-i18n-autodevops.yml

+---
+title: Improves i18n for Auto Devops callout
+merge_request:
+author:
+type: other

changelogs/unreleased/37467-helper-method-from-users-endpoint-overrides-api-helper-method.yml

+---
+title: find_user Users helper method no longer overrides find_user API helper method.
+merge_request: 14418
+author:
+type: fixed

changelogs/unreleased/37912-fix-dash-in-note-access-role.yml

----
-title: Notes will not show an empty bubble when the author isn't a member.
-merge_request: 14450
-author:
-type: fixed

changelogs/unreleased/38280-undefined-run_command-when-running-rake-gitlab-check.yml

----
-title: Some checks in `rake gitlab:check` were failling with 'undefined method `run_command`'
-merge_request: 14469
-author:
-type: fixed

changelogs/unreleased/breadcrumbs-line-height-padding.yml

+---
+title: breadcrumbs receives padding when double lined
+merge_request:
+author:
+type: changed

changelogs/unreleased/dm-bitbucket-import-truncated-shas.yml

+---
+title: Fix bug that caused merge requests with diff notes imported from Bitbucket
+  to raise errors
+merge_request:
+author:
+type: fixed

changelogs/unreleased/dm-simple-project-avatar-url.yml

+---
+title: Expose avatar_url when requesting list of projects from API with simple=true
+merge_request:
+author:
+type: added

changelogs/unreleased/expose-last-pipeline-details-in-api-for-single-commit.yml

+---
+title: Expose last pipeline details in API response when getting a single commit
+merge_request: 13521
+author: Mehdi Lahmam (@mehlah)
+type: added

changelogs/unreleased/fix-locked-shared-runners-problem.yml

----
-title: Make locked setting of Runner to not affect jobs scheduling
-merge_request: 14483
-author:
-type: fixed

changelogs/unreleased/rs-allow-name-on-anchors.yml → changelogs/unreleased/mr-side-by-side-breadcrumbs-container.yml

 ---
-title: Re-allow `name` attribute on user-provided anchor HTML
+title: Fixed breadcrumbs container expanding in side-by-side diff view
 merge_request:
 author:
 type: fixed

changelogs/unreleased/remove-temporary-ci-index.yml

+---
+title: Remove an index on ci_builds meant to be only temporary
+merge_request:
+author:
+type: other

db/migrate/20170919211300_remove_temporary_ci_builds_index.rb

+# See http://doc.gitlab.com/ce/development/migration_style_guide.html
+# for more information on how to write migrations for GitLab.
+
+class RemoveTemporaryCiBuildsIndex < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  # Set this constant to true if this migration requires downtime.
+  DOWNTIME = false
+
+  # To use create/remove index concurrently
+  disable_ddl_transaction!
+
+  def up
+    return unless index_exists?(:ci_builds, :id, name: 'index_for_ci_builds_retried_migration')
+    remove_concurrent_index(:ci_builds, :id, name: "index_for_ci_builds_retried_migration")
+  end
+
+  def down
+    # this was a temporary index for a migration that was never
+    # present previously so this probably shouldn't be here but it's
+    # easier to test the drop if we have a way to create it.
+    add_concurrent_index("ci_builds", ["id"],
+                         name: "index_for_ci_builds_retried_migration",
+                         where: "(retried IS NULL)",
+                         using: :btree)
+  end
+end

db/schema.rb

@@ -317,7 +317,6 @@ ActiveRecord::Schema.define(version: 20170921115009) do
   add_index "ci_builds", ["commit_id", "status", "type"], name: "index_ci_builds_on_commit_id_and_status_and_type", using: :btree
   add_index "ci_builds", ["commit_id", "type", "name", "ref"], name: "index_ci_builds_on_commit_id_and_type_and_name_and_ref", using: :btree
   add_index "ci_builds", ["commit_id", "type", "ref"], name: "index_ci_builds_on_commit_id_and_type_and_ref", using: :btree
-  add_index "ci_builds", ["id"], name: "index_for_ci_builds_retried_migration", where: "(retried IS NULL)", using: :btree
   add_index "ci_builds", ["project_id"], name: "index_ci_builds_on_project_id", using: :btree
   add_index "ci_builds", ["protected"], name: "index_ci_builds_on_protected", using: :btree
   add_index "ci_builds", ["runner_id"], name: "index_ci_builds_on_runner_id", using: :btree

doc/api/commits.md

@@ -181,6 +181,12 @@ Example response:
   "parent_ids": [
     "ae1d9fb46aa2b07ee9836d49862ec4e2c46fbbba"
   ],
+  "last_pipeline" : {
+    "id": 8,
+    "ref": "master",
+    "sha": "2dc6aa325a317eda67812f05600bdf0fcdc70ab0"
+    "status": "created"
+  }
   "stats": {
     "additions": 15,
     "deletions": 10,

doc/ci/yaml/README.md

@@ -1570,6 +1570,11 @@ Read more on [GitLab Pages user documentation](../../user/project/pages/index.md
 Each instance of GitLab CI has an embedded debug tool called Lint.
 You can find the link under `/ci/lint` of your gitlab instance.
 
+## Using reserved keywords
+
+If you get validation error when using specific values (e.g., `true` or `false`),
+try to quote them, or change them to a different form (e.g., `/bin/true`).
+
 ## Skipping jobs
 
 If your commit message contains `[ci skip]` or `[skip ci]`, using any

doc/development/README.md

@@ -45,6 +45,7 @@
 - [Building a package for testing purposes](build_test_package.md)
 - [Manage feature flags](feature_flags.md)
 - [View sent emails or preview mailers](emails.md)
+- [Working with Gitaly](gitaly.md)
 
 ## Databases
 

doc/development/fe_guide/index.md

@@ -29,34 +29,6 @@ For our currently-supported browsers, see our [requirements][requirements].
 
 ## Development Process
 
-When you are assigned an issue please follow the next steps:
-
-### Divide a big feature into small Merge Requests
-1. Big Merge Request are painful to review. In order to make this process easier we
-must break a big feature into smaller ones and create a Merge Request for each step.
-1. First step is to create a branch from `master`, let's call it `new-feature`. This branch
-will be the recipient of all the smaller Merge Requests. Only this one will be merged to master.
-1. Don't do any work on this one, let's keep it synced with master.
-1. Create a new branch from `new-feature`, let's call it `new-feature-step-1`. We advise you
-to clearly identify which step the branch represents.
-1. Do the first part of the modifications in this branch. The target branch of this Merge Request
-should be `new-feature`.
-1. Once `new-feature-step-1` gets merged into `new-feature` we can continue our work. Create a new
-branch from `new-feature`, let's call it `new-feature-step-2` and repeat the process done before.
-
-```shell
-master
-└─ new-feature
-   ├─ new-feature-step-1
-   ├─ new-feature-step-2
-   └─ new-feature-step-3
-```
-
-**Tips**
-- Make sure `new-feature` branch is always synced with `master`: merge master frequently.
-- Do the same for the feature branch you have opened. This can be accomplished by merging `master` into `new-feature` and `new-feature` into `new-feature-step-*`
-- Avoid rewriting history.
-
 ### Share your work early
 1. Before writing code guarantee your vision of the architecture is aligned with
 GitLab's architecture.

doc/development/gitaly.md

+# GitLab Developers Guide to Working with Gitaly
+
+[Gitaly](https://gitlab.com/gitlab-org/gitaly) is a high-level Git RPC service used by GitLab CE/EE,
+Workhorse and GitLab-Shell. All Rugged operations in GitLab CE/EE are currently being phased out to
+be replaced by Gitaly API calls.
+
+Visit the [Gitaly Migration Board](https://gitlab.com/gitlab-org/gitaly/boards/331341) for current
+status of the migration.
+
+## Feature Flags
+
+Gitaly makes heavy use of [feature flags](feature_flags.md).
+
+Each Rugged-to-Gitaly migration goes through a [series of phases](https://gitlab.com/gitlab-org/gitaly/blob/master/doc/MIGRATION_PROCESS.md):
+* **Opt-In**: by default the Rugged implementation is used.
+  * Production instances can choose to enable the Gitaly endpoint by enabling the feature flag.
+  * For testing purposes, you may wish to enable all feature flags by default. This can be done by exporting the following
+    environment variable: `GITALY_FEATURE_DEFAULT_ON=1`.
+  * On developer instances (ie, when `Rails.env.development?` is true), the Gitaly endpoint
+    is enabled by default, but can be _disabled_ using feature flags.
+* **Opt-Out**: by default, the Gitaly endpoint is used, but the feature can be explicitly disabled using the feature flag.
+* **Madatory**: The migration is complete and cannot be disabled. The old codepath is removed.
+
+### Enabling and Disabling Feature
+
+In the Rails console, type:
+
+```ruby
+Feature.enable(:gitaly_feature_name)
+Feature.disable(:gitaly_feature_name)
+```
+
+Where `gitaly_feature_name` is the name of the Gitaly feature. This can be determined by finding the appropriate
+`gitaly_migrate` code block, for example:
+
+```ruby
+gitaly_migrate(:tag_names) do
+...
+end
+```
+
+Since Gitaly features are always prefixed with `gitaly_`, the name of the feature flag in this case would be `gitaly_tag_names`.
+
+## Gitaly-Related Test Failures
+
+If your test-suite is failing with Gitaly issues, as a first step, try running:
+
+```shell
+rm -rf tmp/tests/gitaly
+```
+
+---
+
+[Return to Development documentation](README.md)

doc/development/licensing.md

@@ -65,6 +65,7 @@ Libraries with the following licenses are unacceptable for use:
 - [GNU AGPLv3][AGPLv3]: AGPL-licensed libraries cannot be linked to from non-GPL projects.
 - [Open Software License (OSL)][OSL]: is a copyleft license. In addition, the FSF [recommend against its use][OSL-GNU].
 - [Facebook BSD + PATENTS][Facebook]: is a 3-clause BSD license with a patent grant that has been deemed [Category X][x-list] by the Apache foundation.
+- [WTFPL][WTFPL]: is a public domain dedication [rejected by the OSI (3.2)][WTFPL-OSI]. Also has a strong language which is not in accordance with our diversity policy.
 
 ## Requesting Approval for Licenses
 
@@ -108,3 +109,5 @@ Gems which are included only in the "development" or "test" groups by Bundler ar
 [x-list]: https://www.apache.org/legal/resolved.html#category-x
 [Acceptable-Licenses]: #acceptable-licenses
 [Unacceptable-Licenses]: #unacceptable-licenses
+[WTFPL]: https://wtfpl.net
+[WTFPL-OSI]: https://opensource.org/minutes20090304

doc/integration/azure.md

@@ -74,6 +74,9 @@ To enable the Microsoft Azure OAuth2 OmniAuth provider you must register your ap
        tenant_id: "TENANT ID" } }
     ```
 
+    The `base_azure_url` is optional and can be added for different locales;
+    e.g. `base_azure_url: "https://login.microsoftonline.de"`.
+
 1.  Replace 'CLIENT ID', 'CLIENT SECRET' and 'TENANT ID' with the values you got above.
 
 1.  Save the configuration file.

doc/user/project/integrations/kubernetes.md

@@ -13,10 +13,13 @@ template, see the [Services Templates](services_templates.md) document.
 ## Configuration
 
 Navigate to the [Integrations page](project_services.md#accessing-the-project-services)
-of your project and select the **Kubernetes** service to configure it.
+of your project and select the **Kubernetes** service to configure it. Fill in
+all the needed parameters, check the "Active" checkbox and hit **Save changes**
+for the changes to take effect.
 
 ![Kubernetes configuration settings](img/kubernetes_configuration.png)
 
+<<<<<<< HEAD
 The Kubernetes service takes the following arguments:
 
 1. API URL
@@ -45,6 +48,35 @@ to create one. You can also view or create service tokens in the
 Fill in the service token and namespace according to the values you just got.
 If the API is using a self-signed TLS certificate, you'll also need to include
 the `ca.crt` contents as the `Custom CA bundle`.
+=======
+The Kubernetes service takes the following parameters:
+
+- **API URL** -
+  It's the URL that GitLab uses to access the Kubernetes API. Kubernetes
+  exposes several APIs, we want the "base" URL that is common to all of them,
+  e.g., `https://kubernetes.example.com` rather than `https://kubernetes.example.com/api/v1`.
+- **CA certificate** (optional) -
+  If the API is using a self-signed TLS certificate, you'll also need to include
+  the `ca.crt` contents here.
+- **Project namespace** (optional) - The following apply:
+  - By default you don't have to fill it in; by leaving it blank, GitLab will
+    create one for you.
+  - Each project should have a unique namespace.
+  - The project namespace is not necessarily the namespace of the secret, if
+    you're using a secret with broader permissions, like the secret from `default`.
+  - You should **not** use `default` as the project namespace.
+  - If you or someone created a secret specifically for the project, usually
+    with limited permissions, the secret's namespace and project namespace may
+    be the same.
+- **Token** -
+  GitLab authenticates against Kubernetes using service tokens, which are
+  scoped to a particular `namespace`. If you don't have a service token yet,
+  you can follow the
+  [Kubernetes documentation](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/)
+  to create one. You can also view or create service tokens in the
+  [Kubernetes dashboard](https://kubernetes.io/docs/tasks/access-application-cluster/web-ui-dashboard/#config)
+  (under **Config > Secrets**).
+>>>>>>> upstream/master
 
 [namespace]: https://kubernetes.io/docs/user-guide/namespaces/
 
@@ -67,7 +99,7 @@ GitLab CI build environment:
 
 ## Web terminals
 
->**NOTE:**
+NOTE: **Note:**
 Added in GitLab 8.15. You must be the project owner or have `master` permissions
 to use terminals. Support is currently limited to the first container in the
 first pod of your environment.

lib/api/entities.rb

@@ -99,6 +99,9 @@ module API
       expose :ssh_url_to_repo, :http_url_to_repo, :web_url
       expose :name, :name_with_namespace
       expose :path, :path_with_namespace
+      expose :avatar_url do |project, options|
+        project.avatar_url(only_path: false)
+      end
       expose :star_count, :forks_count
       expose :created_at, :last_activity_at
     end
@@ -156,9 +159,7 @@ module API
       expose :forked_from_project, using: Entities::BasicProjectDetails, if: lambda { |project, options| project.forked? }
       expose :import_status
       expose :import_error, if: lambda { |_project, options| options[:user_can_admin_project] }
-      expose :avatar_url do |user, options|
-        user.avatar_url(only_path: false)
-      end
+
       expose :open_issues_count, if: lambda { |project, options| project.feature_available?(:issues, options[:current_user]) }
       expose :runners_token, if: lambda { |_project, options| options[:user_can_admin_project] }
       expose :public_builds, as: :public_jobs
@@ -219,8 +220,8 @@ module API
       ## EE-only
 
       expose :lfs_enabled?, as: :lfs_enabled
-      expose :avatar_url do |user, options|
-        user.avatar_url(only_path: false)
+      expose :avatar_url do |group, options|
+        group.avatar_url(only_path: false)
       end
       expose :web_url
       expose :request_access_enabled
@@ -263,6 +264,7 @@ module API
     class RepoCommitDetail < RepoCommit
       expose :stats, using: Entities::RepoCommitStats
       expose :status
+      expose :last_pipeline, using: 'API::Entities::PipelineBasic'
     end
 
     class RepoBranch < Grape::Entity

lib/api/users.rb

@@ -11,7 +11,7 @@ module API
       end
 
       helpers do
-        def find_user(params)
+        def find_user_by_id(params)
           id = params[:user_id] || params[:id]
           User.find_by(id: id) || not_found!('User')
         end
@@ -436,7 +436,7 @@ module API
         resource :impersonation_tokens do
           helpers do
             def finder(options = {})
-              user = find_user(params)
+              user = find_user_by_id(params)
               PersonalAccessTokensFinder.new({ user: user, impersonation: true }.merge(options))
             end
 

lib/github/client.rb

 module Github
   class Client
     TIMEOUT = 60
+    DEFAULT_PER_PAGE = 100
 
     attr_reader :connection, :rate_limit
 
@@ -20,7 +21,7 @@ module Github
       exceed, reset_in = rate_limit.get
       sleep reset_in if exceed
 
-      Github::Response.new(connection.get(url, query))
+      Github::Response.new(connection.get(url, { per_page: DEFAULT_PER_PAGE }.merge(query)))
     end
 
     private

lib/github/import.rb

@@ -202,13 +202,8 @@ module Github
             merge_request.save!(validate: false)
             merge_request.merge_request_diffs.create
 
-            # Fetch review comments
             review_comments_url = "/repos/#{repo}/pulls/#{pull_request.iid}/comments"
             fetch_comments(merge_request, :review_comment, review_comments_url, LegacyDiffNote)
-
-            # Fetch comments
-            comments_url = "/repos/#{repo}/issues/#{pull_request.iid}/comments"
-            fetch_comments(merge_request, :comment, comments_url)
           rescue => e
             error(:pull_request, pull_request.url, e.message)
           ensure
@@ -241,12 +236,17 @@ module Github
         # for both features, like manipulating assignees, labels
         # and milestones, are provided within the Issues API.
         if representation.pull_request?
-          return unless representation.has_labels?
+          return unless representation.has_labels? || representation.has_comments?
 
           merge_request = MergeRequest.find_by!(target_project_id: project.id, iid: representation.iid)
-          merge_request.update_attribute(:label_ids, label_ids(representation.labels))
+
+          if representation.has_labels?
+            merge_request.update_attribute(:label_ids, label_ids(representation.labels))
+          end
+
+          fetch_comments_conditionally(merge_request, representation)
         else
-          return if Issue.where(iid: representation.iid, project_id: project.id).exists?
+          return if Issue.exists?(iid: representation.iid, project_id: project.id)
 
           author_id          = user_id(representation.author, project.creator_id)
           issue              = Issue.new
@@ -263,17 +263,20 @@ module Github
           issue.updated_at   = representation.updated_at
           issue.save!(validate: false)
 
-          # Fetch comments
-          if representation.has_comments?
-            comments_url = "/repos/#{repo}/issues/#{issue.iid}/comments"
-            fetch_comments(issue, :comment, comments_url)
-          end
+          fetch_comments_conditionally(issue, representation)
         end
       rescue => e
         error(:issue, representation.url, e.message)
       end
     end
 
+    def fetch_comments_conditionally(issuable, representation)
+      if representation.has_comments?
+        comments_url = "/repos/#{repo}/issues/#{issuable.iid}/comments"
+        fetch_comments(issuable, :comment, comments_url)
+      end
+    end
+
     def fetch_comments(noteable, type, url, klass = Note)
       while url
         comments = Github::Client.new(options).get(url)

lib/gitlab/bitbucket_import/importer.rb

@@ -149,16 +149,21 @@ module Gitlab
             description += @formatter.author_line(pull_request.author) unless find_user_id(pull_request.author)
             description += pull_request.description
 
+            source_branch_sha = pull_request.source_branch_sha
+            target_branch_sha = pull_request.target_branch_sha
+            source_branch_sha = project.repository.commit(source_branch_sha)&.sha || source_branch_sha
+            target_branch_sha = project.repository.commit(target_branch_sha)&.sha || target_branch_sha
+
             merge_request = project.merge_requests.create!(
               iid: pull_request.iid,
               title: pull_request.title,
               description: description,
               source_project: project,
               source_branch: pull_request.source_branch_name,
-              source_branch_sha: pull_request.source_branch_sha,
+              source_branch_sha: source_branch_sha,
               target_project: project,
               target_branch: pull_request.target_branch_name,
-              target_branch_sha: pull_request.target_branch_sha,
+              target_branch_sha: target_branch_sha,
               state: pull_request.state,
               author_id: gitlab_user_id(project, pull_request.author),
               assignee_id: nil,

lib/gitlab/ci/pipeline/chain/base.rb

+module Gitlab
+  module Ci
+    module Pipeline
+      module Chain
+        class Base
+          attr_reader :pipeline, :project, :current_user
+
+          def initialize(pipeline, command)
+            @pipeline = pipeline
+            @command = command
+
+            @project = command.project
+            @current_user = command.current_user
+          end
+
+          def perform!
+            raise NotImplementedError
+          end
+
+          def break?
+            raise NotImplementedError
+          end
+        end
+      end
+    end
+  end
+end

lib/gitlab/ci/pipeline/chain/create.rb

+module Gitlab
+  module Ci
+    module Pipeline
+      module Chain
+        class Create < Chain::Base
+          include Chain::Helpers
+
+          def perform!
+            ::Ci::Pipeline.transaction do
+              pipeline.save!
+
+              @command.seeds_block&.call(pipeline)
+
+              ::Ci::CreatePipelineStagesService
+                .new(project, current_user)
+                .execute(pipeline)
+            end
+          rescue ActiveRecord::RecordInvalid => e
+            error("Failed to persist the pipeline: #{e}")
+          end
+
+          def break?
+            !pipeline.persisted?
+          end
+        end
+      end
+    end
+  end
+end

lib/gitlab/ci/pipeline/chain/helpers.rb

+module Gitlab
+  module Ci
+    module Pipeline
+      module Chain
+        module Helpers
+          def branch_exists?
+            return @is_branch if defined?(@is_branch)
+
+            @is_branch = project.repository.branch_exists?(pipeline.ref)
+          end
+
+          def tag_exists?
+            return @is_tag if defined?(@is_tag)
+
+            @is_tag = project.repository.tag_exists?(pipeline.ref)
+          end
+
+          def error(message)
+            pipeline.errors.add(:base, message)
+          end
+        end
+      end
+    end
+  end
+end

lib/gitlab/ci/pipeline/chain/sequence.rb

+module Gitlab
+  module Ci
+    module Pipeline
+      module Chain
+        class Sequence
+          def initialize(pipeline, command, sequence)
+            @pipeline = pipeline
+            @completed = []
+
+            @sequence = sequence.map do |chain|
+              chain.new(pipeline, command)
+            end
+          end
+
+          def build!
+            @sequence.each do |step|
+              step.perform!
+
+              break if step.break?
+
+              @completed << step
+            end
+
+            @pipeline.tap do
+              yield @pipeline, self if block_given?
+            end
+          end
+
+          def complete?
+            @completed.size == @sequence.size
+          end
+        end
+      end
+    end
+  end
+end

lib/gitlab/ci/pipeline/chain/skip.rb

+module Gitlab
+  module Ci
+    module Pipeline
+      module Chain
+        class Skip < Chain::Base
+          SKIP_PATTERN = /\[(ci[ _-]skip|skip[ _-]ci)\]/i
+
+          def perform!
+            if skipped?
+              @pipeline.skip if @command.save_incompleted
+            end
+          end
+
+          def skipped?
+            !@command.ignore_skip_ci && commit_message_skips_ci?
+          end
+
+          def break?
+            skipped?
+          end
+
+          private
+
+          def commit_message_skips_ci?
+            return false unless @pipeline.git_commit_message
+
+            @skipped ||= !!(@pipeline.git_commit_message =~ SKIP_PATTERN)
+          end
+        end
+      end
+    end
+  end
+end

lib/gitlab/ci/pipeline/chain/validate/abilities.rb

+module Gitlab
+  module Ci
+    module Pipeline
+      module Chain
+        module Validate
+          class Abilities < Chain::Base
+            include Gitlab::Allowable
+            include Chain::Helpers
+
+            def perform!
+              unless project.builds_enabled?
+                return error('Pipelines are disabled!')
+              end
+
+              unless allowed_to_trigger_pipeline?
+                if can?(current_user, :create_pipeline, project)
+                  return error("Insufficient permissions for protected ref '#{pipeline.ref}'")
+                else
+                  return error('Insufficient permissions to create a new pipeline')
+                end
+              end
+            end
+
+            def break?
+              @pipeline.errors.any?
+            end
+
+            def allowed_to_trigger_pipeline?
+              if current_user
+                allowed_to_create?
+              else # legacy triggers don't have a corresponding user
+                !project.protected_for?(@pipeline.ref)
+              end
+            end
+
+            def allowed_to_create?
+              return unless can?(current_user, :create_pipeline, project)
+
+              access = Gitlab::UserAccess.new(current_user, project: project)
+
+              if branch_exists?
+                access.can_update_branch?(@pipeline.ref)
+              elsif tag_exists?
+                access.can_create_tag?(@pipeline.ref)
+              else
+                true # Allow it for now and we'll reject when we check ref existence
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

lib/gitlab/ci/pipeline/chain/validate/config.rb

+module Gitlab
+  module Ci
+    module Pipeline
+      module Chain
+        module Validate
+          class Config < Chain::Base
+            include Chain::Helpers
+
+            def perform!
+              unless @pipeline.config_processor
+                unless @pipeline.ci_yaml_file
+                  return error("Missing #{@pipeline.ci_yaml_file_path} file")
+                end
+
+                if @command.save_incompleted && @pipeline.has_yaml_errors?
+                  @pipeline.drop
+                end
+
+                return error(@pipeline.yaml_errors)
+              end
+
+              unless @pipeline.has_stage_seeds?
+                return error('No stages / jobs for this pipeline.')
+              end
+            end
+
+            def break?
+              @pipeline.errors.any? || @pipeline.persisted?
+            end
+          end
+        end
+      end
+    end
+  end
+end

lib/gitlab/ci/pipeline/chain/validate/repository.rb

+module Gitlab
+  module Ci
+    module Pipeline
+      module Chain
+        module Validate
+          class Repository < Chain::Base
+            include Chain::Helpers
+
+            def perform!
+              unless branch_exists? || tag_exists?
+                return error('Reference not found')
+              end
+
+              ## TODO, we check commit in the service, that is why
+              # there is no repository access here.
+              #
+              unless pipeline.sha
+                return error('Commit not found')
+              end
+            end
+
+            def break?
+              @pipeline.errors.any?
+            end
+          end
+        end
+      end
+    end
+  end
+end

lib/gitlab/ci/pipeline/duration.rb

+module Gitlab
+  module Ci
+    module Pipeline
+      # # Introduction - total running time
+      #
+      # The problem this module is trying to solve is finding the total running
+      # time amongst all the jobs, excluding retries and pending (queue) time.
+      # We could reduce this problem down to finding the union of periods.
+      #
+      # So each job would be represented as a `Period`, which consists of
+      # `Period#first` as when the job started and `Period#last` as when the
+      # job was finished. A simple example here would be:
+      #
+      # * A (1, 3)
+      # * B (2, 4)
+      # * C (6, 7)
+      #
+      # Here A begins from 1, and ends to 3. B begins from 2, and ends to 4.
+      # C begins from 6, and ends to 7. Visually it could be viewed as:
+      #
+      #     0  1  2  3  4  5  6  7
+      #        AAAAAAA
+      #           BBBBBBB
+      #                       CCCC
+      #
+      # The union of A, B, and C would be (1, 4) and (6, 7), therefore the
+      # total running time should be:
+      #
+      #     (4 - 1) + (7 - 6) => 4
+      #
+      # # The Algorithm
+      #
+      # The algorithm used here for union would be described as follow.
+      # First we make sure that all periods are sorted by `Period#first`.
+      # Then we try to merge periods by iterating through the first period
+      # to the last period. The goal would be merging all overlapped periods
+      # so that in the end all the periods are discrete. When all periods
+      # are discrete, we're free to just sum all the periods to get real
+      # running time.
+      #
+      # Here we begin from A, and compare it to B. We could find that
+      # before A ends, B already started. That is `B.first <= A.last`
+      # that is `2 <= 3` which means A and B are overlapping!
+      #
+      # When we found that two periods are overlapping, we would need to merge
+      # them into a new period and disregard the old periods. To make a new
+      # period, we take `A.first` as the new first because remember? we sorted
+      # them, so `A.first` must be smaller or equal to `B.first`. And we take
+      # `[A.last, B.last].max` as the new last because we want whoever ended
+      # later. This could be broken into two cases:
+      #
+      #     0  1  2  3  4
+      #        AAAAAAA
+      #           BBBBBBB
+      #
+      # Or:
+      #
+      #     0  1  2  3  4
+      #        AAAAAAAAAA
+      #           BBBB
+      #
+      # So that we need to take whoever ends later. Back to our example,
+      # after merging and discard A and B it could be visually viewed as:
+      #
+      #     0  1  2  3  4  5  6  7
+      #        DDDDDDDDDD
+      #                       CCCC
+      #
+      # Now we could go on and compare the newly created D and the old C.
+      # We could figure out that D and C are not overlapping by checking
+      # `C.first <= D.last` is `false`. Therefore we need to keep both C
+      # and D. The example would end here because there are no more jobs.
+      #
+      # After having the union of all periods, we just need to sum the length
+      # of all periods to get total time.
+      #
+      #     (4 - 1) + (7 - 6) => 4
+      #
+      # That is 4 is the answer in the example.
+      module Duration
+        extend self
+
+        Period = Struct.new(:first, :last) do
+          def duration
+            last - first
+          end
+        end
+
+        def from_pipeline(pipeline)
+          status = %w[success failed running canceled]
+          builds = pipeline.builds.latest
+            .where(status: status).where.not(started_at: nil).order(:started_at)
+
+          from_builds(builds)
+        end
+
+        def from_builds(builds)
+          now = Time.now
+
+          periods = builds.map do |b|
+            Period.new(b.started_at, b.finished_at || now)
+          end
+
+          from_periods(periods)
+        end
+
+        # periods should be sorted by `first`
+        def from_periods(periods)
+          process_duration(process_periods(periods))
+        end
+
+        private
+
+        def process_periods(periods)
+          return periods if periods.empty?
+
+          periods.drop(1).inject([periods.first]) do |result, current|
+            previous = result.last
+
+            if overlap?(previous, current)
+              result[-1] = merge(previous, current)
+              result
+            else
+              result << current
+            end
+          end
+        end
+
+        def overlap?(previous, current)
+          current.first <= previous.last
+        end
+
+        def merge(previous, current)
+          Period.new(previous.first, [previous.last, current.last].max)
+        end
+
+        def process_duration(periods)
+          periods.sum(&:duration)
+        end
+      end
+    end
+  end
+end

lib/gitlab/ci/pipeline_duration.rb

-module Gitlab
-  module Ci
-    # # Introduction - total running time
-    #
-    # The problem this module is trying to solve is finding the total running
-    # time amongst all the jobs, excluding retries and pending (queue) time.
-    # We could reduce this problem down to finding the union of periods.
-    #
-    # So each job would be represented as a `Period`, which consists of
-    # `Period#first` as when the job started and `Period#last` as when the
-    # job was finished. A simple example here would be:
-    #
-    # * A (1, 3)
-    # * B (2, 4)
-    # * C (6, 7)
-    #
-    # Here A begins from 1, and ends to 3. B begins from 2, and ends to 4.
-    # C begins from 6, and ends to 7. Visually it could be viewed as:
-    #
-    #     0  1  2  3  4  5  6  7
-    #        AAAAAAA
-    #           BBBBBBB
-    #                       CCCC
-    #
-    # The union of A, B, and C would be (1, 4) and (6, 7), therefore the
-    # total running time should be:
-    #
-    #     (4 - 1) + (7 - 6) => 4
-    #
-    # # The Algorithm
-    #
-    # The algorithm used here for union would be described as follow.
-    # First we make sure that all periods are sorted by `Period#first`.
-    # Then we try to merge periods by iterating through the first period
-    # to the last period. The goal would be merging all overlapped periods
-    # so that in the end all the periods are discrete. When all periods
-    # are discrete, we're free to just sum all the periods to get real
-    # running time.
-    #
-    # Here we begin from A, and compare it to B. We could find that
-    # before A ends, B already started. That is `B.first <= A.last`
-    # that is `2 <= 3` which means A and B are overlapping!
-    #
-    # When we found that two periods are overlapping, we would need to merge
-    # them into a new period and disregard the old periods. To make a new
-    # period, we take `A.first` as the new first because remember? we sorted
-    # them, so `A.first` must be smaller or equal to `B.first`. And we take
-    # `[A.last, B.last].max` as the new last because we want whoever ended
-    # later. This could be broken into two cases:
-    #
-    #     0  1  2  3  4
-    #        AAAAAAA
-    #           BBBBBBB
-    #
-    # Or:
-    #
-    #     0  1  2  3  4
-    #        AAAAAAAAAA
-    #           BBBB
-    #
-    # So that we need to take whoever ends later. Back to our example,
-    # after merging and discard A and B it could be visually viewed as:
-    #
-    #     0  1  2  3  4  5  6  7
-    #        DDDDDDDDDD
-    #                       CCCC
-    #
-    # Now we could go on and compare the newly created D and the old C.
-    # We could figure out that D and C are not overlapping by checking
-    # `C.first <= D.last` is `false`. Therefore we need to keep both C
-    # and D. The example would end here because there are no more jobs.
-    #
-    # After having the union of all periods, we just need to sum the length
-    # of all periods to get total time.
-    #
-    #     (4 - 1) + (7 - 6) => 4
-    #
-    # That is 4 is the answer in the example.
-    module PipelineDuration
-      extend self
-
-      Period = Struct.new(:first, :last) do
-        def duration
-          last - first
-        end
-      end
-
-      def from_pipeline(pipeline)
-        status = %w[success failed running canceled]
-        builds = pipeline.builds.latest
-          .where(status: status).where.not(started_at: nil).order(:started_at)
-
-        from_builds(builds)
-      end
-
-      def from_builds(builds)
-        now = Time.now
-
-        periods = builds.map do |b|
-          Period.new(b.started_at, b.finished_at || now)
-        end
-
-        from_periods(periods)
-      end
-
-      # periods should be sorted by `first`
-      def from_periods(periods)
-        process_duration(process_periods(periods))
-      end
-
-      private
-
-      def process_periods(periods)
-        return periods if periods.empty?
-
-        periods.drop(1).inject([periods.first]) do |result, current|
-          previous = result.last
-
-          if overlap?(previous, current)
-            result[-1] = merge(previous, current)
-            result
-          else
-            result << current
-          end
-        end
-      end
-
-      def overlap?(previous, current)
-        current.first <= previous.last
-      end
-
-      def merge(previous, current)
-        Period.new(previous.first, [previous.last, current.last].max)
-      end
-
-      def process_duration(periods)
-        periods.sum(&:duration)
-      end
-    end
-  end
-end

lib/gitlab/diff/diff_refs.rb

@@ -13,9 +13,9 @@ module Gitlab
 
       def ==(other)
         other.is_a?(self.class) &&
-          base_sha == other.base_sha &&
-          start_sha == other.start_sha &&
-          head_sha == other.head_sha
+          shas_equal?(base_sha, other.base_sha) &&
+          shas_equal?(start_sha, other.start_sha) &&
+          shas_equal?(head_sha, other.head_sha)
       end
 
       alias_method :eql?, :==
@@ -47,6 +47,22 @@ module Gitlab
           CompareService.new(project, head_sha).execute(project, start_sha, straight: straight)
         end
       end
+
+      private
+
+      def shas_equal?(sha1, sha2)
+        return true if sha1 == sha2
+        return false if sha1.nil? || sha2.nil?
+        return false unless sha1.class == sha2.class
+
+        length = [sha1.length, sha2.length].min
+
+        # If either of the shas is below the minimum length, we cannot be sure
+        # that they actually refer to the same commit because of hash collision.
+        return false if length < Commit::MIN_SHA_LENGTH
+
+        sha1[0, length] == sha2[0, length]
+      end
     end
   end
 end

lib/gitlab/diff/position.rb

@@ -49,12 +49,13 @@ module Gitlab
         coder['attributes'] = self.to_h
       end
 
-      def key
-        @key ||= [base_sha, start_sha, head_sha, Digest::SHA1.hexdigest(old_path || ""), Digest::SHA1.hexdigest(new_path || ""), old_line, new_line]
-      end
-
       def ==(other)
-        other.is_a?(self.class) && key == other.key
+        other.is_a?(self.class) &&
+          other.diff_refs == diff_refs &&
+          other.old_path == old_path &&
+          other.new_path == new_path &&
+          other.old_line == old_line &&
+          other.new_line == new_line
       end
 
       def to_h

locale/gitlab.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gitlab 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-21 14:20+0530\n"
-"PO-Revision-Date: 2017-09-21 14:20+0530\n"
+"POT-Creation-Date: 2017-09-27 11:10+0100\n"
+"PO-Revision-Date: 2017-09-27 11:10+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -31,6 +31,9 @@ msgstr[1] ""
 msgid "%{commit_author_link} committed %{commit_timeago}"
 msgstr ""
 
+msgid "%{number_commits_behind} commits behind %{default_branch}, %{number_commits_ahead} commits ahead"
+msgstr ""
+
 msgid "%{number_of_failures} of %{maximum_failures} failures. GitLab will allow access on the next attempt."
 msgstr ""
 
@@ -131,25 +134,28 @@ msgstr ""
 msgid "Authentication Log"
 msgstr ""
 
-msgid "Auto DevOps (Beta)"
+msgid "Auto Review Apps and Auto Deploy need a domain name and the %{kubernetes} to work correctly."
 msgstr ""
 
-msgid "Auto DevOps can be activated for this project. It will automatically build, test, and deploy your application based on a predefined CI/CD configuration."
+msgid "Auto Review Apps and Auto Deploy need a domain name to work correctly."
 msgstr ""
 
-msgid "Auto DevOps documentation"
+msgid "Auto Review Apps and Auto Deploy need the %{kubernetes} to work correctly."
 msgstr ""
 
-msgid "Auto Review Apps and Auto Deploy need a domain name and the %{kubernetes} to work correctly."
+msgid "AutoDevOps|Auto DevOps (Beta)"
 msgstr ""
 
-msgid "Auto Review Apps and Auto Deploy need a domain name to work correctly."
+msgid "AutoDevOps|Auto DevOps can be activated for this project. It will automatically build, test, and deploy your application based on a predefined CI/CD configuration."
 msgstr ""
 
-msgid "Auto Review Apps and Auto Deploy need the %{kubernetes} to work correctly."
+msgid "AutoDevOps|Auto DevOps documentation"
 msgstr ""
 
-msgid "AutoDevOps|Learn more in the"
+msgid "AutoDevOps|Enable in settings"
+msgstr ""
+
+msgid "AutoDevOps|Learn more in the %{link_to_documentation}"
 msgstr ""
 
 msgid "Board"
@@ -172,12 +178,81 @@ msgstr ""
 msgid "Branches"
 msgstr ""
 
+msgid "Branches|Cant find HEAD commit for this branch"
+msgstr ""
+
+msgid "Branches|Compare"
+msgstr ""
+
+msgid "Branches|Delete all branches that are merged into '%{default_branch}'"
+msgstr ""
+
+msgid "Branches|Delete branch"
+msgstr ""
+
+msgid "Branches|Delete merged branches"
+msgstr ""
+
+msgid "Branches|Delete protected branch"
+msgstr ""
+
+msgid "Branches|Delete protected branch '%{branch_name}'?"
+msgstr ""
+
+msgid "Branches|Deleting the '%{branch_name}' branch cannot be undone. Are you sure?"
+msgstr ""
+
+msgid "Branches|Deleting the merged branches cannot be undone. Are you sure?"
+msgstr ""
+
+msgid "Branches|Filter by branch name"
+msgstr ""
+
+msgid "Branches|Merged into %{default_branch}"
+msgstr ""
+
+msgid "Branches|New branch"
+msgstr ""
+
+msgid "Branches|No branches to show"
+msgstr ""
+
+msgid "Branches|Once you confirm and press %{delete_protected_branch}, it cannot be undone or recovered."
+msgstr ""
+
+msgid "Branches|Only a project master or owner can delete a protected branch"
+msgstr ""
+
+msgid "Branches|Protected branches can be managed in %{project_settings_link}"
+msgstr ""
+
+msgid "Branches|Sort by"
+msgstr ""
+
+msgid "Branches|The default branch cannot be deleted"
+msgstr ""
+
 msgid "Branches|This branch hasn’t been merged into %{default_branch}."
 msgstr ""
 
 msgid "Branches|To avoid data loss, consider merging this branch before deleting it."
 msgstr ""
 
+msgid "Branches|To confirm, type %{branch_name_confirmation}:"
+msgstr ""
+
+msgid "Branches|You’re about to permanently delete the protected branch %{branch_name}."
+msgstr ""
+
+msgid "Branches|merged"
+msgstr ""
+
+msgid "Branches|project settings"
+msgstr ""
+
+msgid "Branches|protected"
+msgstr ""
+
 msgid "Browse Directory"
 msgstr ""
 
@@ -402,6 +477,12 @@ msgstr ""
 msgid "CycleAnalyticsStage|Test"
 msgstr ""
 
+msgid "DashboardProjects|All"
+msgstr ""
+
+msgid "DashboardProjects|Personal"
+msgstr ""
+
 msgid "Define a custom pattern with cron syntax"
 msgstr ""
 
@@ -467,9 +548,6 @@ msgstr ""
 msgid "Emails"
 msgstr ""
 
-msgid "Enable in settings"
-msgstr ""
-
 msgid "EventFilterBy|Filter by all"
 msgstr ""
 
@@ -568,7 +646,7 @@ msgstr ""
 msgid "GroupSettings|This setting is applied on %{ancestor_group}. You can override the setting or %{remove_ancestor_share_with_group_lock}."
 msgstr ""
 
-msgid "GroupSettings|This setting will be applied to all subgroups unless overridden by a group owner."
+msgid "GroupSettings|This setting will be applied to all subgroups unless overridden by a group owner. Groups that already have access to the project will continue to have access unless removed manually."
 msgstr ""
 
 msgid "GroupSettings|cannot be disabled when the parent group \"Share with group lock\" is enabled, except by the owner of the parent group"
@@ -595,9 +673,6 @@ msgstr ""
 msgid "HealthCheck|Unhealthy"
 msgstr ""
 
-msgid "Home"
-msgstr ""
-
 msgid "Housekeeping successfully started"
 msgstr ""
 
@@ -680,6 +755,9 @@ msgstr ""
 msgid "Merge events"
 msgstr ""
 
+msgid "Merge request"
+msgstr ""
+
 msgid "Messages"
 msgstr ""
 
@@ -955,9 +1033,6 @@ msgstr ""
 msgid "Project export started. A download link will be sent by email."
 msgstr ""
 
-msgid "Project home"
-msgstr ""
-
 msgid "ProjectActivityRSS|Subscribe"
 msgstr ""
 
@@ -1128,6 +1203,93 @@ msgstr[1] ""
 msgid "Snippets"
 msgstr ""
 
+msgid "SortOptions|Access level, ascending"
+msgstr ""
+
+msgid "SortOptions|Access level, descending"
+msgstr ""
+
+msgid "SortOptions|Created date"
+msgstr ""
+
+msgid "SortOptions|Due date"
+msgstr ""
+
+msgid "SortOptions|Due later"
+msgstr ""
+
+msgid "SortOptions|Due soon"
+msgstr ""
+
+msgid "SortOptions|Label priority"
+msgstr ""
+
+msgid "SortOptions|Largest group"
+msgstr ""
+
+msgid "SortOptions|Largest repository"
+msgstr ""
+
+msgid "SortOptions|Last created"
+msgstr ""
+
+msgid "SortOptions|Last joined"
+msgstr ""
+
+msgid "SortOptions|Last updated"
+msgstr ""
+
+msgid "SortOptions|Least popular"
+msgstr ""
+
+msgid "SortOptions|Milestone"
+msgstr ""
+
+msgid "SortOptions|Milestone due later"
+msgstr ""
+
+msgid "SortOptions|Milestone due soon"
+msgstr ""
+
+msgid "SortOptions|Most popular"
+msgstr ""
+
+msgid "SortOptions|Name"
+msgstr ""
+
+msgid "SortOptions|Name, ascending"
+msgstr ""
+
+msgid "SortOptions|Name, descending"
+msgstr ""
+
+msgid "SortOptions|Oldest created"
+msgstr ""
+
+msgid "SortOptions|Oldest joined"
+msgstr ""
+
+msgid "SortOptions|Oldest sign in"
+msgstr ""
+
+msgid "SortOptions|Oldest updated"
+msgstr ""
+
+msgid "SortOptions|Popularity"
+msgstr ""
+
+msgid "SortOptions|Priority"
+msgstr ""
+
+msgid "SortOptions|Recent sign in"
+msgstr ""
+
+msgid "SortOptions|Start later"
+msgstr ""
+
+msgid "SortOptions|Start soon"
+msgstr ""
+
 msgid "Source code"
 msgstr ""
 
@@ -1398,9 +1560,15 @@ msgstr ""
 msgid "Use your global notification setting"
 msgstr ""
 
+msgid "View file @ "
+msgstr ""
+
 msgid "View open merge request"
 msgstr ""
 
+msgid "View replaced file @ "
+msgstr ""
+
 msgid "VisibilityLevel|Internal"
 msgstr ""
 

spec/fixtures/api/schemas/public_api/v4/commit/detail.json

@@ -5,11 +5,18 @@
     {
       "required" : [
         "stats",
-        "status"
+        "status",
+        "last_pipeline"
       ],
       "properties": {
         "stats": { "$ref": "../commit_stats.json" },
-        "status": { "type": ["string", "null"] }
+        "status": { "type": ["string", "null"] },
+        "last_pipeline": {
+          "oneOf": [
+            { "type": "null" },
+            { "$ref": "../pipeline/basic.json" }
+          ]
+        }
       }
     }
   ]

spec/fixtures/api/schemas/public_api/v4/pipeline/basic.json

+{
+  "type": "object",
+  "required" : [
+    "id",
+    "sha",
+    "ref",
+    "status"
+  ],
+  "properties" : {
+    "id": { "type": "integer" },
+    "sha": { "type": "string" },
+    "ref": { "type": "string" },
+    "status": { "type": "string" }
+  },
+  "additionalProperties": false
+}

spec/javascripts/line_highlighter_spec.js

@@ -18,19 +18,25 @@ import '~/line_highlighter';
     beforeEach(function() {
       loadFixtures('static/line_highlighter.html.raw');
       this["class"] = new LineHighlighter();
-      this.css = this["class"].highlightClass;
+      this.css = this["class"].highlightLineClass;
       return this.spies = {
         __setLocationHash__: spyOn(this["class"], '__setLocationHash__').and.callFake(function() {})
       };
     });
     describe('behavior', function() {
       it('highlights one line given in the URL hash', function() {
-        new LineHighlighter('#L13');
+        new LineHighlighter({ hash: '#L13' });
         return expect($('#LC13')).toHaveClass(this.css);
       });
+      it('highlights one line given in the URL hash with given CSS class name', function() {
+        const hiliter = new LineHighlighter({ hash: '#L13', highlightLineClass: 'hilite' });
+        expect(hiliter.highlightLineClass).toBe('hilite');
+        expect($('#LC13')).toHaveClass('hilite');
+        expect($('#LC13')).not.toHaveClass('hll');
+      });
       it('highlights a range of lines given in the URL hash', function() {
         var line, results;
-        new LineHighlighter('#L5-25');
+        new LineHighlighter({ hash: '#L5-25' });
         expect($("." + this.css).length).toBe(21);
         results = [];
         for (line = 5; line <= 25; line += 1) {
@@ -41,7 +47,7 @@ import '~/line_highlighter';
       it('scrolls to the first highlighted line on initial load', function() {
         var spy;
         spy = spyOn($, 'scrollTo');
-        new LineHighlighter('#L5-25');
+        new LineHighlighter({ hash: '#L5-25' });
         return expect(spy).toHaveBeenCalledWith('#L5', jasmine.anything());
       });
       it('discards click events', function() {
@@ -50,10 +56,10 @@ import '~/line_highlighter';
         clickLine(13);
         return expect(spy).toHaveBeenPrevented();
       });
-      return it('handles garbage input from the hash', function() {
+      it('handles garbage input from the hash', function() {
         var func;
         func = function() {
-          return new LineHighlighter('#blob-content-holder');
+          return new LineHighlighter({ fileHolderSelector: '#blob-content-holder' });
         };
         return expect(func).not.toThrow();
       });

spec/javascripts/merge_request_tabs_spec.js

@@ -416,5 +416,28 @@ import 'vendor/jquery.scrollTo';
         });
       });
     });
+
+    describe('expandViewContainer', function () {
+      beforeEach(() => {
+        $('body').append('<div class="content-wrapper"><div class="container-fluid container-limited"></div></div>');
+      });
+
+      afterEach(() => {
+        $('.content-wrapper').remove();
+      });
+
+      it('removes container-limited from containers', function () {
+        this.class.expandViewContainer();
+
+        expect($('.content-wrapper')).not.toContainElement('.container-limited');
+      });
+
+      it('does remove container-limited from breadcrumbs', function () {
+        $('.container-limited').addClass('breadcrumbs');
+        this.class.expandViewContainer();
+
+        expect($('.content-wrapper')).toContainElement('.container-limited');
+      });
+    });
   });
 }).call(window);

spec/lib/github/client_spec.rb

+require 'spec_helper'
+
+describe Github::Client do
+  let(:connection) { spy }
+  let(:rate_limit) { double(get: [false, 1]) }
+  let(:client) { described_class.new({}) }
+  let(:results) { double }
+  let(:response) { double }
+
+  before do
+    allow(Faraday).to receive(:new).and_return(connection)
+    allow(Github::RateLimit).to receive(:new).with(connection).and_return(rate_limit)
+  end
+
+  describe '#get' do
+    before do
+      allow(Github::Response).to receive(:new).with(results).and_return(response)
+    end
+
+    it 'uses a default per_page param' do
+      expect(connection).to receive(:get).with('/foo', per_page: 100).and_return(results)
+
+      expect(client.get('/foo')).to eq(response)
+    end
+
+    context 'with per_page given' do
+      it 'overwrites the default per_page' do
+        expect(connection).to receive(:get).with('/foo', per_page: 30).and_return(results)
+
+        expect(client.get('/foo', per_page: 30)).to eq(response)
+      end
+    end
+  end
+end

spec/lib/gitlab/ci/pipeline/chain/create_spec.rb

+require 'spec_helper'
+
+describe Gitlab::Ci::Pipeline::Chain::Create do
+  set(:project) { create(:project) }
+  set(:user) { create(:user) }
+
+  let(:pipeline) do
+    build(:ci_pipeline_with_one_job, project: project,
+                                     ref: 'master')
+  end
+
+  let(:command) do
+    double('command', project: project,
+                      current_user: user,
+                      seeds_block: nil)
+  end
+
+  let(:step) { described_class.new(pipeline, command) }
+
+  before do
+    step.perform!
+  end
+
+  context 'when pipeline is ready to be saved' do
+    it 'saves a pipeline' do
+      expect(pipeline).to be_persisted
+    end
+
+    it 'does not break the chain' do
+      expect(step.break?).to be false
+    end
+
+    it 'creates stages' do
+      expect(pipeline.reload.stages).to be_one
+    end
+  end
+
+  context 'when pipeline has validation errors' do
+    let(:pipeline) do
+      build(:ci_pipeline, project: project, ref: nil)
+    end
+
+    it 'breaks the chain' do
+      expect(step.break?).to be true
+    end
+
+    it 'appends validation error' do
+      expect(pipeline.errors.to_a)
+        .to include /Failed to persist the pipeline/
+    end
+  end
+
+  context 'when there is a seed block present' do
+    let(:seeds) { spy('pipeline seeds') }
+
+    let(:command) do
+      double('command', project: project,
+                        current_user: user,
+                        seeds_block: seeds)
+    end
+
+    it 'executes the block' do
+      expect(seeds).to have_received(:call).with(pipeline)
+    end
+  end
+end

spec/lib/gitlab/ci/pipeline/chain/sequence_spec.rb

+require 'spec_helper'
+
+describe Gitlab::Ci::Pipeline::Chain::Sequence do
+  set(:project) { create(:project) }
+  set(:user) { create(:user) }
+
+  let(:pipeline) { build_stubbed(:ci_pipeline) }
+  let(:command) { double('command' ) }
+  let(:first_step) { spy('first step') }
+  let(:second_step) { spy('second step') }
+  let(:sequence) { [first_step, second_step] }
+
+  subject do
+    described_class.new(pipeline, command, sequence)
+  end
+
+  context 'when one of steps breaks the chain' do
+    before do
+      allow(first_step).to receive(:break?).and_return(true)
+    end
+
+    it 'does not process the second step' do
+      subject.build! do |pipeline, sequence|
+        expect(sequence).not_to be_complete
+      end
+
+      expect(second_step).not_to have_received(:perform!)
+    end
+
+    it 'returns a pipeline object' do
+      expect(subject.build!).to eq pipeline
+    end
+  end
+
+  context 'when all chains are executed correctly' do
+    before do
+      sequence.each do |step|
+        allow(step).to receive(:break?).and_return(false)
+      end
+    end
+
+    it 'iterates through entire sequence' do
+      subject.build! do |pipeline, sequence|
+        expect(sequence).to be_complete
+      end
+
+      expect(first_step).to have_received(:perform!)
+      expect(second_step).to have_received(:perform!)
+    end
+
+    it 'returns a pipeline object' do
+      expect(subject.build!).to eq pipeline
+    end
+  end
+end

spec/lib/gitlab/ci/pipeline/chain/skip_spec.rb

+require 'spec_helper'
+
+describe Gitlab::Ci::Pipeline::Chain::Skip do
+  set(:project) { create(:project) }
+  set(:user) { create(:user) }
+  set(:pipeline) { create(:ci_pipeline, project: project) }
+
+  let(:command) do
+    double('command', project: project,
+                      current_user: user,
+                      ignore_skip_ci: false,
+                      save_incompleted: true)
+  end
+
+  let(:step) { described_class.new(pipeline, command) }
+
+  context 'when pipeline has been skipped by a user' do
+    before do
+      allow(pipeline).to receive(:git_commit_message)
+        .and_return('commit message [ci skip]')
+
+      step.perform!
+    end
+
+    it 'should break the chain' do
+      expect(step.break?).to be true
+    end
+
+    it 'skips the pipeline' do
+      expect(pipeline.reload).to be_skipped
+    end
+  end
+
+  context 'when pipeline has not been skipped' do
+    before do
+      step.perform!
+    end
+
+    it 'should not break the chain' do
+      expect(step.break?).to be false
+    end
+
+    it 'should not skip a pipeline chain' do
+      expect(pipeline.reload).not_to be_skipped
+    end
+  end
+
+  context 'when [ci skip] should be ignored' do
+    let(:command) do
+      double('command', project: project,
+                        current_user: user,
+                        ignore_skip_ci: true)
+    end
+
+    it 'does not break the chain' do
+      step.perform!
+
+      expect(step.break?).to be false
+    end
+  end
+
+  context 'when pipeline should be skipped but not persisted' do
+    let(:command) do
+      double('command', project: project,
+                        current_user: user,
+                        ignore_skip_ci: false,
+                        save_incompleted: false)
+    end
+
+    before do
+      allow(pipeline).to receive(:git_commit_message)
+        .and_return('commit message [ci skip]')
+
+      step.perform!
+    end
+
+    it 'breaks the chain' do
+      expect(step.break?).to be true
+    end
+
+    it 'does not skip pipeline' do
+      expect(pipeline.reload).not_to be_skipped
+    end
+  end
+end

spec/lib/gitlab/ci/pipeline/chain/validate/abilities_spec.rb

+require 'spec_helper'
+
+describe Gitlab::Ci::Pipeline::Chain::Validate::Abilities do
+  set(:project) { create(:project, :repository) }
+  set(:user) { create(:user) }
+
+  let(:pipeline) do
+    build_stubbed(:ci_pipeline, ref: ref, project: project)
+  end
+
+  let(:command) do
+    double('command', project: project, current_user: user)
+  end
+
+  let(:step) { described_class.new(pipeline, command) }
+
+  let(:ref) { 'master' }
+
+  context 'when users has no ability to run a pipeline' do
+    before do
+      step.perform!
+    end
+
+    it 'adds an error about insufficient permissions' do
+      expect(pipeline.errors.to_a)
+        .to include /Insufficient permissions/
+    end
+
+    it 'breaks the pipeline builder chain' do
+      expect(step.break?).to eq true
+    end
+  end
+
+  context 'when user has ability to create a pipeline' do
+    before do
+      project.add_developer(user)
+
+      step.perform!
+    end
+
+    it 'does not invalidate the pipeline' do
+      expect(pipeline).to be_valid
+    end
+
+    it 'does not break the chain' do
+      expect(step.break?).to eq false
+    end
+  end
+
+  describe '#allowed_to_create?' do
+    subject { step.allowed_to_create? }
+
+    context 'when user is a developer' do
+      before do
+        project.add_developer(user)
+      end
+
+      it { is_expected.to be_truthy }
+
+      context 'when the branch is protected' do
+        let!(:protected_branch) do
+          create(:protected_branch, project: project, name: ref)
+        end
+
+        it { is_expected.to be_falsey }
+
+        context 'when developers are allowed to merge' do
+          let!(:protected_branch) do
+            create(:protected_branch,
+                   :developers_can_merge,
+                   project: project,
+                   name: ref)
+          end
+
+          it { is_expected.to be_truthy }
+        end
+      end
+
+      context 'when the tag is protected' do
+        let(:ref) { 'v1.0.0' }
+
+        let!(:protected_tag) do
+          create(:protected_tag, project: project, name: ref)
+        end
+
+        it { is_expected.to be_falsey }
+
+        context 'when developers are allowed to create the tag' do
+          let!(:protected_tag) do
+            create(:protected_tag,
+                   :developers_can_create,
+                   project: project,
+                   name: ref)
+          end
+
+          it { is_expected.to be_truthy }
+        end
+      end
+    end
+
+    context 'when user is a master' do
+      before do
+        project.add_master(user)
+      end
+
+      it { is_expected.to be_truthy }
+
+      context 'when the branch is protected' do
+        let!(:protected_branch) do
+          create(:protected_branch, project: project, name: ref)
+        end
+
+        it { is_expected.to be_truthy }
+      end
+
+      context 'when the tag is protected' do
+        let(:ref) { 'v1.0.0' }
+
+        let!(:protected_tag) do
+          create(:protected_tag, project: project, name: ref)
+        end
+
+        it { is_expected.to be_truthy }
+
+        context 'when no one can create the tag' do
+          let!(:protected_tag) do
+            create(:protected_tag,
+                   :no_one_can_create,
+                   project: project,
+                   name: ref)
+          end
+
+          it { is_expected.to be_falsey }
+        end
+      end
+    end
+
+    context 'when owner cannot create pipeline' do
+      it { is_expected.to be_falsey }
+    end
+  end
+end

spec/lib/gitlab/ci/pipeline/chain/validate/config_spec.rb

+require 'spec_helper'
+
+describe Gitlab::Ci::Pipeline::Chain::Validate::Config do
+  set(:project) { create(:project) }
+  set(:user) { create(:user) }
+
+  let(:command) do
+    double('command', project: project,
+                      current_user: user,
+                      save_incompleted: true)
+  end
+
+  let!(:step) { described_class.new(pipeline, command) }
+
+  before do
+    step.perform!
+  end
+
+  context 'when pipeline has no YAML configuration' do
+    let(:pipeline) do
+      build_stubbed(:ci_pipeline, project: project)
+    end
+
+    it 'appends errors about missing configuration' do
+      expect(pipeline.errors.to_a)
+        .to include 'Missing .gitlab-ci.yml file'
+    end
+
+    it 'breaks the chain' do
+      expect(step.break?).to be true
+    end
+  end
+
+  context 'when YAML configuration contains errors' do
+    let(:pipeline) do
+      build(:ci_pipeline, project: project, config: 'invalid YAML')
+    end
+
+    it 'appends errors about YAML errors' do
+      expect(pipeline.errors.to_a)
+        .to include 'Invalid configuration format'
+    end
+
+    it 'breaks the chain' do
+      expect(step.break?).to be true
+    end
+
+    context 'when saving incomplete pipeline is allowed' do
+      let(:command) do
+        double('command', project: project,
+                          current_user: user,
+                          save_incompleted: true)
+      end
+
+      it 'fails the pipeline' do
+        expect(pipeline.reload).to be_failed
+      end
+    end
+
+    context 'when saving incomplete pipeline is not allowed' do
+      let(:command) do
+        double('command', project: project,
+                          current_user: user,
+                          save_incompleted: false)
+      end
+
+      it 'does not drop pipeline' do
+        expect(pipeline).not_to be_failed
+        expect(pipeline).not_to be_persisted
+      end
+    end
+  end
+
+  context 'when pipeline has no stages / jobs' do
+    let(:config) do
+      { rspec: {
+          script: 'ls',
+          only: ['something']
+      } }
+    end
+
+    let(:pipeline) do
+      build(:ci_pipeline, project: project, config: config)
+    end
+
+    it 'appends an error about missing stages' do
+      expect(pipeline.errors.to_a)
+        .to include 'No stages / jobs for this pipeline.'
+    end
+
+    it 'breaks the chain' do
+      expect(step.break?).to be true
+    end
+  end
+
+  context 'when pipeline contains configuration validation errors' do
+    let(:config) { { rspec: {} } }
+
+    let(:pipeline) do
+      build(:ci_pipeline, project: project, config: config)
+    end
+
+    it 'appends configuration validation errors to pipeline errors' do
+      expect(pipeline.errors.to_a)
+        .to include "jobs:rspec config can't be blank"
+    end
+
+    it 'breaks the chain' do
+      expect(step.break?).to be true
+    end
+  end
+
+  context 'when pipeline is correct and complete' do
+    let(:pipeline) do
+      build(:ci_pipeline_with_one_job, project: project)
+    end
+
+    it 'does not invalidate the pipeline' do
+      expect(pipeline).to be_valid
+    end
+
+    it 'does not break the chain' do
+      expect(step.break?).to be false
+    end
+  end
+end

spec/lib/gitlab/ci/pipeline/chain/validate/repository_spec.rb

+require 'spec_helper'
+
+describe Gitlab::Ci::Pipeline::Chain::Validate::Repository do
+  set(:project) { create(:project, :repository) }
+  set(:user) { create(:user) }
+
+  let(:command) do
+    double('command', project: project, current_user: user)
+  end
+
+  let!(:step) { described_class.new(pipeline, command) }
+
+  before do
+    step.perform!
+  end
+
+  context 'when pipeline ref and sha exists' do
+    let(:pipeline) do
+      build_stubbed(:ci_pipeline, ref: 'master', sha: '123', project: project)
+    end
+
+    it 'does not break the chain' do
+      expect(step.break?).to be false
+    end
+
+    it 'does not append pipeline errors' do
+      expect(pipeline.errors).to be_empty
+    end
+  end
+
+  context 'when pipeline ref does not exist' do
+    let(:pipeline) do
+      build_stubbed(:ci_pipeline, ref: 'something', project: project)
+    end
+
+    it 'breaks the chain' do
+      expect(step.break?).to be true
+    end
+
+    it 'adds an error about missing ref' do
+      expect(pipeline.errors.to_a)
+        .to include 'Reference not found'
+    end
+  end
+
+  context 'when pipeline does not have SHA set' do
+    let(:pipeline) do
+      build_stubbed(:ci_pipeline, ref: 'master', sha: nil, project: project)
+    end
+
+    it 'breaks the chain' do
+      expect(step.break?).to be true
+    end
+
+    it 'adds an error about missing SHA' do
+      expect(pipeline.errors.to_a)
+        .to include 'Commit not found'
+    end
+  end
+end

spec/lib/gitlab/ci/pipeline_duration_spec.rb → spec/lib/gitlab/ci/pipeline/duration_spec.rb

 require 'spec_helper'
 
-describe Gitlab::Ci::PipelineDuration do
+describe Gitlab::Ci::Pipeline::Duration do
   let(:calculated_duration) { calculate(data) }
 
   shared_examples 'calculating duration' do
@@ -107,9 +107,9 @@ describe Gitlab::Ci::PipelineDuration do
 
   def calculate(data)
     periods = data.shuffle.map do |(first, last)|
-      Gitlab::Ci::PipelineDuration::Period.new(first, last)
+      described_class::Period.new(first, last)
     end
 
-    Gitlab::Ci::PipelineDuration.from_periods(periods.sort_by(&:first))
+    described_class.from_periods(periods.sort_by(&:first))
   end
 end

spec/lib/gitlab/diff/diff_refs_spec.rb

@@ -3,6 +3,61 @@ require 'spec_helper'
 describe Gitlab::Diff::DiffRefs do
   let(:project) { create(:project, :repository) }
 
+  describe '#==' do
+    let(:commit) { project.commit('1a0b36b3cdad1d2ee32457c102a8c0b7056fa863') }
+    subject { commit.diff_refs }
+
+    context 'when shas are missing' do
+      let(:other) { described_class.new(base_sha: subject.base_sha, start_sha: subject.start_sha, head_sha: nil) }
+
+      it 'returns false' do
+        expect(subject).not_to eq(other)
+      end
+    end
+
+    context 'when shas are equal' do
+      let(:other) { described_class.new(base_sha: subject.base_sha, start_sha: subject.start_sha, head_sha: subject.head_sha) }
+
+      it 'returns true' do
+        expect(subject).to eq(other)
+      end
+    end
+
+    context 'when shas are unequal' do
+      let(:other) { described_class.new(base_sha: subject.base_sha, start_sha: subject.start_sha, head_sha: subject.head_sha.reverse) }
+
+      it 'returns false' do
+        expect(subject).not_to eq(other)
+      end
+    end
+
+    context 'when shas are truncated' do
+      context 'when sha prefixes are too short' do
+        let(:other) { described_class.new(base_sha: subject.base_sha[0, 4], start_sha: subject.start_sha[0, 4], head_sha: subject.head_sha[0, 4]) }
+
+        it 'returns false' do
+          expect(subject).not_to eq(other)
+        end
+      end
+
+      context 'when sha prefixes are equal' do
+        let(:other) { described_class.new(base_sha: subject.base_sha[0, 10], start_sha: subject.start_sha[0, 10], head_sha: subject.head_sha[0, 10]) }
+
+        it 'returns true' do
+          expect(subject).to eq(other)
+        end
+      end
+
+      context 'when sha prefixes are unequal' do
+        let(:other) { described_class.new(base_sha: subject.base_sha[0, 10], start_sha: subject.start_sha[0, 10], head_sha: subject.head_sha[0, 10].reverse) }
+
+        it 'returns false' do
+          expect(subject).not_to eq(other)
+        end
+      end
+    end
+  end
+
   describe '#compare_in' do
     context 'with diff refs for the initial commit' do
       let(:commit) { project.commit('1a0b36b3cdad1d2ee32457c102a8c0b7056fa863') }

spec/lib/gitlab/diff/position_spec.rb

@@ -429,6 +429,44 @@ describe Gitlab::Diff::Position do
     end
   end
 
+  describe '#==' do
+    let(:commit) { project.commit("570e7b2abdd848b95f2f578043fc23bd6f6fd24d") }
+
+    subject do
+      described_class.new(
+        old_path: "files/ruby/popen.rb",
+        new_path: "files/ruby/popen.rb",
+        old_line: nil,
+        new_line: 14,
+        diff_refs: commit.diff_refs
+      )
+    end
+
+    context 'when positions are equal' do
+      let(:other) { described_class.new(subject.to_h) }
+
+      it 'returns true' do
+        expect(subject).to eq(other)
+      end
+    end
+
+    context 'when positions are equal, except for truncated shas' do
+      let(:other) { described_class.new(subject.to_h.merge(start_sha: subject.start_sha[0, 10])) }
+
+      it 'returns true' do
+        expect(subject).to eq(other)
+      end
+    end
+
+    context 'when positions are unequal' do
+      let(:other) { described_class.new(subject.to_h.merge(start_sha: subject.start_sha.reverse)) }
+
+      it 'returns false' do
+        expect(subject).not_to eq(other)
+      end
+    end
+  end
+
   describe "#to_json" do
     let(:hash) do
       {

spec/requests/api/commits_spec.rb

@@ -491,6 +491,7 @@ describe API::Commits do
         expect(json_response['stats']['deletions']).to eq(commit.stats.deletions)
         expect(json_response['stats']['total']).to eq(commit.stats.total)
         expect(json_response['status']).to be_nil
+        expect(json_response['last_pipeline']).to be_nil
       end
 
       context 'when ref does not exist' do
@@ -573,6 +574,10 @@ describe API::Commits do
           expect(response).to have_http_status(200)
           expect(response).to match_response_schema('public_api/v4/commit/detail')
           expect(json_response['status']).to eq('created')
+          expect(json_response['last_pipeline']['id']).to eq(pipeline.id)
+          expect(json_response['last_pipeline']['ref']).to eq(pipeline.ref)
+          expect(json_response['last_pipeline']['sha']).to eq(pipeline.sha)
+          expect(json_response['last_pipeline']['status']).to eq(pipeline.status)
         end
 
         context 'when pipeline succeeds' do

spec/requests/api/environments_spec.rb

@@ -20,6 +20,7 @@ describe API::Environments do
           path path_with_namespace
           star_count forks_count
           created_at last_activity_at
+          avatar_url
         )
 
         get api("/projects/#{project.id}/environments", user)

spec/requests/api/projects_spec.rb

@@ -193,6 +193,7 @@ describe API::Projects do
             path path_with_namespace
             star_count forks_count
             created_at last_activity_at
+            avatar_url
           )
 
           get api('/projects?simple=true', user)

spec/requests/api/users_spec.rb

@@ -125,6 +125,15 @@ describe API::Users do
     end
 
     context "when admin" do
+      context 'when sudo is defined' do
+        it 'does not return 500' do
+          admin_personal_access_token = create(:personal_access_token, user: admin).token
+          get api("/users?private_token=#{admin_personal_access_token}&sudo=#{user.id}", admin)
+
+          expect(response).to have_http_status(:success)
+        end
+      end
+
       it "returns an array of users" do
         get api("/users", admin)
 

spec/requests/api/v3/projects_spec.rb

@@ -89,6 +89,7 @@ describe API::V3::Projects do
             path path_with_namespace
             star_count forks_count
             created_at last_activity_at
+            avatar_url
           )
 
           get v3_api('/projects?simple=true', user)

spec/services/ci/create_pipeline_service_spec.rb

@@ -133,6 +133,26 @@ describe Ci::CreatePipelineService do
             expect(merge_request.reload.head_pipeline).to eq head_pipeline
           end
         end
+
+        context 'when pipeline has been skipped' do
+          before do
+            allow_any_instance_of(Ci::Pipeline)
+              .to receive(:git_commit_message)
+              .and_return('some commit [ci skip]')
+          end
+
+          it 'updates merge request head pipeline' do
+            merge_request = create(:merge_request, source_branch: 'master',
+                                                   target_branch: 'feature',
+                                                   source_project: project)
+
+            head_pipeline = execute_service
+
+            expect(head_pipeline).to be_skipped
+            expect(head_pipeline).to be_persisted
+            expect(merge_request.reload.head_pipeline).to eq head_pipeline
+          end
+        end
       end
 
       context 'auto-cancel enabled' do
@@ -481,104 +501,4 @@ describe Ci::CreatePipelineService do
       end
     end
   end
-
-  describe '#allowed_to_create?' do
-    let(:user) { create(:user) }
-    let(:project) { create(:project, :repository) }
-    let(:ref) { 'master' }
-
-    subject do
-      described_class.new(project, user, ref: ref)
-        .send(:allowed_to_create?)
-    end
-
-    context 'when user is a developer' do
-      before do
-        project.add_developer(user)
-      end
-
-      it { is_expected.to be_truthy }
-
-      context 'when the branch is protected' do
-        let!(:protected_branch) do
-          create(:protected_branch, project: project, name: ref)
-        end
-
-        it { is_expected.to be_falsey }
-
-        context 'when developers are allowed to merge' do
-          let!(:protected_branch) do
-            create(:protected_branch,
-                   :developers_can_merge,
-                   project: project,
-                   name: ref)
-          end
-
-          it { is_expected.to be_truthy }
-        end
-      end
-
-      context 'when the tag is protected' do
-        let(:ref) { 'v1.0.0' }
-
-        let!(:protected_tag) do
-          create(:protected_tag, project: project, name: ref)
-        end
-
-        it { is_expected.to be_falsey }
-
-        context 'when developers are allowed to create the tag' do
-          let!(:protected_tag) do
-            create(:protected_tag,
-                   :developers_can_create,
-                   project: project,
-                   name: ref)
-          end
-
-          it { is_expected.to be_truthy }
-        end
-      end
-    end
-
-    context 'when user is a master' do
-      before do
-        project.add_master(user)
-      end
-
-      it { is_expected.to be_truthy }
-
-      context 'when the branch is protected' do
-        let!(:protected_branch) do
-          create(:protected_branch, project: project, name: ref)
-        end
-
-        it { is_expected.to be_truthy }
-      end
-
-      context 'when the tag is protected' do
-        let(:ref) { 'v1.0.0' }
-
-        let!(:protected_tag) do
-          create(:protected_tag, project: project, name: ref)
-        end
-
-        it { is_expected.to be_truthy }
-
-        context 'when no one can create the tag' do
-          let!(:protected_tag) do
-            create(:protected_tag,
-                   :no_one_can_create,
-                   project: project,
-                   name: ref)
-          end
-
-          it { is_expected.to be_falsey }
-        end
-      end
-    end
-
-    context 'when owner cannot create pipeline' do
-      it { is_expected.to be_falsey }
-    end
-  end
 end

spec/support/test_env.rb

@@ -308,6 +308,9 @@ module TestEnv
 
     ensure_component_dir_name_is_correct!(component, install_dir)
 
+    # On CI, once installed, components never need update
+    return if File.exist?(install_dir) && ENV['CI']
+
     if component_needs_update?(install_dir, version)
       # Cleanup the component entirely to ensure we start fresh
       FileUtils.rm_rf(install_dir)

spec/workers/post_receive_spec.rb

@@ -70,12 +70,15 @@ describe PostReceive do
 
       context "creates a Ci::Pipeline for every change" do
         before do
-          allow_any_instance_of(Ci::CreatePipelineService).to receive(:commit) do
-            OpenStruct.new(id: '123456')
-          end
-          allow_any_instance_of(Ci::CreatePipelineService).to receive(:branch?).and_return(true)
-          allow_any_instance_of(Repository).to receive(:ref_exists?).and_return(true)
           stub_ci_pipeline_to_return_yaml_file
+
+          # TODO, don't stub private methods
+          #
+          allow_any_instance_of(Ci::CreatePipelineService)
+            .to receive(:commit).and_return(OpenStruct.new(id: '123456'))
+
+          allow_any_instance_of(Repository)
+            .to receive(:branch_exists?).and_return(true)
         end
 
         it { expect { subject }.to change { Ci::Pipeline.count }.by(2) }