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

.gitlab-ci.yml

@@ -2,6 +2,7 @@ image: "ruby:2.1"
 
 services:
   - mysql:latest
+  - postgres:latest
   - redis:latest
   - elasticsearch:latest
 
@@ -12,17 +13,20 @@ cache:
 
 variables:
   MYSQL_ALLOW_EMPTY_PASSWORD: "1"
+  # retry tests only in CI environment
+  RSPEC_RETRY_RETRY_COUNT: "3"
   ELASTIC_HOST: "elasticsearch"
 
+
 before_script:
   - source ./scripts/prepare_build.sh
   - ruby -v
   - which ruby
-  - gem install bundler --no-ri --no-rdoc
+  - retry gem install bundler --no-ri --no-rdoc
   - cp config/gitlab.yml.example config/gitlab.yml
   - touch log/application.log
   - touch log/test.log
-  - bundle install --without postgres production --jobs $(nproc)  "${FLAGS[@]}"
+  - retry bundle install --without postgres production --jobs $(nproc) "${FLAGS[@]}"
   - RAILS_ENV=test bundle exec rake db:drop db:create db:schema:load db:migrate
 
 stages:
@@ -331,4 +335,4 @@ notify:slack:
     - master@gitlab-org/gitlab-ce
     - tags@gitlab-org/gitlab-ce
     - master@gitlab-org/gitlab-ee
-    - tags@gitlab-org/gitlab-ee
+    - tags@gitlab-org/gitlab-ee
\ No newline at end of file

CHANGELOG

@@ -17,10 +17,16 @@ v 8.6.0 (unreleased)
   - Add support for cross-project label references
   - Update documentation to reflect Guest role not being enforced on internal projects
   - Allow search for logged out users
+  - Fix bug where Bitbucket `closed` issues were imported as `opened` (Iuri de Silvio)
   - Don't show Issues/MRs from archived projects in Groups view
   - Increase the notes polling timeout over time (Roberto Dip)
   - Show labels in dashboard and group milestone views
   - Add main language of a project in the list of projects (Tiago Botelho)
+  - Add ability to show archived projects on dashboard, explore and group pages
+
+v 8.5.5
+  - Ensure removing a project removes associated Todo entries.
+  - Prevent a 500 error in Todos when author was removed.
 
 v 8.5.4
   - Do not cache requests for badges (including builds badge)

Gemfile

@@ -273,7 +273,9 @@ group :development, :test do
   gem 'database_cleaner',   '~> 1.4.0'
   gem 'factory_girl_rails', '~> 4.6.0'
   gem 'rspec-rails',        '~> 3.3.0'
+  gem 'rspec-retry'
   gem 'spinach-rails',      '~> 0.2.1'
+  gem 'spinach-rerun-reporter', '~> 0.0.2'
 
   # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
   gem 'minitest', '~> 5.7.0'
@@ -283,7 +285,7 @@ group :development, :test do
 
   gem 'capybara',            '~> 2.4.0'
   gem 'capybara-screenshot', '~> 1.0.0'
-  gem 'poltergeist',         '~> 1.8.1'
+  gem 'poltergeist',         '~> 1.9.0'
 
   gem 'teaspoon', '~> 1.0.0'
   gem 'teaspoon-jasmine', '~> 2.2.0'

Gemfile.lock

@@ -576,7 +576,7 @@ GEM
     parser (2.2.3.0)
       ast (>= 1.1, < 3.0)
     pg (0.18.4)
-    poltergeist (1.8.1)
+    poltergeist (1.9.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
@@ -703,6 +703,8 @@ GEM
       rspec-expectations (~> 3.3.0)
       rspec-mocks (~> 3.3.0)
       rspec-support (~> 3.3.0)
+    rspec-retry (0.4.5)
+      rspec-core
     rspec-support (3.3.0)
     rubocop (0.35.1)
       astrolabe (~> 1.3)
@@ -788,6 +790,8 @@ GEM
       capybara (>= 2.0.0)
       railties (>= 3)
       spinach (>= 0.4)
+    spinach-rerun-reporter (0.0.2)
+      spinach (~> 0.8)
     spring (1.6.4)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
@@ -1011,7 +1015,7 @@ DEPENDENCIES
   org-ruby (~> 0.9.12)
   paranoia (~> 2.0)
   pg (~> 0.18.2)
-  poltergeist (~> 1.8.1)
+  poltergeist (~> 1.9.0)
   pry-rails
   quiet_assets (~> 1.0.2)
   rack-attack (~> 4.3.1)
@@ -1032,6 +1036,7 @@ DEPENDENCIES
   rouge (~> 1.10.1)
   rqrcode-rails3 (~> 0.1.7)
   rspec-rails (~> 3.3.0)
+  rspec-retry
   rubocop (~> 0.35.0)
   ruby-fogbugz (~> 0.2.1)
   sanitize (~> 2.0)
@@ -1050,6 +1055,7 @@ DEPENDENCIES
   six (~> 0.2.0)
   slack-notifier (~> 1.2.0)
   spinach-rails (~> 0.2.1)
+  spinach-rerun-reporter (~> 0.0.2)
   spring (~> 1.6.4)
   spring-commands-rspec (~> 1.0.4)
   spring-commands-spinach (~> 1.0.0)

app/assets/stylesheets/framework/dropdowns.scss

@@ -81,8 +81,9 @@
       &::before {
         content: "\f00c";
         position: absolute;
-        left: 4px;
-        top: 8px;
+        left: 5px;
+        top: 50%;
+        margin-top: -7px;
         font: normal normal normal 14px/1 FontAwesome;
         font-size: inherit;
         text-rendering: auto;
@@ -94,8 +95,8 @@
 }
 
 .dropdown-header {
-  padding-left: 10px;
-  padding-right: 10px;
+  padding-left: 5px;
+  padding-right: 5px;
   color: $dropdown-header-color;
   font-size: 13px;
   line-height: 22px;

app/assets/stylesheets/pages/snippets.scss

@@ -26,5 +26,5 @@
   margin-right: 10px;
   font-size: $gl-font-size;
   border: 1px solid;
-  line-height: 40px;
+  line-height: 32px;
 }

app/controllers/concerns/filter_projects.rb

+# == FilterProjects
+#
+# Controller concern to handle projects filtering
+# * by name
+# * by archived state
+#
+module FilterProjects
+  extend ActiveSupport::Concern
+
+  def filter_projects(projects)
+    projects = projects.search(params[:filter_projects]) if params[:filter_projects].present?
+    projects = projects.non_archived if params[:archived].blank?
+    projects
+  end
+end

app/controllers/dashboard/projects_controller.rb

 class Dashboard::ProjectsController < Dashboard::ApplicationController
+  include FilterProjects
+
   before_action :event_filter
 
   def index
-    @projects = current_user.authorized_projects.sorted_by_activity.non_archived
-    @projects = @projects.sort(@sort = params[:sort])
+    @projects = current_user.authorized_projects.sorted_by_activity
+    @projects = filter_projects(@projects)
     @projects = @projects.includes(:namespace)
+    @projects = @projects.sort(@sort = params[:sort])
+    @projects = @projects.page(params[:page]).per(PER_PAGE) if params[:filter_projects].blank?
 
-    terms = params[:filter_projects]
-
-    if terms.present?
-      @projects = @projects.search(terms)
-    end
-
-    @projects = @projects.page(params[:page]).per(PER_PAGE) if terms.blank?
     @last_push = current_user.recent_push
 
     respond_to do |format|
@@ -32,16 +29,11 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
 
   def starred
     @projects = current_user.starred_projects.sorted_by_activity
+    @projects = filter_projects(@projects)
     @projects = @projects.includes(:namespace, :forked_from_project, :tags)
     @projects = @projects.sort(@sort = params[:sort])
+    @projects = @projects.page(params[:page]).per(PER_PAGE) if params[:filter_projects].blank?
 
-    terms = params[:filter_projects]
-
-    if terms.present?
-      @projects = @projects.search(terms)
-    end
-
-    @projects = @projects.page(params[:page]).per(PER_PAGE) if terms.blank?
     @last_push = current_user.recent_push
     @groups = []
 

app/controllers/explore/projects_controller.rb

 class Explore::ProjectsController < Explore::ApplicationController
+  include FilterProjects
+
   def index
     @projects = ProjectsFinder.new.execute(current_user)
     @tags = @projects.tags_on(:tags)
     @projects = @projects.tagged_with(params[:tag]) if params[:tag].present?
     @projects = @projects.where(visibility_level: params[:visibility_level]) if params[:visibility_level].present?
-    @projects = @projects.non_archived
-    @projects = @projects.search(params[:search]) if params[:search].present?
-    @projects = @projects.search(params[:filter_projects]) if params[:filter_projects].present?
+    @projects = filter_projects(@projects)
     @projects = @projects.sort(@sort = params[:sort])
     @projects = @projects.includes(:namespace).page(params[:page]).per(PER_PAGE) if params[:filter_projects].blank?
 
@@ -22,8 +22,7 @@ class Explore::ProjectsController < Explore::ApplicationController
 
   def trending
     @projects = TrendingProjectsFinder.new.execute(current_user)
-    @projects = @projects.non_archived
-    @projects = @projects.search(params[:filter_projects]) if params[:filter_projects].present?
+    @projects = filter_projects(@projects)
     @projects = @projects.page(params[:page]).per(PER_PAGE) if params[:filter_projects].blank?
 
     respond_to do |format|
@@ -38,7 +37,7 @@ class Explore::ProjectsController < Explore::ApplicationController
 
   def starred
     @projects = ProjectsFinder.new.execute(current_user)
-    @projects = @projects.search(params[:filter_projects]) if params[:filter_projects].present?
+    @projects = filter_projects(@projects)
     @projects = @projects.reorder('star_count DESC')
     @projects = @projects.page(params[:page]).per(PER_PAGE) if params[:filter_projects].blank?
 

app/controllers/groups_controller.rb

 class GroupsController < Groups::ApplicationController
+  include FilterProjects
   include IssuesAction
   include MergeRequestsAction
 
@@ -41,7 +42,8 @@ class GroupsController < Groups::ApplicationController
   def show
     @last_push = current_user.recent_push if current_user
     @projects = @projects.includes(:namespace)
-    @projects = @projects.search(params[:filter_projects]) if params[:filter_projects].present?
+    @projects = filter_projects(@projects)
+    @projects = @projects.sort(@sort = params[:sort])
     @projects = @projects.page(params[:page]).per(PER_PAGE) if params[:filter_projects].blank?
 
     @shared_projects = @group.shared_projects
@@ -106,7 +108,7 @@ class GroupsController < Groups::ApplicationController
   end
 
   def load_projects
-    @projects ||= ProjectsFinder.new.execute(current_user, group: group).sorted_by_activity.non_archived
+    @projects ||= ProjectsFinder.new.execute(current_user, group: group).sorted_by_activity
   end
 
   # Dont allow unauthorized access to group

app/finders/snippets_finder.rb

@@ -4,7 +4,7 @@ class SnippetsFinder
 
     case filter
     when :all then
-      snippets(current_user).fresh.non_expired
+      snippets(current_user).fresh
     when :by_user then
       by_user(current_user, params[:user], params[:scope])
     when :by_project
@@ -27,7 +27,7 @@ class SnippetsFinder
   end
 
   def by_user(current_user, user, scope)
-    snippets = user.snippets.fresh.non_expired
+    snippets = user.snippets.fresh
 
     return snippets.are_public unless current_user
 
@@ -48,7 +48,7 @@ class SnippetsFinder
   end
 
   def by_project(current_user, project)
-    snippets = project.snippets.fresh.non_expired
+    snippets = project.snippets.fresh
 
     if current_user
       if project.team.member?(current_user.id)

app/helpers/application_helper.rb

@@ -72,7 +72,7 @@ module ApplicationHelper
     if user_or_email.is_a?(User)
       user = user_or_email
     else
-      user = User.find_by(email: user_or_email.downcase)
+      user = User.find_by(email: user_or_email.try(:downcase))
     end
 
     if user

app/helpers/commits_helper.rb

@@ -211,4 +211,15 @@ module CommitsHelper
   def clean(string)
     Sanitize.clean(string, remove_contents: true)
   end
+
+  def limited_commits(commits)
+    if commits.size > MergeRequestDiff::COMMITS_SAFE_SIZE
+      [
+        commits.first(MergeRequestDiff::COMMITS_SAFE_SIZE),
+        commits.size - MergeRequestDiff::COMMITS_SAFE_SIZE
+      ]
+    else
+      [commits, 0]
+    end
+  end
 end

app/helpers/explore_helper.rb

 module ExploreHelper
-  def explore_projects_filter_path(options={})
+  def filter_projects_path(options={})
     exist_opts = {
       sort: params[:sort],
       scope: params[:scope],
@@ -9,15 +9,7 @@ module ExploreHelper
     }
 
     options = exist_opts.merge(options)
-
-    path = if explore_controller?
-             explore_projects_path
-           elsif current_action?(:starred)
-             starred_dashboard_projects_path
-           else
-             dashboard_projects_path
-           end
-
+    path = request.path
     path << "?#{options.to_param}"
     path
   end

app/helpers/snippets_helper.rb

 module SnippetsHelper
-  def lifetime_select_options
-    options = [
-        ['forever', nil],
-        ['1 day',   "#{Date.current + 1.day}"],
-        ['1 week',  "#{Date.current + 1.week}"],
-        ['1 month', "#{Date.current + 1.month}"]
-    ]
-    options_for_select(options)
-  end
-
   def reliable_snippet_path(snippet)
     if snippet.project_id?
       namespace_project_snippet_path(snippet.project.namespace,

app/helpers/sorting_helper.rb

@@ -16,6 +16,16 @@ module SortingHelper
     }
   end
 
+  def projects_sort_options_hash
+    {
+      sort_value_name => sort_title_name,
+      sort_value_recently_updated => sort_title_recently_updated,
+      sort_value_oldest_updated => sort_title_oldest_updated,
+      sort_value_recently_created => sort_title_recently_created,
+      sort_value_oldest_created => sort_title_oldest_created,
+    }
+  end
+
   def sort_title_oldest_updated
     'Oldest updated'
   end

app/models/ability.rb

@@ -10,6 +10,7 @@ class Ability
         when CommitStatus then commit_status_abilities(user, subject)
         when Project then project_abilities(user, subject)
         when Issue then issue_abilities(user, subject)
+	when ExternalIssue then external_issue_abilities(user, subject)
         when Note then note_abilities(user, subject)
         when ProjectSnippet then project_snippet_abilities(user, subject)
         when PersonalSnippet then personal_snippet_abilities(user, subject)
@@ -446,6 +447,10 @@ class Ability
                      end
     end
 
+    def external_issue_abilities(user, subject)
+      project_abilities(user, subject.project)
+    end
+
     private
 
     def named_abilities(name)

app/models/merge_request_diff.rb

@@ -17,7 +17,7 @@ class MergeRequestDiff < ActiveRecord::Base
   include Sortable
 
   # Prevent store of diff if commits amount more then 500
-  COMMITS_SAFE_SIZE = 500
+  COMMITS_SAFE_SIZE = 100
 
   belongs_to :merge_request
 

app/models/personal_snippet.rb

@@ -10,7 +10,6 @@
 #  created_at       :datetime
 #  updated_at       :datetime
 #  file_name        :string(255)
-#  expires_at       :datetime
 #  type             :string(255)
 #  visibility_level :integer          default(0), not null
 #

app/models/project.rb

@@ -163,6 +163,7 @@ class Project < ActiveRecord::Base
   has_many :project_group_links, dependent: :destroy
   has_many :invited_groups, through: :project_group_links, source: :group
   has_many :pages_domains, dependent: :destroy
+  has_many :todos, dependent: :destroy
 
   has_one :import_data, dependent: :destroy, class_name: "ProjectImportData"
 

app/models/project_snippet.rb

@@ -10,7 +10,6 @@
 #  created_at       :datetime
 #  updated_at       :datetime
 #  file_name        :string(255)
-#  expires_at       :datetime
 #  type             :string(255)
 #  visibility_level :integer          default(0), not null
 #
@@ -28,6 +27,4 @@ class ProjectSnippet < Snippet
 
   # Scopes
   scope :fresh, -> { order("created_at DESC") }
-  scope :non_expired, -> { where(["expires_at IS NULL OR expires_at > ?", Time.current]) }
-  scope :expired, -> { where(["expires_at IS NOT NULL AND expires_at < ?", Time.current]) }
 end

app/models/snippet.rb

@@ -10,7 +10,6 @@
 #  created_at       :datetime
 #  updated_at       :datetime
 #  file_name        :string(255)
-#  expires_at       :datetime
 #  type             :string(255)
 #  visibility_level :integer          default(0), not null
 #
@@ -47,8 +46,6 @@ class Snippet < ActiveRecord::Base
   scope :are_public, -> { where(visibility_level: Snippet::PUBLIC) }
   scope :public_and_internal, -> { where(visibility_level: [Snippet::PUBLIC, Snippet::INTERNAL]) }
   scope :fresh,   -> { order("created_at DESC") }
-  scope :expired, -> { where(["expires_at IS NOT NULL AND expires_at < ?", Time.current]) }
-  scope :non_expired, -> { where(["expires_at IS NULL OR expires_at > ?", Time.current]) }
 
   participant :author, :notes
 
@@ -112,10 +109,6 @@ class Snippet < ActiveRecord::Base
     nil
   end
 
-  def expired?
-    expires_at && expires_at < Time.current
-  end
-
   def visibility_level_field
     visibility_level
   end

app/services/git_push_service.rb

@@ -124,7 +124,9 @@ class GitPushService < BaseService
         # a different branch.
         closed_issues = commit.closes_issues(current_user)
         closed_issues.each do |issue|
-          Issues::CloseService.new(project, authors[commit], {}).execute(issue, commit)
+          if can?(current_user, :update_issue, issue)
+            Issues::CloseService.new(project, authors[commit], {}).execute(issue, commit)
+          end
         end
       end
 

app/services/merge_requests/post_merge_service.rb

@@ -21,7 +21,9 @@ module MergeRequests
 
       closed_issues = merge_request.closes_issues(current_user)
       closed_issues.each do |issue|
-        Issues::CloseService.new(project, current_user, {}).execute(issue, merge_request)
+        if can?(current_user, :update_issue, issue)
+          Issues::CloseService.new(project, current_user, {}).execute(issue, merge_request)
+        end
       end
     end
 

app/views/dashboard/_projects_head.html.haml

@@ -15,7 +15,7 @@
   .nav-controls
     = form_tag request.original_url, method: :get, class: 'project-filter-form', id: 'project-filter-form' do |f|
       = search_field_tag :filter_projects, params[:filter_projects], placeholder: 'Filter by name...', class: 'project-filter-form-field form-control input-short projects-list-filter', spellcheck: false, id: 'project-filter-form-field', tabindex: "2"
-    = render 'explore/projects/dropdown'
+    = render 'shared/projects/dropdown'
     - if current_user.can_create_project?
       = link_to new_project_path, class: 'btn btn-new' do
         = icon('plus')

app/views/dashboard/todos/_todo.html.haml

@@ -4,7 +4,10 @@
 
     .todo-title
       %span.author-name
-        = link_to_author todo
+        - if todo.author
+          = link_to_author(todo)
+        - else
+          (removed)
       %span.todo-label
         = todo_action_name(todo)
         = todo_target_link(todo)

app/views/explore/projects/_dropdown.html.haml

-.dropdown.inline
-  %button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'}
-    %span.light
-    - if @sort.present?
-      = sort_options_hash[@sort]
-    - else
-      = sort_title_recently_updated
-    %b.caret
-  %ul.dropdown-menu.dropdown-menu-align-right
-    %li
-      = link_to explore_projects_filter_path(sort: sort_value_name) do
-        = sort_title_name
-      = link_to explore_projects_filter_path(sort: sort_value_recently_created) do
-        = sort_title_recently_created
-      = link_to explore_projects_filter_path(sort: sort_value_oldest_created) do
-        = sort_title_oldest_created
-      = link_to explore_projects_filter_path(sort: sort_value_recently_updated) do
-        = sort_title_recently_updated
-      = link_to explore_projects_filter_path(sort: sort_value_oldest_updated) do
-        = sort_title_oldest_updated

app/views/explore/projects/_filter.html.haml

@@ -10,11 +10,11 @@
       %b.caret
     %ul.dropdown-menu
       %li
-        = link_to explore_projects_filter_path(visibility_level: nil) do
+        = link_to filter_projects_path(visibility_level: nil) do
           Any
       - Gitlab::VisibilityLevel.values.each do |level|
         %li{ class: (level.to_s == params[:visibility_level]) ? 'active' : 'light' }
-          = link_to explore_projects_filter_path(visibility_level: level) do
+          = link_to filter_projects_path(visibility_level: level) do
             = visibility_level_icon(level)
             = visibility_level_label(level)
 
@@ -30,11 +30,11 @@
       %b.caret
     %ul.dropdown-menu
       %li
-        = link_to explore_projects_filter_path(tag: nil) do
+        = link_to filter_projects_path(tag: nil) do
           Any
 
       - @tags.each do |tag|
         %li{ class: (tag.name == params[:tag]) ? 'active' : 'light' }
-          = link_to explore_projects_filter_path(tag: tag.name) do
-            %i.fa.fa-tag
+          = link_to filter_projects_path(tag: tag.name) do
+            = icon('tag')
             = tag.name

app/views/groups/_projects.html.haml

@@ -3,9 +3,10 @@
     = form_tag request.original_url, method: :get, class: 'project-filter-form', id: 'project-filter-form' do |f|
       - if @projects.present?
         = search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'projects-list-filter form-control', spellcheck: false
-      - if can? current_user, :create_projects, @group
-        = link_to new_project_path(namespace_id: @group.id), class: 'btn btn-new pull-right' do
-          = icon('plus')
-          New Project
+    = render 'shared/projects/dropdown'
+    - if can? current_user, :create_projects, @group
+      = link_to new_project_path(namespace_id: @group.id), class: 'btn btn-new pull-right' do
+        = icon('plus')
+        New Project
 
 = render 'shared/projects/list', projects: @projects, stars: false, skip_namespace: true

app/views/projects/commits/_commit_list.html.haml

+- commits, hidden = limited_commits(@commits)
+- commits = Commit.decorate(commits, @project)
+
 %div.panel.panel-default
   .panel-heading
     Commits (#{@commits.count})
-  - if @commits.size > MergeRequestDiff::COMMITS_SAFE_SIZE
+  - if hidden > 0
     %ul.well-list
-      - Commit.decorate(@commits.first(MergeRequestDiff::COMMITS_SAFE_SIZE), @project).each do |commit|
+      - commits.each do |commit|
         = render "projects/commits/inline_commit", commit: commit, project: @project
       %li.warning-row.unstyled
-        other #{@commits.size - MergeRequestDiff::COMMITS_SAFE_SIZE} commits hidden to prevent performance issues.
+        #{number_with_delimiter(hidden)} additional commits have been omitted to prevent performance issues.
   - else
-    %ul.well-list= render Commit.decorate(@commits, @project), project: @project
+    %ul.well-list= render commits, project: @project

app/views/projects/commits/_commits.html.haml

 - unless defined?(project)
   - project = @project
 
-- @commits.group_by { |c| c.committed_date.to_date }.sort.reverse.each do |day, commits|
+- commits, hidden = limited_commits(@commits)
+
+- commits.group_by { |c| c.committed_date.to_date }.sort.reverse.each do |day, commits|
   .row.commits-row
     .col-md-2.hidden-xs.hidden-sm
       %h5.commits-row-date
@@ -13,3 +15,7 @@
       %ul.bordered-list
         = render commits, project: project
   %hr.lists-separator
+
+- if hidden > 0
+  .alert.alert-warning
+    #{number_with_delimiter(hidden)} additional commits have been omitted to prevent performance issues.

app/views/shared/projects/_dropdown.html.haml

+- @sort ||= sort_value_recently_updated
+- archived = params[:archived]
+.dropdown.inline
+  %button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'}
+    %span.light
+      = projects_sort_options_hash[@sort]
+    %b.caret
+  %ul.dropdown-menu.dropdown-menu-align-right.dropdown-menu-selectable
+    %li.dropdown-header
+      Sort by
+    - projects_sort_options_hash.each do |value, title|
+      %li
+        = link_to filter_projects_path(sort: value, archived: archived), class: ("is-active" if @sort == value) do
+          = title
+
+    %li.divider
+    %li
+      = link_to filter_projects_path(sort: @sort, archived: nil), class: ("is-active" unless params[:archived].present?) do
+        Hide archived projects
+    %li
+      = link_to filter_projects_path(sort: @sort, archived: true), class: ("is-active" if params[:archived].present?) do
+        Show archived projects

db/migrate/20160305220806_remove_expires_at_from_snippets.rb

+class RemoveExpiresAtFromSnippets < ActiveRecord::Migration
+  def change
+    remove_column :snippets, :expires_at, :datetime
+  end
+end

db/migrate/20160309140734_fix_todos.rb

+class FixTodos < ActiveRecord::Migration
+ def up
+    execute <<-SQL
+      DELETE FROM todos
+      WHERE todos.target_type IN ('Commit', 'ProjectSnippet')
+         OR NOT EXISTS (
+              SELECT *
+              FROM projects
+              WHERE projects.id = todos.project_id
+            )
+    SQL
+ end
+
+ def down
+ end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160302141317) do
+ActiveRecord::Schema.define(version: 20160309140734) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -893,7 +893,6 @@ ActiveRecord::Schema.define(version: 20160302141317) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "file_name"
-    t.datetime "expires_at"
     t.string   "type"
     t.integer  "visibility_level", default: 0, null: false
   end
@@ -901,7 +900,6 @@ ActiveRecord::Schema.define(version: 20160302141317) do
   add_index "snippets", ["author_id"], name: "index_snippets_on_author_id", using: :btree
   add_index "snippets", ["created_at", "id"], name: "index_snippets_on_created_at_and_id", using: :btree
   add_index "snippets", ["created_at"], name: "index_snippets_on_created_at", using: :btree
-  add_index "snippets", ["expires_at"], name: "index_snippets_on_expires_at", using: :btree
   add_index "snippets", ["project_id"], name: "index_snippets_on_project_id", using: :btree
   add_index "snippets", ["updated_at"], name: "index_snippets_on_updated_at", using: :btree
   add_index "snippets", ["visibility_level"], name: "index_snippets_on_visibility_level", using: :btree

doc/api/notes.md

@@ -145,7 +145,6 @@ Parameters:
     "state": "active",
     "created_at": "2013-09-30T13:46:01Z"
   },
-  "expires_at": null,
   "updated_at": "2013-10-02T07:34:20Z",
   "created_at": "2013-10-02T07:34:20Z"
 }

doc/api/project_snippets.md

@@ -51,7 +51,6 @@ Parameters:
     "state": "active",
     "created_at": "2012-05-23T08:00:58Z"
   },
-  "expires_at": null,
   "updated_at": "2012-06-28T10:52:04Z",
   "created_at": "2012-06-28T10:52:04Z"
 }

doc/update/upgrader.md

@@ -4,7 +4,7 @@
 
 Although deprecated, if someone wants to make this script into a gem or otherwise improve it merge requests are welcome.
 
-*Make sure you view this [upgrade guide from the 'master' branch](../../../master/doc/update/upgrader.md) for the most up to date instructions.*
+*Make sure you view this [upgrade guide from the 'master' branch](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/update/upgrader.md) for the most up to date instructions.*
 
 GitLab Upgrader - a ruby script that allows you easily upgrade GitLab to latest minor version.
 

doc/web_hooks/web_hooks.md

@@ -586,7 +586,6 @@ X-Gitlab-Event: Note Hook
     "created_at": "2015-04-09 02:40:38 UTC",
     "updated_at": "2015-04-09 02:40:38 UTC",
     "file_name": "test.rb",
-    "expires_at": null,
     "type": "ProjectSnippet",
     "visibility_level": 0
   }

features/dashboard/archived_projects.feature

@@ -10,3 +10,8 @@ Feature: Dashboard Archived Projects
   Scenario: I should see non-archived projects on dashboard
     Then I should see "Shop" project link
     And I should not see "Forum" project link
+
+  Scenario: I toggle show of archived projects on dashboard
+    When I click "Show archived projects" link
+    Then I should see "Shop" project link
+    And I should see "Forum" project link

features/explore/projects.feature

@@ -140,4 +140,4 @@ Feature: Explore Projects
     When I visit the explore starred projects
     Then I should see project "Community"
     And I should see project "Internal"
-    And I should see project "Archive"
+    And I should not see project "Archive"

features/steps/dashboard/archived_projects.rb

@@ -19,4 +19,8 @@ class Spinach::Features::DashboardArchivedProjects < Spinach::FeatureSteps
   step 'I should see "Forum" project link' do
     expect(page).to have_link "Forum"
   end
+
+  step 'I click "Show archived projects" link' do
+    click_link "Show archived projects"
+  end
 end

features/support/env.rb

@@ -14,6 +14,7 @@ require 'sidekiq/testing/inline'
 
 require_relative 'capybara'
 require_relative 'db_cleaner'
+require_relative 'rerun'
 
 %w(select2_helper test_env repo_helpers license).each do |f|
   require Rails.root.join('spec', 'support', f)

features/support/rerun.rb

+# The spinach-rerun-reporter doesn't define the on_undefined_step
+# See it here: https://github.com/javierav/spinach-rerun-reporter/blob/master/lib/spinach/reporter/rerun.rb
+module Spinach
+  class Reporter
+    class Rerun
+      def on_undefined_step(step_data, failure, step_definitions = nil)
+        super step_data, failure, step_definitions
+
+        # save feature file and scenario line
+        @rerun << "#{current_feature.filename}:#{current_scenario.line}"
+      end
+    end
+  end
+end

lib/api/entities.rb

@@ -153,7 +153,7 @@ module API
     class ProjectSnippet < Grape::Entity
       expose :id, :title, :file_name
       expose :author, using: Entities::UserBasic
-      expose :expires_at, :updated_at, :created_at
+      expose :updated_at, :created_at
     end
 
     class ProjectEntity < Grape::Entity

lib/gitlab/bitbucket_import/importer.rb

@@ -76,7 +76,7 @@ module Gitlab
           project.issues.create!(
             description: body,
             title: issue["title"],
-            state: %w(resolved invalid duplicate wontfix).include?(issue["status"]) ? 'closed' : 'opened',
+            state: %w(resolved invalid duplicate wontfix closed).include?(issue["status"]) ? 'closed' : 'opened',
             author_id: gl_user_id(project, reporter)
           )
         end

lib/tasks/gemojione.rake

+# This task will generate a standard and Retina sprite of all of the current
+# Gemojione Emojis, with the accompanying SCSS map.
+#
+# It will not appear in `rake -T` output, and the dependent gems are not
+# included in the Gemfile by default, because this task will only be needed
+# occasionally, such as when new Emojis are added to Gemojione.
+
+begin
+  require 'sprite_factory'
+  require 'rmagick'
+rescue LoadError
+  # noop
+end
+
+namespace :gemojione do
+  task sprite: :environment do
+    check_requirements!
+
+    SIZE   = 20
+    RETINA = SIZE * 2
+
+    Dir.mktmpdir do |tmpdir|
+      # Copy the Gemojione assets to the temporary folder for resizing
+      FileUtils.cp_r(Gemojione.index.images_path, tmpdir)
+
+      Dir.chdir(tmpdir) do
+        Dir["**/*.png"].each do |png|
+          resize!(File.join(tmpdir, png), SIZE)
+        end
+      end
+
+      style_path = Rails.root.join(*%w(app assets stylesheets pages emojis.scss))
+
+      # Combine the resized assets into a packed sprite and re-generate the SCSS
+      SpriteFactory.cssurl = "image-url('$IMAGE')"
+      SpriteFactory.run!(File.join(tmpdir, 'images'), {
+        output_style: style_path,
+        output_image: "app/assets/images/emoji.png",
+        selector:     '.emoji-',
+        style:        :scss,
+        nocomments:   true,
+        pngcrush:     true,
+        layout:       :packed
+      })
+
+      # SpriteFactory's SCSS is a bit too verbose for our purposes here, so
+      # let's simplify it
+      system(%Q(sed -i '' "s/width: #{SIZE}px; height: #{SIZE}px; background: image-url('emoji.png')/background-position:/" #{style_path}))
+      system(%Q(sed -i '' "s/ no-repeat//" #{style_path}))
+
+      # Append a generic rule that applies to all Emojis
+      File.open(style_path, 'a') do |f|
+        f.puts
+        f.puts <<-CSS.strip_heredoc
+        .emoji-icon {
+          background-image: image-url('emoji.png');
+          background-repeat: no-repeat;
+          height: #{SIZE}px;
+          width: #{SIZE}px;
+
+          @media only screen and (-webkit-min-device-pixel-ratio: 2),
+                 only screen and (min--moz-device-pixel-ratio: 2),
+                 only screen and (-o-min-device-pixel-ratio: 2/1),
+                 only screen and (min-device-pixel-ratio: 2),
+                 only screen and (min-resolution: 192dpi),
+                 only screen and (min-resolution: 2dppx) {
+            background-image: image-url('emoji@2x.png');
+            background-size: 840px 820px;
+          }
+        }
+        CSS
+      end
+    end
+
+    # Now do it again but for Retina
+    Dir.mktmpdir do |tmpdir|
+      # Copy the Gemojione assets to the temporary folder for resizing
+      FileUtils.cp_r(Gemojione.index.images_path, tmpdir)
+
+      Dir.chdir(tmpdir) do
+        Dir["**/*.png"].each do |png|
+          resize!(File.join(tmpdir, png), RETINA)
+        end
+      end
+
+      # Combine the resized assets into a packed sprite and re-generate the SCSS
+      SpriteFactory.run!(File.join(tmpdir, 'images'), {
+        output_image: "app/assets/images/emoji@2x.png",
+        style:        false,
+        nocomments:   true,
+        pngcrush:     true,
+        layout:       :packed
+      })
+    end
+  end
+
+  def check_requirements!
+    return if defined?(SpriteFactory) && defined?(Magick)
+
+    puts <<-MSG.strip_heredoc
+      This task is disabled by default and should only be run when the Gemojione
+      gem is updated with new Emojis.
+
+      To enable this task, *temporarily* add the following lines to Gemfile and
+      re-bundle:
+
+      gem 'sprite-factory'
+      gem 'rmagick'
+    MSG
+
+    exit 1
+  end
+
+  def resize!(image_path, size)
+    # Resize the image in-place, save it, and free the object
+    image = Magick::Image.read(image_path).first
+    image.resize!(size, size)
+    image.write(image_path) { self.quality = 100 }
+    image.destroy!
+  end
+end

lib/tasks/spinach.rake

@@ -4,53 +4,59 @@ namespace :spinach do
   namespace :project do
     desc "GitLab | Spinach | Run project commits, issues and merge requests spinach features"
     task :half do
-      cmds = [
-        %W(rake gitlab:setup),
-        %W(spinach --tags @project_commits,@project_issues,@project_merge_requests),
-      ]
-      run_commands(cmds)
+      run_spinach_tests('@project_commits,@project_issues,@project_merge_requests')
     end
 
     desc "GitLab | Spinach | Run remaining project spinach features"
     task :rest do
-      cmds = [
-        %W(rake gitlab:setup),
-        %W(spinach --tags ~@admin,~@dashboard,~@profile,~@public,~@snippets,~@project_commits,~@project_issues,~@project_merge_requests),
-      ]
-      run_commands(cmds)
+      run_spinach_tests('~@admin,~@dashboard,~@profile,~@public,~@snippets,~@project_commits,~@project_issues,~@project_merge_requests')
     end
   end
 
   desc "GitLab | Spinach | Run project spinach features"
   task :project do
-    cmds = [
-      %W(rake gitlab:setup),
-      %W(spinach --tags ~@admin,~@dashboard,~@profile,~@public,~@snippets),
-    ]
-    run_commands(cmds)
+    run_spinach_tests('~@admin,~@dashboard,~@profile,~@public,~@snippets')
   end
 
   desc "GitLab | Spinach | Run other spinach features"
   task :other do
-    cmds = [
-      %W(rake gitlab:setup),
-      %W(spinach --tags @admin,@dashboard,@profile,@public,@snippets),
-    ]
-    run_commands(cmds)
+    run_spinach_tests('@admin,@dashboard,@profile,@public,@snippets')
+  end
+
+  desc "GitLab | Spinach | Run other spinach features"
+  task :builds do
+    run_spinach_tests('@builds')
   end
 end
 
 desc "GitLab | Run spinach"
 task :spinach do
-  cmds = [
-    %W(rake gitlab:setup),
-    %W(spinach),
-  ]
-  run_commands(cmds)
+  run_spinach_tests(nil)
+end
+
+def run_command(cmd)
+  system({'RAILS_ENV' => 'test', 'force' => 'yes'}, *cmd)
 end
 
-def run_commands(cmds)
-  cmds.each do |cmd|
-    system({'RAILS_ENV' => 'test', 'force' => 'yes'}, *cmd) or raise("#{cmd} failed!")
+def run_spinach_command(args)
+  run_command(%w(spinach -r rerun) + args)
+end
+
+def run_spinach_tests(tags)
+  #run_command(%w(rake gitlab:setup)) or raise('gitlab:setup failed!')
+
+  success = run_spinach_command(%W(--tags #{tags}))
+  3.times do |_|
+    break if success
+    break unless File.exists?('tmp/spinach-rerun.txt')
+
+    tests = File.foreach('tmp/spinach-rerun.txt').map(&:chomp)
+    puts ''
+    puts "Spinach tests for #{tags}: Retrying tests... #{tests}".red
+    puts ''
+    sleep(3)
+    success = run_spinach_command(tests)
   end
+
+  raise("spinach tests for #{tags} failed!") unless success
 end

scripts/prepare_build.sh

 #!/bin/bash
 
+retry() {
+    for i in $(seq 1 3); do
+        if eval "$@"; then
+            return 0
+        fi
+        sleep 3s
+        echo "Retrying..."
+    done
+    return 1
+}
+
 if [ -f /.dockerinit ]; then
     mkdir -p vendor
-    if [ ! -e vendor/phantomjs_1.9.8-0jessie_amd64.deb ]; then
+
+    # Install phantomjs package
+    pushd vendor
+    if [ ! -e phantomjs_1.9.8-0jessie_amd64.deb ]; then
         wget -q https://gitlab.com/axil/phantomjs-debian/raw/master/phantomjs_1.9.8-0jessie_amd64.deb
-        mv phantomjs_1.9.8-0jessie_amd64.deb vendor/
     fi
-    dpkg -i vendor/phantomjs_1.9.8-0jessie_amd64.deb
+    dpkg -i phantomjs_1.9.8-0jessie_amd64.deb
+    popd
 
-    apt-get update -qq
-    apt-get -o dir::cache::archives="vendor/apt" install -y -qq --force-yes \
-        libicu-dev libkrb5-dev cmake nodejs postgresql-client mysql-client unzip
+    # Try to install packages
+    retry 'apt-get update -yqqq; apt-get -o dir::cache::archives="vendor/apt" install -y -qq --force-yes \
+      libicu-dev libkrb5-dev cmake nodejs postgresql-client mysql-client unzip'
 
     cp config/database.yml.mysql config/database.yml
     sed -i 's/username:.*/username: root/g' config/database.yml
@@ -20,7 +34,7 @@ if [ -f /.dockerinit ]; then
     cp config/resque.yml.example config/resque.yml
     sed -i 's/localhost/redis/g' config/resque.yml
 
-    export FLAGS=(--path vendor)
+    export FLAGS=(--path vendor --retry 3)
 else
     export PATH=$HOME/bin:/usr/local/bin:/usr/bin:/bin
     cp config/database.yml.mysql config/database.yml

spec/controllers/projects/forks_controller_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Projects::ForksController do
   let(:user) { create(:user) }
-  let(:project) { create(:project, visibility_level: Project::PUBLIC) }
+  let(:project) { create(:project, :public) }
   let(:forked_project) { Projects::ForkService.new(project, user).execute }
   let(:group) { create(:group, owner: forked_project.creator) }
 

spec/factories/personal_snippets.rb

 FactoryGirl.define do
   factory :personal_snippet, parent: :snippet, class: :PersonalSnippet do
-    trait :public do
-      visibility_level PersonalSnippet::PUBLIC
-    end
-
-    trait :internal do
-      visibility_level PersonalSnippet::INTERNAL
-    end
-
-    trait :private do
-      visibility_level PersonalSnippet::PRIVATE
-    end
   end
 end

spec/factories/project_snippets.rb

 FactoryGirl.define do
-  factory :project_snippet do
+  factory :project_snippet, parent: :snippet, class: :ProjectSnippet do
     project
-    author
-    title
-    content
-    file_name
   end
 end

spec/factories/snippets.rb

@@ -12,5 +12,17 @@ FactoryGirl.define do
     title
     content
     file_name
+
+    trait :public do
+      visibility_level Snippet::PUBLIC
+    end
+
+    trait :internal do
+      visibility_level Snippet::INTERNAL
+    end
+
+    trait :private do
+      visibility_level Snippet::PRIVATE
+    end
   end
 end

spec/finders/snippets_finder_spec.rb

@@ -5,15 +5,14 @@ describe SnippetsFinder do
   let(:user1) { create :user }
   let(:group) { create :group }
 
-  let(:project1) { create(:empty_project, :public,   group: group) }
-  let(:project2) { create(:empty_project, :private,  group: group) }
-  
+  let(:project1) { create(:empty_project, :public,  group: group) }
+  let(:project2) { create(:empty_project, :private, group: group) }
 
   context ':all filter' do
     before do
-      @snippet1 = create(:personal_snippet, visibility_level: Snippet::PRIVATE)
-      @snippet2 = create(:personal_snippet, visibility_level: Snippet::INTERNAL)
-      @snippet3 = create(:personal_snippet, visibility_level: Snippet::PUBLIC)
+      @snippet1 = create(:personal_snippet, :private)
+      @snippet2 = create(:personal_snippet, :internal)
+      @snippet3 = create(:personal_snippet, :public)
     end
 
     it "returns all private and internal snippets" do
@@ -31,9 +30,9 @@ describe SnippetsFinder do
 
   context ':by_user filter' do
     before do
-      @snippet1 = create(:personal_snippet, visibility_level: Snippet::PRIVATE, author: user)
-      @snippet2 = create(:personal_snippet, visibility_level: Snippet::INTERNAL, author: user)
-      @snippet3 = create(:personal_snippet, visibility_level: Snippet::PUBLIC, author: user)
+      @snippet1 = create(:personal_snippet, :private,  author: user)
+      @snippet2 = create(:personal_snippet, :internal, author: user)
+      @snippet3 = create(:personal_snippet, :public,   author: user)
     end
 
     it "returns all public and internal snippets" do
@@ -75,9 +74,9 @@ describe SnippetsFinder do
 
   context 'by_project filter' do
     before do
-      @snippet1 = create(:project_snippet, visibility_level: Snippet::PRIVATE, project: project1)
-      @snippet2 = create(:project_snippet, visibility_level: Snippet::INTERNAL, project: project1)
-      @snippet3 = create(:project_snippet, visibility_level: Snippet::PUBLIC, project: project1)
+      @snippet1 = create(:project_snippet, :private,  project: project1)
+      @snippet2 = create(:project_snippet, :internal, project: project1)
+      @snippet3 = create(:project_snippet, :public,   project: project1)
     end
 
     it "returns public snippets for unauthorized user" do
@@ -93,7 +92,7 @@ describe SnippetsFinder do
     end
 
     it "returns all snippets for project members" do
-      project1.team << [user, :developer] 
+      project1.team << [user, :developer]
       snippets = SnippetsFinder.new.execute(user, filter: :by_project, project: project1)
       expect(snippets).to include(@snippet1, @snippet2, @snippet3)
     end

spec/helpers/visibility_level_helper_spec.rb

@@ -58,7 +58,7 @@ describe VisibilityLevelHelper do
 
   describe "skip_level?" do
     describe "forks" do
-      let(:project) { create(:project, visibility_level: Gitlab::VisibilityLevel::INTERNAL) }
+      let(:project) { create(:project, :internal) }
       let(:fork_project) { create(:forked_project_with_submodules) }
 
       before do
@@ -74,7 +74,7 @@ describe VisibilityLevelHelper do
     end
 
     describe "non-forked project" do
-      let(:project) { create(:project, visibility_level: Gitlab::VisibilityLevel::INTERNAL) }
+      let(:project) { create(:project, :internal) }
 
       it "skips levels" do
         expect(skip_level?(project, Gitlab::VisibilityLevel::PUBLIC)).to be_falsey
@@ -84,7 +84,7 @@ describe VisibilityLevelHelper do
     end
 
     describe "Snippet" do
-      let(:snippet) { create(:snippet, visibility_level: Gitlab::VisibilityLevel::INTERNAL) }
+      let(:snippet) { create(:snippet, :internal) }
 
       it "skips levels" do
         expect(skip_level?(snippet, Gitlab::VisibilityLevel::PUBLIC)).to be_falsey

spec/lib/gitlab/bitbucket_import/importer_spec.rb

+require 'spec_helper'
+
+describe Gitlab::BitbucketImport::Importer, lib: true do
+  before do
+    Gitlab.config.omniauth.providers << OpenStruct.new(app_id: "asd123", app_secret: "asd123", name: "bitbucket")
+  end
+
+  let(:statuses) do
+    [
+      "open",
+      "resolved",
+      "on hold",
+      "invalid",
+      "duplicate",
+      "wontfix",
+      "closed"  # undocumented status
+    ]
+  end
+  let(:sample_issues_statuses) do
+    issues = []
+
+    statuses.map.with_index do |status, index|
+      issues << {
+        local_id: index,
+        status: status,
+        title: "Issue #{index}",
+        content: "Some content to issue #{index}"
+      }
+    end
+
+    issues
+  end
+
+  let(:project_identifier) { 'namespace/repo' }
+  let(:data) do
+    {
+      bb_session: {
+        bitbucket_access_token: "123456",
+        bitbucket_access_token_secret: "secret"
+      }
+    }
+  end
+  let(:project) do
+    create(
+      :project,
+      import_source: project_identifier,
+      import_data: ProjectImportData.new(data: data)
+    )
+  end
+  let(:importer) { Gitlab::BitbucketImport::Importer.new(project) }
+  let(:issues_statuses_sample_data) do
+    {
+      count: sample_issues_statuses.count,
+      issues: sample_issues_statuses
+    }
+  end
+
+  context 'issues statuses' do
+    before do
+      stub_request(
+        :get,
+        "https://bitbucket.org/api/1.0/repositories/#{project_identifier}"
+      ).to_return(status: 200, body: { has_issues: true }.to_json)
+
+      stub_request(
+        :get,
+        "https://bitbucket.org/api/1.0/repositories/#{project_identifier}/issues?limit=50&sort=utc_created_on&start=0"
+      ).to_return(status: 200, body: issues_statuses_sample_data.to_json)
+
+      sample_issues_statuses.each_with_index do |issue, index|
+        stub_request(
+          :get,
+          "https://bitbucket.org/api/1.0/repositories/#{project_identifier}/issues/#{issue[:local_id]}/comments"
+        ).to_return(
+          status: 200,
+          body: [{ author_info: { username: "username" }, utc_created_on: index }].to_json
+        )
+      end
+    end
+
+    it 'map statuses to open or closed' do
+      importer.execute
+
+      expect(project.issues.where(state: "closed").size).to eq(5)
+      expect(project.issues.where(state: "opened").size).to eq(2)
+    end
+  end
+end

spec/models/project_snippet_spec.rb

@@ -10,7 +10,6 @@
 #  created_at       :datetime
 #  updated_at       :datetime
 #  file_name        :string(255)
-#  expires_at       :datetime
 #  type             :string(255)
 #  visibility_level :integer          default(0), not null
 #

spec/models/project_spec.rb

@@ -69,6 +69,7 @@ describe Project, models: true do
     it { is_expected.to have_many(:variables) }
     it { is_expected.to have_many(:triggers) }
     it { is_expected.to have_many(:pages_domains) }
+    it { is_expected.to have_many(:todos).dependent(:destroy) }
   end
 
   describe 'modules' do
@@ -600,7 +601,7 @@ describe Project, models: true do
   end
 
   describe '#visibility_level_allowed?' do
-    let(:project) { create :project, visibility_level: Gitlab::VisibilityLevel::INTERNAL }
+    let(:project) { create(:project, :internal) }
 
     context 'when checking on non-forked project' do
       it { expect(project.visibility_level_allowed?(Gitlab::VisibilityLevel::PRIVATE)).to be_truthy }

spec/models/snippet_spec.rb

@@ -10,7 +10,6 @@
 #  created_at       :datetime
 #  updated_at       :datetime
 #  file_name        :string(255)
-#  expires_at       :datetime
 #  type             :string(255)
 #  visibility_level :integer          default(0), not null
 #

spec/services/git_push_service_spec.rb

@@ -287,22 +287,24 @@ describe GitPushService, services: true do
 
       allow(project.repository).to receive(:commits_between).
         and_return([closing_commit])
+
+      project.team << [commit_author, :master]
     end
 
     context "to default branches" do
       it "closes issues" do
-        execute_service(project, user, @oldrev, @newrev, @ref )
+        execute_service(project, commit_author, @oldrev, @newrev, @ref )
         expect(Issue.find(issue.id)).to be_closed
       end
 
       it "adds a note indicating that the issue is now closed" do
         expect(SystemNoteService).to receive(:change_status).with(issue, project, commit_author, "closed", closing_commit)
-        execute_service(project, user, @oldrev, @newrev, @ref )
+        execute_service(project, commit_author, @oldrev, @newrev, @ref )
       end
 
       it "doesn't create additional cross-reference notes" do
         expect(SystemNoteService).not_to receive(:cross_reference)
-        execute_service(project, user, @oldrev, @newrev, @ref )
+        execute_service(project, commit_author, @oldrev, @newrev, @ref )
       end
 
       it "doesn't close issues when external issue tracker is in use" do
@@ -310,7 +312,7 @@ describe GitPushService, services: true do
 
         # The push still shouldn't create cross-reference notes.
         expect do
-          execute_service(project, user, @oldrev, @newrev,  'refs/heads/hurf' )
+          execute_service(project, commit_author, @oldrev, @newrev,  'refs/heads/hurf' )
         end.not_to change { Note.where(project_id: project.id, system: true).count }
       end
     end
@@ -332,7 +334,6 @@ describe GitPushService, services: true do
       end
     end
 
-    # EE-only tests
     context "for jira issue tracker" do
       include JiraServiceHelper
 
@@ -382,7 +383,7 @@ describe GitPushService, services: true do
             }
           }.to_json
 
-          execute_service(project, user, @oldrev, @newrev, @ref )
+          execute_service(project, commit_author, @oldrev, @newrev, @ref )
           expect(WebMock).to have_requested(:post, jira_api_transition_url).with(
             body: transition_body
           ).once
@@ -393,7 +394,7 @@ describe GitPushService, services: true do
             body: "Issue solved with [#{closing_commit.id}|http://localhost/#{project.path_with_namespace}/commit/#{closing_commit.id}]."
           }.to_json
 
-          execute_service(project, user, @oldrev, @newrev, @ref )
+          execute_service(project, commit_author, @oldrev, @newrev, @ref )
           expect(WebMock).to have_requested(:post, jira_api_comment_url).with(
             body: comment_body
           ).once

spec/services/projects/update_service_spec.rb

@@ -102,8 +102,8 @@ describe Projects::UpdateService, services: true do
 
   describe :visibility_level do
     let(:user) { create :user, admin: true }
-    let(:project) { create :project, visibility_level: Gitlab::VisibilityLevel::INTERNAL }
-    let(:forked_project) { create :forked_project_with_submodules, visibility_level: Gitlab::VisibilityLevel::INTERNAL }
+    let(:project) { create(:project, :internal) }
+    let(:forked_project) { create(:forked_project_with_submodules, :internal) }
     let(:opts) { {} }
 
     before do

spec/spec_helper.rb

@@ -15,6 +15,7 @@ require 'rspec/rails'
 require 'shoulda/matchers'
 require 'sidekiq/testing/inline'
 require 'benchmark/ips'
+require 'rspec/retry'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
@@ -25,6 +26,9 @@ RSpec.configure do |config|
   config.use_instantiated_fixtures  = false
   config.mock_with :rspec
 
+  config.verbose_retry = true
+  config.display_try_failure_messages = true
+
   config.include Devise::TestHelpers, type: :controller
   config.include LoginHelpers,        type: :feature
   config.include LoginHelpers,        type: :request