James Lopez e83fc684a5 Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental ...

# Conflicts:
#	Gemfile.lock
#	app/helpers/todos_helper.rb
#	app/models/todo.rb
#	app/views/projects/edit.html.haml
#	lib/gitlab/import_export/import_service.rb

2016-06-13 14:00:19 +02:00

..

admin

Enable RSpec/NotToNot cop and auto-correct offenses

2016-05-24 15:40:29 -04:00

dashboard

Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental

2016-06-13 14:00:19 +02:00

explore

fix failing tests

2016-02-23 08:42:29 +00:00

group

Remove go to dashboard test suite for group page and get rid of AR warning

2016-05-03 13:04:47 +02:00

profile

Fix profile test

2016-06-10 12:01:51 -05:00

project

Render only issues/mr in subnav depends on context

2016-06-10 19:15:23 +03:00

shared

Render only issues/mr in subnav depends on context

2016-06-10 19:15:23 +03:00

snippets

Updated snippets tests

2016-05-19 10:01:27 +01:00

abuse_reports.rb

Partly implement new UI for user page

2015-10-16 13:24:28 +02:00

groups.rb

Remove go to dashboard test suite for group page and get rid of AR warning

2016-05-03 13:04:47 +02:00

invites.rb

Fix spec

2015-09-09 09:28:09 +01:00

search.rb

Fixed tests

2016-04-26 09:03:04 +01:00

snippet_search.rb

Update all should-style syntax to expect in features

2015-06-12 05:12:09 -04:00

user.rb

tests update

2016-05-16 12:22:17 +01:00