Automatic merge of gitlab-org/gitlab-ce master

spec/requests/api/applications_spec.rb

 require 'spec_helper'
 
 describe API::Applications, :api do
-  include ApiHelpers
-
   let(:admin_user) { create(:user, admin: true) }
   let(:user) { create(:user, admin: false) }
   let!(:application) { create(:application, name: 'another_application', redirect_uri: 'http://other_application.url', scopes: '') }

spec/requests/api/events_spec.rb

 require 'spec_helper'
 
 describe API::Events do
-  include ApiHelpers
-
   let(:user) { create(:user) }
   let(:non_member) { create(:user) }
   let(:private_project) { create(:project, :private, creator_id: user.id, namespace: user.namespace) }

spec/requests/api/import_github_spec.rb

 require 'spec_helper'
 
 describe API::ImportGithub do
-  include ApiHelpers
-
   let(:token) { "asdasd12345" }
   let(:provider) { :github }
   let(:access_params) { { github_access_token: token } }

spec/requests/api/project_events_spec.rb

 require 'spec_helper'
 
 describe API::ProjectEvents do
-  include ApiHelpers
-
   let(:user) { create(:user) }
   let(:non_member) { create(:user) }
   let(:private_project) { create(:project, :private, creator_id: user.id, namespace: user.namespace) }