delta/gitlab/gitlab-ce.git/spec/spec_helper.rb, branch grapify-commit-statuses-api

Revert "Merge branch 'tests-use-tmpfs' into 'master'"

2016-10-12T14:45:26+00:00

This reverts merge request !6730

Try tmpfs for repository storage, etc

2016-10-06T16:42:56+00:00

Upgrade Devise from 4.1.1 to 4.2.0.

2016-09-28T02:08:49+00:00

This fixes an issue with Rails 5 and brings us up-to-date with the latest Devise release.

This also replaces the deprecated Devise::TestHelpers with Devise::Test::ControllerHelpers.

Changelog: https://github.com/plataformatec/devise/blob/v4.2.0/CHANGELOG.md#420---2016-07-01

Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-build-name

2016-08-24T12:56:30+00:00

* upstream/master: (192 commits)
  Added CHANGELOG
  Added unfold test to parallel and added 'diff discussion' context
  Fix Spinach branches spec
  Better first match on this MR also
  Change merge_error column from string to text type
  Fix typo in gitlab_flow.md
  entities: make Environment inherit EnvironmentBasic
  Updated to optimized specs from !5864
  Added 'with an unfolded line should not allow commenting' scenario (line 125)
  Added addtional 'renderable' validator to check 'data-note-type' attr exists
  Allow passing an index to selectRowAtIndex
  Fixed enter key in search input not working
  Fix file links on project page Files view
  Fix incorrect "stopped impersonation" log message
  8.11 is released, long live 8.12
  Also check if Akismet is enabled, before showing the `Submit as spam` button.
  fix location of markdown help location
  Fix for update 8.10-to-8.11.md doc.
  Appease the linter.
  Add Ruby 2.3 upgrade notes.
  ...

Use travel_to instead of dependency injection, feedback:

2016-08-19T08:57:25+00:00

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5734#note_14056642

Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-build-name

2016-08-10T09:48:46+00:00

* upstream/master: (516 commits)
  Rename `run` task helper method to prevent conflict with StateMachine
  Add a method in Project to return a cached value of total count of projects
  Add Changelog entry for Grape upgrade [ci skip]
  Fix Grape tests.
  Retain old behavior
  Update Grape from 0.13.0 to 0.15.0.
  adds second batch of tests changed to active tense
  fixes part1 of files to start using active tense
  Clarify the features for generating default label sets
  Update tree view to sort folders with submodules
  Memoize CI config node validator to prevent leaks
  fix MR source project assignment
  remove offending empty line
  Rails prefers require_dependency so that it won't require twice:
  use Unix line endings for API documentation
  use long options for curl examples in API documentation (!5703)
  Prefixes removed branches name with PR number when importing PR from GH
  Update CHANGELOG
  Remove SHA suffix for removed branches name when importing PR from GH
  add linting script for documentation
  ...

Add a method in Project to return a cached value of total count of projects

2016-08-09T23:08:03+00:00

This is in preparation to address the DB load caused by the counting in
gitlab-com/infrastructure#303.

Introduce SimpleCovEnv singleton helper and use it

2016-07-21T10:46:49+00:00

Update configuration of SimpleCov

2016-07-21T10:44:24+00:00

Store all simplecov configuration in one file

2016-07-21T10:44:24+00:00