Merge branch 'master' of github.com:gitlabhq/gitlabhq

Gemfile

Gemfile.lock

bin/rspec

features/steps/project/redirects.rb

features/support/env.rb

spec/controllers/application_controller_spec.rb

spec/controllers/blob_controller_spec.rb

spec/controllers/branches_controller_spec.rb

spec/controllers/commit_controller_spec.rb

spec/controllers/commits_controller_spec.rb

spec/controllers/import/github_controller_spec.rb

spec/controllers/import/gitlab_controller_spec.rb

spec/controllers/merge_requests_controller_spec.rb

spec/controllers/projects_controller_spec.rb

spec/controllers/tree_controller_spec.rb

spec/factories_spec.rb

spec/features/admin/admin_hooks_spec.rb

spec/features/admin/admin_projects_spec.rb

spec/features/admin/admin_users_spec.rb

spec/features/admin/security_spec.rb