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
dashboard	fix import feature v2	2016-05-05 11:02:22 +02:00
explore
group
profile	Test changing notification settings per project fron notificaitons page	2016-03-30 10:44:20 +02:00
project	Render only issues/mr in subnav depends on context	2016-06-10 19:15:23 +03:00
snippets
steps	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
support	Enable Knapsack only in CI environment	2016-06-08 11:43:13 +02:00
abuse_report.feature
groups.feature	Remove go to dashboard test suite for group page and get rid of AR warning	2016-05-03 13:04:47 +02:00
invites.feature
search.feature	Fixed tests	2016-04-26 09:03:04 +01:00
snippet_search.feature
user.feature