Gemfile fix

Created by: jvanbaarsen

ping @randx

Created by: dzaporozhets

@jvanbaarsen thanks

By Administrator on 2014-06-05T19:24:21 (imported from GitLab project)

By Administrator on 2014-06-05T19:24:21 (imported from GitLab)

Created by: dzaporozhets

@jvanbaarsen ok it still bad:

rake test
....
== Seed from /Users/dzaporozhets/Projects/gitlabhq/db/fixtures/test/001_repo.rb
Unpacking seed repository... done.
Creating seed satellite... done.
MiniTest::Unit::TestCase is now Minitest::Test. From /Users/dzaporozhets/.rvm/rubies/ruby-2.1.1/lib/ruby/2.1.0/test/unit/testcase.rb:8:in `<module:Unit>'
Instance method "lock!" is already defined in ActiveRecord::Base, use generic helper instead or set StateMachine::Machine.ignore_method_conflicts = true.
Coverage report generated for RSpec to /Users/dzaporozhets/Projects/gitlabhq/coverage. 1679 / 3927 LOC (42.76%) covered.
/Users/dzaporozhets/.rvm/gems/ruby-2.1.1/gems/activesupport-4.1.1/lib/active_support/dependencies.rb:247:in `require': cannot load such file -- rspec (LoadError)
    from /Users/dzaporozhets/.rvm/gems/ruby-2.1.1/gems/activesupport-4.1.1/lib/active_support/dependencies.rb:247:in `block in require'
    from /Users/dzaporozhets/.rvm/gems/ruby-2.1.1/gems/activesupport-4.1.1/lib/active_support/dependencies.rb:232:in `load_dependency'
    from /Users/dzaporozhets/.rvm/gems/ruby-2.1.1/gems/activesupport-4.1.1/lib/active_support/dependencies.rb:247:in `require'
    from /Users/dzaporozhets/Projects/gitlabhq/features/support/env.rb:11:in `<top (required)>'
    from /Users/dzaporozhets/.rvm/gems/ruby-2.1.1/gems/spinach-0.8.7/lib/spinach/runner.rb:92:in `require'
    from /Users/dzaporozhets/.rvm/gems/ruby-2.1.1/gems/spinach-0.8.7/lib/spinach/runner.rb:92:in `block in require_dependencies'
    from /Users/dzaporozhets/.rvm/gems/ruby-2.1.1/gems/spinach-0.8.7/lib/spinach/runner.rb:91:in `each'
    from /Users/dzaporozhets/.rvm/gems/ruby-2.1.1/gems/spinach-0.8.7/lib/spinach/runner.rb:91:in `require_dependencies'
    from /Users/dzaporozhets/.rvm/gems/ruby-2.1.1/gems/spinach-0.8.7/lib/spinach/runner.rb:64:in `run'
    from /Users/dzaporozhets/.rvm/gems/ruby-2.1.1/gems/spinach-0.8.7/lib/spinach/cli.rb:27:in `run'
    from /Users/dzaporozhets/.rvm/gems/ruby-2.1.1/gems/spinach-0.8.7/bin/spinach:15:in `<top (required)>'
    from /Users/dzaporozhets/.rvm/gems/ruby-2.1.1/bin/spinach:23:in `load'
    from /Users/dzaporozhets/.rvm/gems/ruby-2.1.1/bin/spinach:23:in `<main>'
    from /Users/dzaporozhets/.rvm/gems/ruby-2.1.1/bin/ruby_executable_hooks:15:in `eval'
    from /Users/dzaporozhets/.rvm/gems/ruby-2.1.1/bin/ruby_executable_hooks:15:in `<main>'
MiniTest::Unit::TestCase is now Minitest::Test. From /Users/dzaporozhets/.rvm/rubies/ruby-2.1.1/lib/ruby/2.1.0/test/unit/testcase.rb:8:in `<module:Unit>'

By Administrator on 2014-06-06T05:57:50 (imported from GitLab project)

By Administrator on 2014-06-06T05:57:50 (imported from GitLab)

Created by: dzaporozhets

@jvanbaarsen I revert 2 commits unless you give a real working solution

By Administrator on 2014-06-06T05:58:18 (imported from GitLab project)

By Administrator on 2014-06-06T05:58:18 (imported from GitLab)

Created by: jvanbaarsen

@randx Ok, the problem at this point is, is that the rspec tests arent beeing executed as it seems. Ill provide a fix for that asap. Im terrible sorry for this screwup!

By Administrator on 2014-06-06T06:22:36 (imported from GitLab project)

By Administrator on 2014-06-06T06:22:36 (imported from GitLab)

Created by: jvanbaarsen

@randx see https://github.com/gitlabhq/gitlabhq/pull/7092

By Administrator on 2014-06-06T06:26:39 (imported from GitLab project)

By Administrator on 2014-06-06T06:26:39 (imported from GitLab)