• Dmitriy Zaporozhets's avatar
    Merge branch 'master' into rubocop-for-tests · f40b99d0
    Dmitriy Zaporozhets authored
    Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
    
    Conflicts:
    	spec/features/issues_spec.rb
    	spec/models/forked_project_link_spec.rb
    	spec/models/hooks/service_hook_spec.rb
    	spec/models/hooks/web_hook_spec.rb
    	spec/models/project_services/hipchat_service_spec.rb
    	spec/requests/api/project_members_spec.rb
    	spec/requests/api/projects_spec.rb
    	spec/requests/api/system_hooks_spec.rb
    	spec/services/archive_repository_service_spec.rb
    	spec/support/matchers.rb
    	spec/tasks/gitlab/backup_rake_spec.rb
    f40b99d0
gitlab_controller_spec.rb 4.51 KB