Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issue

13 files changed, 333 insertions, 297 deletions

diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index 3f528b9f7c0..9dacf7c1e86 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -153,10 +153,11 @@ module API
     end
 
     def attributes_for_keys(keys, custom_params = nil)
+      params_hash = custom_params || params
       attrs = {}
       keys.each do |key|
-        if params[key].present? or (params.has_key?(key) and params[key] == false)
-          attrs[key] = params[key]
+        if params_hash[key].present? or (params_hash.has_key?(key) and params_hash[key] == false)
+          attrs[key] = params_hash[key]
         end
       end
       ActionController::Parameters.new(attrs).permit!
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb
index 5c97fe1c88c..dd7f24f3279 100644
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -59,55 +59,6 @@ module API
         present paginate(merge_requests), with: Entities::MergeRequest
       end
 
-      # Show MR
-      #
-      # Parameters:
-      #   id (required)               - The ID of a project
-      #   merge_request_id (required) - The ID of MR
-      #
-      # Example:
-      #   GET /projects/:id/merge_request/:merge_request_id
-      #
-      get ":id/merge_request/:merge_request_id" do
-        merge_request = user_project.merge_requests.find(params[:merge_request_id])
-
-        authorize! :read_merge_request, merge_request
-
-        present merge_request, with: Entities::MergeRequest
-      end
-
-      # Show MR commits
-      #
-      # Parameters:
-      #   id (required)               - The ID of a project
-      #   merge_request_id (required) - The ID of MR
-      #
-      # Example:
-      #   GET /projects/:id/merge_request/:merge_request_id/commits
-      #
-      get ':id/merge_request/:merge_request_id/commits' do
-        merge_request = user_project.merge_requests.
-          find(params[:merge_request_id])
-        authorize! :read_merge_request, merge_request
-        present merge_request.commits, with: Entities::RepoCommit
-      end
-
-      # Show MR changes
-      #
-      # Parameters:
-      #   id (required)               - The ID of a project
-      #   merge_request_id (required) - The ID of MR
-      #
-      # Example:
-      #   GET /projects/:id/merge_request/:merge_request_id/changes
-      #
-      get ':id/merge_request/:merge_request_id/changes' do
-        merge_request = user_project.merge_requests.
-          find(params[:merge_request_id])
-        authorize! :read_merge_request, merge_request
-        present merge_request, with: Entities::MergeRequestChanges
-      end
-
       # Create MR
       #
       # Parameters:
@@ -148,146 +99,206 @@ module API
         end
       end
 
-      # Update MR
+      # Routing "merge_request/:merge_request_id/..." is DEPRECATED and WILL BE REMOVED in version 9.0
+      # Use "merge_requests/:merge_request_id/..." instead.
       #
-      # Parameters:
-      #   id (required)               - The ID of a project
-      #   merge_request_id (required) - ID of MR
-      #   target_branch               - The target branch
-      #   assignee_id                 - Assignee user ID
-      #   title                       - Title of MR
-      #   state_event                 - Status of MR. (close|reopen|merge)
-      #   description                 - Description of MR
-      #   labels (optional)           - Labels for a MR as a comma-separated list
-      # Example:
-      #   PUT /projects/:id/merge_request/:merge_request_id
-      #
-      put ":id/merge_request/:merge_request_id" do
-        attrs = attributes_for_keys [:target_branch, :assignee_id, :title, :state_event, :description]
-        merge_request = user_project.merge_requests.find(params[:merge_request_id])
-        authorize! :update_merge_request, merge_request
-
-        # Ensure source_branch is not specified
-        if params[:source_branch].present?
-          render_api_error!('Source branch cannot be changed', 400)
-        end
-
-        # Validate label names in advance
-        if (errors = validate_label_params(params)).any?
-          render_api_error!({ labels: errors }, 400)
-        end
-
-        merge_request = ::MergeRequests::UpdateService.new(user_project, current_user, attrs).execute(merge_request)
-
-        if merge_request.valid?
-          # Find or create labels and attach to issue
-          unless params[:labels].nil?
-            merge_request.remove_labels
-            merge_request.add_labels_by_names(params[:labels].split(","))
-          end
+      [":id/merge_request/:merge_request_id", ":id/merge_requests/:merge_request_id"].each do |path|
+        # Show MR
+        #
+        # Parameters:
+        #   id (required)               - The ID of a project
+        #   merge_request_id (required) - The ID of MR
+        #
+        # Example:
+        #   GET /projects/:id/merge_requests/:merge_request_id
+        #
+        get path do
+          merge_request = user_project.merge_requests.find(params[:merge_request_id])
+
+          authorize! :read_merge_request, merge_request
 
           present merge_request, with: Entities::MergeRequest
-        else
-          handle_merge_request_errors! merge_request.errors
         end
-      end
-
-      # Merge MR
-      #
-      # Parameters:
-      #   id (required)                           - The ID of a project
-      #   merge_request_id (required)             - ID of MR
-      #   merge_commit_message (optional)         - Custom merge commit message
-      #   should_remove_source_branch (optional)  - When true, the source branch will be deleted if possible
-      #   merge_when_build_succeeds (optional)    - When true, this MR will be merged when the build succeeds
-      # Example:
-      #   PUT /projects/:id/merge_request/:merge_request_id/merge
-      #
-      put ":id/merge_request/:merge_request_id/merge" do
-        merge_request = user_project.merge_requests.find(params[:merge_request_id])
-
-        # Merge request can not be merged
-        # because user dont have permissions to push into target branch
-        unauthorized! unless merge_request.can_be_merged_by?(current_user)
-        not_allowed! if !merge_request.open? || merge_request.work_in_progress?
 
-        merge_request.check_if_can_be_merged
-
-        render_api_error!('Branch cannot be merged', 406) unless merge_request.can_be_merged?
-
-        merge_params = {
-          commit_message: params[:merge_commit_message],
-          should_remove_source_branch: params[:should_remove_source_branch]
-        }
-
-        if parse_boolean(params[:merge_when_build_succeeds]) && merge_request.ci_commit && merge_request.ci_commit.active?
-          ::MergeRequests::MergeWhenBuildSucceedsService.new(merge_request.target_project, current_user, merge_params).
-            execute(merge_request)
-        else
-          ::MergeRequests::MergeService.new(merge_request.target_project, current_user, merge_params).
-            execute(merge_request)
+        # Show MR commits
+        #
+        # Parameters:
+        #   id (required)               - The ID of a project
+        #   merge_request_id (required) - The ID of MR
+        #
+        # Example:
+        #   GET /projects/:id/merge_requests/:merge_request_id/commits
+        #
+        get "#{path}/commits" do
+          merge_request = user_project.merge_requests.
+            find(params[:merge_request_id])
+          authorize! :read_merge_request, merge_request
+          present merge_request.commits, with: Entities::RepoCommit
         end
 
-        present merge_request, with: Entities::MergeRequest
-      end
+        # Show MR changes
+        #
+        # Parameters:
+        #   id (required)               - The ID of a project
+        #   merge_request_id (required) - The ID of MR
+        #
+        # Example:
+        #   GET /projects/:id/merge_requests/:merge_request_id/changes
+        #
+        get "#{path}/changes" do
+          merge_request = user_project.merge_requests.
+            find(params[:merge_request_id])
+          authorize! :read_merge_request, merge_request
+          present merge_request, with: Entities::MergeRequestChanges
+        end
 
-      # Cancel Merge if Merge When build succeeds is enabled
-      # Parameters:
-      #   id (required)                         - The ID of a project
-      #   merge_request_id (required)           - ID of MR
-      #
-      post ":id/merge_request/:merge_request_id/cancel_merge_when_build_succeeds" do
-        merge_request = user_project.merge_requests.find(params[:merge_request_id])
+        # Update MR
+        #
+        # Parameters:
+        #   id (required)               - The ID of a project
+        #   merge_request_id (required) - ID of MR
+        #   target_branch               - The target branch
+        #   assignee_id                 - Assignee user ID
+        #   title                       - Title of MR
+        #   state_event                 - Status of MR. (close|reopen|merge)
+        #   description                 - Description of MR
+        #   labels (optional)           - Labels for a MR as a comma-separated list
+        # Example:
+        #   PUT /projects/:id/merge_requests/:merge_request_id
+        #
+        put path do
+          attrs = attributes_for_keys [:target_branch, :assignee_id, :title, :state_event, :description]
+          merge_request = user_project.merge_requests.find(params[:merge_request_id])
+          authorize! :update_merge_request, merge_request
+
+          # Ensure source_branch is not specified
+          if params[:source_branch].present?
+            render_api_error!('Source branch cannot be changed', 400)
+          end
 
-        unauthorized! unless merge_request.can_cancel_merge_when_build_succeeds?(current_user)
+          # Validate label names in advance
+          if (errors = validate_label_params(params)).any?
+            render_api_error!({ labels: errors }, 400)
+          end
 
-        ::MergeRequest::MergeWhenBuildSucceedsService.new(merge_request.target_project, current_user).cancel(merge_request)
-      end
+          merge_request = ::MergeRequests::UpdateService.new(user_project, current_user, attrs).execute(merge_request)
 
-      # Get a merge request's comments
-      #
-      # Parameters:
-      #   id (required)               - The ID of a project
-      #   merge_request_id (required) - ID of MR
-      # Examples:
-      #   GET /projects/:id/merge_request/:merge_request_id/comments
-      #
-      get ":id/merge_request/:merge_request_id/comments" do
-        merge_request = user_project.merge_requests.find(params[:merge_request_id])
+          if merge_request.valid?
+            # Find or create labels and attach to issue
+            unless params[:labels].nil?
+              merge_request.remove_labels
+              merge_request.add_labels_by_names(params[:labels].split(","))
+            end
 
-        authorize! :read_merge_request, merge_request
+            present merge_request, with: Entities::MergeRequest
+          else
+            handle_merge_request_errors! merge_request.errors
+          end
+        end
 
-        present paginate(merge_request.notes.fresh), with: Entities::MRNote
-      end
+        # Merge MR
+        #
+        # Parameters:
+        #   id (required)                           - The ID of a project
+        #   merge_request_id (required)             - ID of MR
+        #   merge_commit_message (optional)         - Custom merge commit message
+        #   should_remove_source_branch (optional)  - When true, the source branch will be deleted if possible
+        #   merge_when_build_succeeds (optional)    - When true, this MR will be merged when the build succeeds
+        # Example:
+        #   PUT /projects/:id/merge_requests/:merge_request_id/merge
+        #
+        put "#{path}/merge" do
+          merge_request = user_project.merge_requests.find(params[:merge_request_id])
+
+          # Merge request can not be merged
+          # because user dont have permissions to push into target branch
+          unauthorized! unless merge_request.can_be_merged_by?(current_user)
+          not_allowed! if !merge_request.open? || merge_request.work_in_progress?
+
+          merge_request.check_if_can_be_merged
+
+          render_api_error!('Branch cannot be merged', 406) unless merge_request.can_be_merged?
+
+          merge_params = {
+            commit_message: params[:merge_commit_message],
+            should_remove_source_branch: params[:should_remove_source_branch]
+          }
+
+          if parse_boolean(params[:merge_when_build_succeeds]) && merge_request.ci_commit && merge_request.ci_commit.active?
+            ::MergeRequests::MergeWhenBuildSucceedsService.new(merge_request.target_project, current_user, merge_params).
+              execute(merge_request)
+          else
+            ::MergeRequests::MergeService.new(merge_request.target_project, current_user, merge_params).
+              execute(merge_request)
+          end
 
-      # Post comment to merge request
-      #
-      # Parameters:
-      #   id (required)               - The ID of a project
-      #   merge_request_id (required) - ID of MR
-      #   note (required)             - Text of comment
-      # Examples:
-      #   POST /projects/:id/merge_request/:merge_request_id/comments
-      #
-      post ":id/merge_request/:merge_request_id/comments" do
-        required_attributes! [:note]
+          present merge_request, with: Entities::MergeRequest
+        end
 
-        merge_request = user_project.merge_requests.find(params[:merge_request_id])
+        # Cancel Merge if Merge When build succeeds is enabled
+        # Parameters:
+        #   id (required)                         - The ID of a project
+        #   merge_request_id (required)           - ID of MR
+        #
+        post "#{path}/cancel_merge_when_build_succeeds" do
+          merge_request = user_project.merge_requests.find(params[:merge_request_id])
 
-        authorize! :create_note, merge_request
+          unauthorized! unless merge_request.can_cancel_merge_when_build_succeeds?(current_user)
 
-        opts = {
-          note: params[:note],
-          noteable_type: 'MergeRequest',
-          noteable_id: merge_request.id
-        }
+          ::MergeRequest::MergeWhenBuildSucceedsService.new(merge_request.target_project, current_user).cancel(merge_request)
+        end
 
-        note = ::Notes::CreateService.new(user_project, current_user, opts).execute
+        # Duplicate. DEPRECATED and WILL BE REMOVED in 9.0.
+        # Use GET "/projects/:id/merge_requests/:merge_request_id/notes" instead
+        #
+        # Get a merge request's comments
+        #
+        # Parameters:
+        #   id (required)               - The ID of a project
+        #   merge_request_id (required) - ID of MR
+        # Examples:
+        #   GET /projects/:id/merge_requests/:merge_request_id/comments
+        #
+        get "#{path}/comments" do
+          merge_request = user_project.merge_requests.find(params[:merge_request_id])
+
+          authorize! :read_merge_request, merge_request
+
+          present paginate(merge_request.notes.fresh), with: Entities::MRNote
+        end
 
-        if note.save
-          present note, with: Entities::MRNote
-        else
-          render_api_error!("Failed to save note #{note.errors.messages}", 400)
+        # Duplicate. DEPRECATED and WILL BE REMOVED in 9.0.
+        # Use POST "/projects/:id/merge_requests/:merge_request_id/notes" instead
+        #
+        # Post comment to merge request
+        #
+        # Parameters:
+        #   id (required)               - The ID of a project
+        #   merge_request_id (required) - ID of MR
+        #   note (required)             - Text of comment
+        # Examples:
+        #   POST /projects/:id/merge_requests/:merge_request_id/comments
+        #
+        post "#{path}/comments" do
+          required_attributes! [:note]
+
+          merge_request = user_project.merge_requests.find(params[:merge_request_id])
+
+          authorize! :create_note, merge_request
+
+          opts = {
+            note: params[:note],
+            noteable_type: 'MergeRequest',
+            noteable_id: merge_request.id
+          }
+
+          note = ::Notes::CreateService.new(user_project, current_user, opts).execute
+
+          if note.save
+            present note, with: Entities::MRNote
+          else
+            render_api_error!("Failed to save note #{note.errors.messages}", 400)
+          end
         end
       end
     end
diff --git a/lib/banzai/filter/sanitization_filter.rb b/lib/banzai/filter/sanitization_filter.rb
index 3f49d492f2f..d1e11eedec3 100644
--- a/lib/banzai/filter/sanitization_filter.rb
+++ b/lib/banzai/filter/sanitization_filter.rb
@@ -43,6 +43,10 @@ module Banzai
         # Allow span elements
         whitelist[:elements].push('span')
 
+        # Allow abbr elements with title attribute
+        whitelist[:elements].push('abbr')
+        whitelist[:attributes]['abbr'] = %w(title)
+
         # Allow any protocol in `a` elements...
         whitelist[:protocols].delete('a')
 
diff --git a/lib/ci/api/api.rb b/lib/ci/api/api.rb
index 5c347e432b4..4e85d2c3c74 100644
--- a/lib/ci/api/api.rb
+++ b/lib/ci/api/api.rb
@@ -25,7 +25,7 @@ module Ci
 
       format :json
 
-      helpers Helpers
+      helpers ::Ci::API::Helpers
       helpers ::API::Helpers
       helpers Gitlab::CurrentSettings
 
diff --git a/lib/ci/api/builds.rb b/lib/ci/api/builds.rb
index 690bbf97a89..416b0b5f0b4 100644
--- a/lib/ci/api/builds.rb
+++ b/lib/ci/api/builds.rb
@@ -13,13 +13,13 @@ module Ci
         post "register" do
           authenticate_runner!
           update_runner_last_contact
+          update_runner_info
           required_attributes! [:token]
           not_found! unless current_runner.active?
 
           build = Ci::RegisterBuildService.new.execute(current_runner)
 
           if build
-            update_runner_info
             present build, with: Entities::BuildDetails
           else
             not_found!
diff --git a/lib/ci/api/helpers.rb b/lib/ci/api/helpers.rb
index 1c91204e98c..199d62d9b8a 100644
--- a/lib/ci/api/helpers.rb
+++ b/lib/ci/api/helpers.rb
@@ -34,10 +34,14 @@ module Ci
         @runner ||= Runner.find_by_token(params[:token].to_s)
       end
 
-      def update_runner_info
+      def get_runner_version_from_params
         return unless params["info"].present?
-        info = attributes_for_keys(["name", "version", "revision", "platform", "architecture"], params["info"])
-        current_runner.update(info)
+        attributes_for_keys(["name", "version", "revision", "platform", "architecture"], params["info"])
+      end
+
+      def update_runner_info
+        current_runner.assign_attributes(get_runner_version_from_params)
+        current_runner.save if current_runner.changed?
       end
 
       def max_artifacts_size
diff --git a/lib/ci/api/runners.rb b/lib/ci/api/runners.rb
index bfc14fe7a6b..192b1d18a51 100644
--- a/lib/ci/api/runners.rb
+++ b/lib/ci/api/runners.rb
@@ -47,6 +47,7 @@ module Ci
           return forbidden! unless runner
 
           if runner.id
+            runner.update(get_runner_version_from_params)
             present runner, with: Entities::Runner
           else
             not_found!
diff --git a/lib/gitlab/bitbucket_import/importer.rb b/lib/gitlab/bitbucket_import/importer.rb
index 2355b3c6ddc..3f483847efa 100644
--- a/lib/gitlab/bitbucket_import/importer.rb
+++ b/lib/gitlab/bitbucket_import/importer.rb
@@ -13,12 +13,36 @@ module Gitlab
       end
 
       def execute
-        project_identifier = project.import_source
+        import_issues if has_issues?
 
-        return true unless client.project(project_identifier)["has_issues"]
+        true
+      rescue ActiveRecord::RecordInvalid => e
+        raise Projects::ImportService::Error.new, e.message
+      ensure
+        Gitlab::BitbucketImport::KeyDeleter.new(project).execute
+      end
 
-        #Issues && Comments
-        issues = client.issues(project_identifier)
+      private
+
+      def gl_user_id(project, bitbucket_id)
+        if bitbucket_id
+          user = User.joins(:identities).find_by("identities.extern_uid = ? AND identities.provider = 'bitbucket'", bitbucket_id.to_s)
+          (user && user.id) || project.creator_id
+        else
+          project.creator_id
+        end
+      end
+
+      def identifier
+        project.import_source
+      end
+
+      def has_issues?
+        client.project(identifier)["has_issues"]
+      end
+
+      def import_issues
+        issues = client.issues(identifier)
 
         issues.each do |issue|
           body = ''
@@ -33,7 +57,7 @@ module Gitlab
           body = @formatter.author_line(author)
           body += issue["content"]
 
-          comments = client.issue_comments(project_identifier, issue["local_id"])
+          comments = client.issue_comments(identifier, issue["local_id"])
 
           if comments.any?
             body += @formatter.comments_header
@@ -56,20 +80,9 @@ module Gitlab
             author_id: gl_user_id(project, reporter)
           )
         end
-
-        true
+      rescue ActiveRecord::RecordInvalid => e
+        raise Projects::ImportService::Error, e.message
       end
-
-      private
-
-      def gl_user_id(project, bitbucket_id)
-        if bitbucket_id
-          user = User.joins(:identities).find_by("identities.extern_uid = ? AND identities.provider = 'bitbucket'", bitbucket_id.to_s)
-          (user && user.id) || project.creator_id
-        else
-          project.creator_id
-        end
-       end
     end
   end
 end
diff --git a/lib/gitlab/blame.rb b/lib/gitlab/blame.rb
new file mode 100644
index 00000000000..313e6b9fc03
--- /dev/null
+++ b/lib/gitlab/blame.rb
@@ -0,0 +1,54 @@
+module Gitlab
+  class Blame
+    attr_accessor :blob, :commit
+
+    def initialize(blob, commit)
+      @blob = blob
+      @commit = commit
+    end
+
+    def groups(highlight: true)
+      prev_sha = nil
+      groups = []
+      current_group = nil
+
+      i = 0
+      blame.each do |commit, line|
+        commit = Commit.new(commit, project)
+
+        sha = commit.sha
+        if prev_sha != sha
+          groups << current_group if current_group
+          current_group = { commit: commit, lines: [] }
+        end
+
+        line = highlighted_lines[i].html_safe if highlight
+        current_group[:lines] << line
+
+        prev_sha = sha
+        i += 1
+      end
+      groups << current_group if current_group
+
+      groups
+    end
+
+    private
+
+    def blame
+      @blame ||= Gitlab::Git::Blame.new(repository, @commit.id, @blob.path)
+    end
+
+    def highlighted_lines
+      @highlighted_lines ||= Gitlab::Highlight.highlight(@blob.name, @blob.data).lines
+    end
+
+    def project
+      commit.project
+    end
+
+    def repository
+      project.repository
+    end
+  end
+end
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb
index ea054255820..a6b2f14521c 100644
--- a/lib/gitlab/current_settings.rb
+++ b/lib/gitlab/current_settings.rb
@@ -4,11 +4,14 @@ module Gitlab
       key = :current_application_settings
 
       RequestStore.store[key] ||= begin
+        settings = nil
+
         if connect_to_db?
-          ApplicationSetting.current || ApplicationSetting.create_from_defaults
-        else
-          fake_application_settings
+          settings = ApplicationSetting.current
+          settings ||= ApplicationSetting.create_from_defaults unless ActiveRecord::Migrator.needs_migration?
         end
+
+        settings || fake_application_settings
       end
     end
 
@@ -18,28 +21,32 @@ module Gitlab
         default_branch_protection: Settings.gitlab['default_branch_protection'],
         signup_enabled: Settings.gitlab['signup_enabled'],
         signin_enabled: Settings.gitlab['signin_enabled'],
+        twitter_sharing_enabled: Settings.gitlab['twitter_sharing_enabled'],
         gravatar_enabled: Settings.gravatar['enabled'],
         sign_in_text: Settings.extra['sign_in_text'],
         restricted_visibility_levels: Settings.gitlab['restricted_visibility_levels'],
         max_attachment_size: Settings.gitlab['max_attachment_size'],
         session_expire_delay: Settings.gitlab['session_expire_delay'],
-        import_sources: Settings.gitlab['import_sources'],
+        default_project_visibility: Settings.gitlab.default_projects_features['visibility_level'],
+        default_snippet_visibility: Settings.gitlab.default_projects_features['visibility_level'],
+        restricted_signup_domains: Settings.gitlab['restricted_signup_domains'],
+        import_sources: ['github','bitbucket','gitlab','gitorious','google_code','fogbugz','git'],
         shared_runners_enabled: Settings.gitlab_ci['shared_runners_enabled'],
         max_artifacts_size: Settings.artifacts['max_size'],
+        require_two_factor_authentication: false,
+        two_factor_grace_period: 48
       )
     end
 
     private
 
     def connect_to_db?
-      use_db = if ENV['USE_DB'] == "false"
-                 false
-               else
-                 true
-               end
-
-      use_db && ActiveRecord::Base.connection.active? &&
-                ActiveRecord::Base.connection.table_exists?('application_settings')
+      # When the DBMS is not available, an exception (e.g. PG::ConnectionBad) is raised
+      active_db_connection = ActiveRecord::Base.connection.active? rescue false
+
+      ENV['USE_DB'] != 'false' &&
+      active_db_connection &&
+      ActiveRecord::Base.connection.table_exists?('application_settings')
 
     rescue ActiveRecord::NoDatabaseError
       false
diff --git a/lib/gitlab/github_import/importer.rb b/lib/gitlab/github_import/importer.rb
index 663402e8197..e2a85f29825 100644
--- a/lib/gitlab/github_import/importer.rb
+++ b/lib/gitlab/github_import/importer.rb
@@ -35,8 +35,8 @@ module Gitlab
         end
 
         true
-      rescue ActiveRecord::RecordInvalid
-        false
+      rescue ActiveRecord::RecordInvalid => e
+        raise Projects::ImportService::Error, e.message
       end
 
       def import_pull_requests
@@ -53,8 +53,8 @@ module Gitlab
         end
 
         true
-      rescue ActiveRecord::RecordInvalid
-        false
+      rescue ActiveRecord::RecordInvalid => e
+        raise Projects::ImportService::Error, e.message
       end
 
       def import_comments(issue_number, noteable)
@@ -83,10 +83,13 @@ module Gitlab
 
         true
       rescue Gitlab::Shell::Error => e
-        if e.message =~ /repository not exported/
-          true
+        # GitHub error message when the wiki repo has not been created,
+        # this means that repo has wiki enabled, but have no pages. So,
+        # we can skip the import.
+        if e.message !~ /repository not exported/
+          raise Projects::ImportService::Error, e.message
         else
-          false
+          true
         end
       end
     end
diff --git a/lib/gitlab/metrics/instrumentation.rb b/lib/gitlab/metrics/instrumentation.rb
index d9fce2e6758..face1921d2e 100644
--- a/lib/gitlab/metrics/instrumentation.rb
+++ b/lib/gitlab/metrics/instrumentation.rb
@@ -106,20 +106,36 @@ module Gitlab
         if type == :instance
           target = mod
           label  = "#{mod.name}##{name}"
+          method = mod.instance_method(name)
         else
           target = mod.singleton_class
           label  = "#{mod.name}.#{name}"
+          method = mod.method(name)
+        end
+
+        # Some code out there (e.g. the "state_machine" Gem) checks the arity of
+        # a method to make sure it only passes arguments when the method expects
+        # any. If we were to always overwrite a method to take an `*args`
+        # signature this would break things. As a result we'll make sure the
+        # generated method _only_ accepts regular arguments if the underlying
+        # method also accepts them.
+        if method.arity == 0
+          args_signature = '&block'
+        else
+          args_signature = '*args, &block'
         end
 
+        send_signature = "__send__(#{alias_name.inspect}, #{args_signature})"
+
         target.class_eval <<-EOF, __FILE__, __LINE__ + 1
           alias_method #{alias_name.inspect}, #{name.inspect}
 
-          def #{name}(*args, &block)
+          def #{name}(#{args_signature})
             trans = Gitlab::Metrics::Instrumentation.transaction
 
             if trans
               start    = Time.now
-              retval   = __send__(#{alias_name.inspect}, *args, &block)
+              retval   = #{send_signature}
               duration = (Time.now - start) * 1000.0
 
               if duration >= Gitlab::Metrics.method_call_threshold
@@ -132,7 +148,7 @@ module Gitlab
 
               retval
             else
-              __send__(#{alias_name.inspect}, *args, &block)
+              #{send_signature}
             end
           end
         EOF
diff --git a/lib/gitlab/snippet_search_results.rb b/lib/gitlab/snippet_search_results.rb
index 938219efdb2..38364a0b151 100644
--- a/lib/gitlab/snippet_search_results.rb
+++ b/lib/gitlab/snippet_search_results.rb
@@ -1,5 +1,7 @@
 module Gitlab
   class SnippetSearchResults < SearchResults
+    include SnippetsHelper
+
     attr_reader :limit_snippet_ids
 
     def initialize(limit_snippet_ids, query)
@@ -47,85 +49,5 @@ module Gitlab
     def default_scope
       'snippet_blobs'
     end
-
-    # Get an array of line numbers surrounding a matching
-    # line, bounded by min/max.
-    #
-    # @returns Array of line numbers
-    def bounded_line_numbers(line, min, max)
-      lower = line - surrounding_lines > min ? line - surrounding_lines : min
-      upper = line + surrounding_lines < max ? line + surrounding_lines : max
-      (lower..upper).to_a
-    end
-
-    # Returns a sorted set of lines to be included in a snippet preview.
-    # This ensures matching adjacent lines do not display duplicated
-    # surrounding code.
-    #
-    # @returns Array, unique and sorted.
-    def matching_lines(lined_content)
-      used_lines = []
-      lined_content.each_with_index do |line, line_number|
-        used_lines.concat bounded_line_numbers(
-          line_number,
-          0,
-          lined_content.size
-        ) if line.include?(query)
-      end
-
-      used_lines.uniq.sort
-    end
-
-    # 'Chunkify' entire snippet.  Splits the snippet data into matching lines +
-    # surrounding_lines() worth of unmatching lines.
-    #
-    # @returns a hash with {snippet_object, snippet_chunks:{data,start_line}}
-    def chunk_snippet(snippet)
-      lined_content = snippet.content.split("\n")
-      used_lines = matching_lines(lined_content)
-
-      snippet_chunk = []
-      snippet_chunks = []
-      snippet_start_line = 0
-      last_line = -1
-
-      # Go through each used line, and add consecutive lines as a single chunk
-      # to the snippet chunk array.
-      used_lines.each do |line_number|
-        if last_line < 0
-          # Start a new chunk.
-          snippet_start_line = line_number
-          snippet_chunk << lined_content[line_number]
-        elsif last_line == line_number - 1
-          # Consecutive line, continue chunk.
-          snippet_chunk << lined_content[line_number]
-        else
-          # Non-consecutive line, add chunk to chunk array.
-          snippet_chunks << {
-            data: snippet_chunk.join("\n"),
-            start_line: snippet_start_line + 1
-          }
-
-          # Start a new chunk.
-          snippet_chunk = [lined_content[line_number]]
-          snippet_start_line = line_number
-        end
-        last_line = line_number
-      end
-      # Add final chunk to chunk array
-      snippet_chunks << {
-        data: snippet_chunk.join("\n"),
-        start_line: snippet_start_line + 1
-      }
-
-      # Return snippet with chunk array
-      { snippet_object: snippet, snippet_chunks: snippet_chunks }
-    end
-
-    # Defines how many unmatching lines should be
-    # included around the matching lines in a snippet
-    def surrounding_lines
-      3
-    end
   end
 end