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

Bring shared project feature tests from EE

2016-03-12 14:45:14 +01:00

dashboard

fix import feature v2

2016-05-05 11:02:22 +02:00

explore

Fix test

2016-03-04 19:27:02 +01:00

group

Updates from last code review.

2016-03-06 23:07:19 -05:00

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

fix spinach features to use new button wordings

2015-10-15 17:59:17 +11:00

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

Streamline the "Report button"

2015-09-29 21:47:01 +02:00

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

Add spinach tests around accepting and declining invitations.

2015-04-14 18:04:29 +02:00

search.feature

Fixed tests

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

snippet_search.feature

Updating to persist a params snippets variable

2014-09-05 13:30:55 -04:00

user.feature

Fix specs

2016-03-01 17:42:44 -05:00