Dmitriy Zaporozhets
|
f40b99d02e
|
Merge branch 'master' into rubocop-for-tests
Signed-off-by: Dmitriy 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
|
2015-06-23 10:44:03 +02:00 |
|
Stan Hu
|
359ed48638
|
Fix Style/AlignHash cop violations
|
2015-06-22 22:24:39 -07:00 |
|
Robert Speicher
|
bf71d53f63
|
Change to_not calls to not_to
Both work, but now we're consistent across the entire app.
|
2015-06-22 12:13:49 +02:00 |
|
Robert Speicher
|
bc027c5183
|
Load the Merge Request > Commits tab lazily
|
2015-06-17 16:59:51 -04:00 |
|
Robert Speicher
|
5c78d7fce8
|
Move Projects::MergeRequestsController spec to its correct location
|
2015-06-17 16:37:11 -04:00 |
|