Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

CHANGELOG

@@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date.
 
 v 7.12.0 (unreleased)
   - Refactor permission checks with issues and merge requests project settings (Stan Hu)
+  - Fix Markdown preview not working in Edit Milestone page (Stan Hu)
   - Add web hook support for note events (Stan Hu)
   - Disable "New Issue" and "New Merge Request" buttons when features are disabled in project settings (Stan Hu)
   - Remove Rack Attack monkey patches and bump to version 4.3.0 (Stan Hu)

Gemfile

@@ -239,7 +239,7 @@ group :development, :test do
   gem 'minitest', '~> 5.3.0'
 
   # Generate Fake data
-  gem "ffaker"
+  gem 'ffaker', '~> 2.0.0'
 
   # Guard
   gem 'guard-rspec'

Gemfile.lock

@@ -176,7 +176,7 @@ GEM
     faraday_middleware (0.9.0)
       faraday (>= 0.7.4, < 0.9)
     fastercsv (1.5.5)
-    ffaker (1.22.1)
+    ffaker (2.0.0)
     ffi (1.9.8)
     fog (1.21.0)
       fog-brightbox
@@ -547,9 +547,9 @@ GEM
     sdoc (0.3.20)
       json (>= 1.1.3)
       rdoc (~> 3.10)
-    seed-fu (2.3.1)
-      activerecord (>= 3.1, < 4.2)
-      activesupport (>= 3.1, < 4.2)
+    seed-fu (2.3.5)
+      activerecord (>= 3.1, < 4.3)
+      activesupport (>= 3.1, < 4.3)
     select2-rails (3.5.2)
       thor (~> 0.14)
     settingslogic (2.0.9)
@@ -589,7 +589,7 @@ GEM
       capybara (>= 2.0.0)
       railties (>= 3)
       spinach (>= 0.4)
-    spring (1.3.3)
+    spring (1.3.6)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
     spring-commands-spinach (1.0.0)
@@ -713,7 +713,7 @@ DEPENDENCIES
   email_spec
   enumerize
   factory_girl_rails
-  ffaker
+  ffaker (~> 2.0.0)
   fog (~> 1.14)
   font-awesome-rails (~> 4.2)
   foreman

app/assets/javascripts/zen_mode.js.coffee

 class @ZenMode
-  @fullscreen_prefix = 'fullscreen_'
-
   constructor: ->
     @active_zen_area = null
     @active_checkbox = null
@@ -23,7 +21,7 @@ class @ZenMode
       if checkbox.checked
         # Disable other keyboard shortcuts in ZEN mode
         Mousetrap.pause()
-        @udpateActiveZenArea(checkbox)
+        @updateActiveZenArea(checkbox)
       else
         @exitZenMode()
 
@@ -32,14 +30,11 @@ class @ZenMode
         @exitZenMode()
         e.preventDefault()
 
-    $(window).on 'hashchange', @updateZenModeFromLocationHash
-
-  udpateActiveZenArea: (checkbox) =>
+  updateActiveZenArea: (checkbox) =>
     @active_checkbox = $(checkbox)
     @active_checkbox.prop('checked', true)
     @active_zen_area = @active_checkbox.parent().find('textarea')
     @active_zen_area.focus()
-    window.location.hash = ZenMode.fullscreen_prefix + @active_checkbox.prop('id')
 
   exitZenMode: =>
     if @active_zen_area isnt null
@@ -51,17 +46,3 @@ class @ZenMode
       window.scrollTo(window.pageXOffset, @scroll_position)
       # Enable dropzone when leaving ZEN mode
       Dropzone.forElement('.div-dropzone').enable()
-
-  checkboxFromLocationHash: (e) ->
-    id = $.trim(window.location.hash.replace('#' + ZenMode.fullscreen_prefix, ''))
-    if id
-      return $('.zennable input[type=checkbox]#' + id)[0]
-    else
-      return null
-
-  updateZenModeFromLocationHash: (e) =>
-    checkbox = @checkboxFromLocationHash()
-    if checkbox
-      @udpateActiveZenArea(checkbox)
-    else
-      @exitZenMode()

app/helpers/labels_helper.rb

 module LabelsHelper
   include ActionView::Helpers::TagHelper
 
+  # Link to a Label
+  #
+  # label   - Label object to link to
+  # project - Project object which will be used as the context for the label's
+  #           link. If omitted, defaults to `@project`, or the label's own
+  #           project.
+  # block   - An optional block that will be passed to `link_to`, forming the
+  #           body of the link element. If omitted, defaults to
+  #           `render_colored_label`.
+  #
+  # Examples:
+  #
+  #   # Allow the generated link to use the label's own project
+  #   link_to_label(label)
+  #
+  #   # Force the generated link to use @project
+  #   @project = Project.first
+  #   link_to_label(label)
+  #
+  #   # Force the generated link to use a provided project
+  #   link_to_label(label, project: Project.last)
+  #
+  #   # Customize link body with a block
+  #   link_to_label(label) { "My Custom Label Text" }
+  #
+  # Returns a String
+  def link_to_label(label, project: nil, &block)
+    project ||= @project || label.project
+    link = namespace_project_issues_path(project.namespace, project,
+                                         label_name: label.name)
+
+    if block_given?
+      link_to link, &block
+    else
+      link_to render_colored_label(label), link
+    end
+  end
+
   def project_label_names
     @project.labels.pluck(:title)
   end

app/views/projects/issues/_discussion.html.haml

@@ -30,5 +30,4 @@
           %label Labels
         .issue-show-labels
           - @issue.labels.each do |label|
-            = link_to namespace_project_issues_path(@project.namespace, @project, label_name: label.name) do
-              = render_colored_label(label)
+            = link_to_label(label)

app/views/projects/issues/_issue.html.haml

@@ -8,8 +8,7 @@
       = link_to_gfm issue.title, issue_path(issue), class: "row_title"
     .issue-labels
       - issue.labels.each do |label|
-        = link_to namespace_project_issues_path(issue.project.namespace, issue.project, label_name: label.name) do
-          = render_colored_label(label)
+        = link_to_label(label, project: issue.project)
     .pull-right.light
       - if issue.closed?
         %span

app/views/projects/labels/_label.html.haml

 %li{id: dom_id(label)}
-  = render_colored_label(label)
+  = link_to_label(label)
   .pull-right
     %strong.append-right-20
-      = link_to namespace_project_issues_path(@project.namespace, @project, label_name: label.name) do
+      = link_to_label(label) do
         = pluralize label.open_issues_count, 'open issue'
 
     - if can? current_user, :admin_label, @project

app/views/projects/merge_requests/_discussion.html.haml

@@ -27,5 +27,4 @@
           %label Labels
         .merge-request-show-labels
           - @merge_request.labels.each do |label|
-            = link_to namespace_project_merge_requests_path(@project.namespace, @project, label_name: label.name) do
-              = render_colored_label(label)
+            = link_to_label(label)

app/views/projects/merge_requests/_merge_request.html.haml

@@ -4,8 +4,7 @@
       = link_to_gfm merge_request.title, merge_request_path(merge_request), class: "row_title"
     .merge-request-labels
       - merge_request.labels.each do |label|
-        = link_to namespace_project_merge_requests_path(merge_request.project.namespace, merge_request.project, label_name: label.name) do
-          = render_colored_label(label)
+        = link_to_label(label, project: merge_request.project)
     .pull-right.light
       - if merge_request.merged?
         %span

bin/rake

@@ -3,6 +3,5 @@ begin
   load File.expand_path("../spring", __FILE__)
 rescue LoadError
 end
-require_relative '../config/boot'
-require 'rake'
-Rake.application.run
+require 'bundler/setup'
+load Gem.bin_path('rake', 'rake')

bin/spring

 #!/usr/bin/env ruby
 
-# This file loads spring without using Bundler, in order to be fast
-# It gets overwritten when you run the `spring binstub` command
+# This file loads spring without using Bundler, in order to be fast.
+# It gets overwritten when you run the `spring binstub` command.
 
 unless defined?(Spring)
   require "rubygems"
   require "bundler"
 
-  if match = Bundler.default_lockfile.read.match(/^GEM$.*?^    spring \((.*?)\)$.*?^$/m)
-    ENV["GEM_PATH"] = ([Bundler.bundle_path.to_s] + Gem.path).join(File::PATH_SEPARATOR)
-    ENV["GEM_HOME"] = ""
-    Gem.paths = ENV
-
+  if match = Bundler.default_lockfile.read.match(/^GEM$.*?^    (?:  )*spring \((.*?)\)$.*?^$/m)
+    Gem.paths = { "GEM_PATH" => [Bundler.bundle_path.to_s, *Gem.path].uniq }
     gem "spring", match[1]
     require "spring/binstub"
   end

db/fixtures/development/04_project.rb

@@ -23,7 +23,7 @@ Sidekiq::Testing.inline! do
           name: group_path.titleize,
           path: group_path
         )
-        group.description = Faker::Lorem.sentence
+        group.description = FFaker::Lorem.sentence
         group.save
 
         group.add_owner(User.first)
@@ -35,7 +35,7 @@ Sidekiq::Testing.inline! do
         import_url: url,
         namespace_id: group.id,
         name: project_path.titleize,
-        description: Faker::Lorem.sentence,
+        description: FFaker::Lorem.sentence,
         visibility_level: Gitlab::VisibilityLevel.values.sample
       }
 

db/fixtures/development/05_users.rb

@@ -2,9 +2,9 @@ Gitlab::Seeder.quiet do
   (2..20).each  do |i|
     begin
       User.create!(
-        username: Faker::Internet.user_name,
-        name: Faker::Name.name,
-        email: Faker::Internet.email,
+        username: FFaker::Internet.user_name,
+        name: FFaker::Name.name,
+        email: FFaker::Internet.email,
         confirmed_at: DateTime.now,
         password: '12345678'
       )

db/fixtures/development/07_milestones.rb

@@ -3,7 +3,7 @@ Gitlab::Seeder.quiet do
     (1..5).each  do |i|
       milestone_params = {
         title: "v#{i}.0",
-        description: Faker::Lorem.sentence,
+        description: FFaker::Lorem.sentence,
         state: ['opened', 'closed'].sample,
       }
 

db/fixtures/development/09_issues.rb

@@ -2,8 +2,8 @@ Gitlab::Seeder.quiet do
   Project.all.each do |project|
     (1..10).each  do |i|
       issue_params = {
-        title: Faker::Lorem.sentence(6),
-        description: Faker::Lorem.sentence,
+        title: FFaker::Lorem.sentence(6),
+        description: FFaker::Lorem.sentence,
         state: ['opened', 'closed'].sample,
         milestone: project.milestones.sample,
         assignee: project.team.users.sample

db/fixtures/development/10_merge_requests.rb

@@ -10,8 +10,8 @@ Gitlab::Seeder.quiet do
       params = {
         source_branch: source_branch,
         target_branch: target_branch,
-        title: Faker::Lorem.sentence(6),
-        description: Faker::Lorem.sentences(3).join(" "),
+        title: FFaker::Lorem.sentence(6),
+        description: FFaker::Lorem.sentences(3).join(" "),
         milestone: project.milestones.sample,
         assignee: project.team.users.sample
       }

db/fixtures/development/12_snippets.rb

@@ -28,8 +28,8 @@ eos
     PersonalSnippet.seed(:id, [{
       id: i,
       author_id: user.id,
-      title: Faker::Lorem.sentence(3),
-      file_name:  Faker::Internet.domain_word + '.rb',
+      title: FFaker::Lorem.sentence(3),
+      file_name:  FFaker::Internet.domain_word + '.rb',
       visibility_level: Gitlab::VisibilityLevel.values.sample,
       content: content,
     }])

db/fixtures/development/13_comments.rb

@@ -6,7 +6,7 @@ Gitlab::Seeder.quiet do
       note_params = {
         noteable_type: 'Issue',
         noteable_id: issue.id,
-        note: Faker::Lorem.sentence,
+        note: FFaker::Lorem.sentence,
       }
 
       Notes::CreateService.new(project, user, note_params).execute
@@ -21,7 +21,7 @@ Gitlab::Seeder.quiet do
       note_params = {
         noteable_type: 'MergeRequest',
         noteable_id: mr.id,
-        note: Faker::Lorem.sentence,
+        note: FFaker::Lorem.sentence,
       }
 
       Notes::CreateService.new(project, user, note_params).execute

features/steps/project/hooks.rb

@@ -23,7 +23,7 @@ class Spinach::Features::ProjectHooks < Spinach::FeatureSteps
   end
 
   step 'I submit new hook' do
-    @url = Faker::Internet.uri("http")
+    @url = FFaker::Internet.uri("http")
     fill_in "hook_url", with: @url
     expect { click_button "Add Web Hook" }.to change(ProjectHook, :count).by(1)
   end

lib/gitlab/markdown/label_reference_filter.rb

@@ -84,11 +84,11 @@ module Gitlab
       #
       # Returns a Hash.
       def label_params(id, name)
-        if id > 0
-          { id: id }
-        else
+        if name
           # TODO (rspeicher): Don't strip single quotes if we decide to only use double quotes for surrounding.
           { name: name.tr('\'"', '') }
+        else
+          { id: id }
         end
       end
     end

spec/factories.rb

@@ -2,23 +2,23 @@ include ActionDispatch::TestProcess
 
 FactoryGirl.define do
   sequence :sentence, aliases: [:title, :content] do
-    Faker::Lorem.sentence
+    FFaker::Lorem.sentence
   end
 
   sequence :name do
-    Faker::Name.name
+    FFaker::Name.name
   end
 
   sequence :file_name do
-    Faker::Internet.user_name
+    FFaker::Internet.user_name
   end
 
-  sequence(:url) { Faker::Internet.uri('http') }
+  sequence(:url) { FFaker::Internet.uri('http') }
 
   factory :user, aliases: [:author, :assignee, :owner, :creator] do
-    email { Faker::Internet.email }
+    email { FFaker::Internet.email }
     name
-    sequence(:username) { |n| "#{Faker::Internet.user_name}#{n}" }
+    sequence(:username) { |n| "#{FFaker::Internet.user_name}#{n}" }
     password "12345678"
     confirmed_at { Time.now }
     confirmation_token { nil }
@@ -122,12 +122,12 @@ FactoryGirl.define do
   factory :email do
     user
     email do
-      Faker::Internet.email('alias')
+      FFaker::Internet.email('alias')
     end
 
     factory :another_email do
       email do
-        Faker::Internet.email('another.alias')
+        FFaker::Internet.email('another.alias')
       end
     end
   end

spec/features/admin/admin_hooks_spec.rb

@@ -26,7 +26,7 @@ describe "Admin::Hooks", feature: true do
 
   describe "New Hook" do
     before do
-      @url = Faker::Internet.uri("http")
+      @url = FFaker::Internet.uri("http")
       visit admin_hooks_path
       fill_in "hook_url", with: @url
       expect { click_button "Add System Hook" }.to change(SystemHook, :count).by(1)

spec/helpers/labels_helper_spec.rb

 require 'spec_helper'
 
 describe LabelsHelper do
-  it { expect(text_color_for_bg('#EEEEEE')).to eq('#333333') }
-  it { expect(text_color_for_bg('#222E2E')).to eq('#FFFFFF') }
+  describe 'link_to_label' do
+    let(:project) { create(:empty_project) }
+    let(:label)   { create(:label, project: project) }
+
+    context 'with @project set' do
+      before do
+        @project = project
+      end
+
+      it 'uses the instance variable' do
+        expect(label).not_to receive(:project)
+        link_to_label(label)
+      end
+    end
+
+    context 'without @project set' do
+      it "uses the label's project" do
+        expect(label).to receive(:project).and_return(project)
+        link_to_label(label)
+      end
+    end
+
+    context 'with a named project argument' do
+      it 'uses the provided project' do
+        arg = double('project')
+        expect(arg).to receive(:namespace).and_return('foo')
+        expect(arg).to receive(:to_param).and_return('foo')
+
+        link_to_label(label, project: arg)
+      end
+
+      it 'takes precedence over other types' do
+        @project = project
+        expect(@project).not_to receive(:namespace)
+        expect(label).not_to receive(:project)
+
+        arg = double('project', namespace: 'foo', to_param: 'foo')
+        link_to_label(label, project: arg)
+      end
+    end
+
+    context 'with block' do
+      it 'passes the block to link_to' do
+        link = link_to_label(label) { 'Foo' }
+        expect(link).to match('Foo')
+      end
+    end
+
+    context 'without block' do
+      it 'uses render_colored_label as the link content' do
+        expect(self).to receive(:render_colored_label).
+          with(label).and_return('Foo')
+        expect(link_to_label(label)).to match('Foo')
+      end
+    end
+  end
+
+  describe 'text_color_for_bg' do
+    it 'uses light text on dark backgrounds' do
+      expect(text_color_for_bg('#222E2E')).to eq('#FFFFFF')
+    end
+
+    it 'uses dark text on light backgrounds' do
+      expect(text_color_for_bg('#EEEEEE')).to eq('#333333')
+    end
+  end
 end

spec/lib/gitlab/markdown/label_reference_filter_spec.rb

@@ -149,5 +149,12 @@ module Gitlab::Markdown
         end
       end
     end
+
+    describe 'edge cases' do
+      it 'gracefully handles non-references matching the pattern' do
+        exp = act = '(format nil "~0f" 3.0) ; 3.0'
+        expect(filter(act).to_html).to eq exp
+     end
+    end
   end
 end

spec/mailers/notify_spec.rb

@@ -185,7 +185,7 @@ describe Notify do
 
       context 'for issues' do
         let(:issue) { create(:issue, author: current_user, assignee: assignee, project: project) }
-        let(:issue_with_description) { create(:issue, author: current_user, assignee: assignee, project: project, description: Faker::Lorem.sentence) }
+        let(:issue_with_description) { create(:issue, author: current_user, assignee: assignee, project: project, description: FFaker::Lorem.sentence) }
 
         describe 'that are new' do
           subject { Notify.new_issue_email(issue.assignee_id, issue.id) }
@@ -273,7 +273,7 @@ describe Notify do
       context 'for merge requests' do
         let(:merge_author) { create(:user) }
         let(:merge_request) { create(:merge_request, author: current_user, assignee: assignee, source_project: project, target_project: project) }
-        let(:merge_request_with_description) { create(:merge_request, author: current_user, assignee: assignee, source_project: project, target_project: project, description: Faker::Lorem.sentence) }
+        let(:merge_request_with_description) { create(:merge_request, author: current_user, assignee: assignee, source_project: project, target_project: project, description: FFaker::Lorem.sentence) }
 
         describe 'that are new' do
           subject { Notify.new_merge_request_email(merge_request.assignee_id, merge_request.id) }

spec/requests/api/projects_spec.rb

@@ -165,7 +165,7 @@ describe API::API, api: true  do
     it "should assign attributes to project" do
       project = attributes_for(:project, {
         path: 'camelCasePath',
-        description: Faker::Lorem.sentence,
+        description: FFaker::Lorem.sentence,
         issues_enabled: false,
         merge_requests_enabled: false,
         wiki_enabled: false
@@ -274,7 +274,7 @@ describe API::API, api: true  do
 
     it 'should assign attributes to project' do
       project = attributes_for(:project, {
-        description: Faker::Lorem.sentence,
+        description: FFaker::Lorem.sentence,
         issues_enabled: false,
         merge_requests_enabled: false,
         wiki_enabled: false