James Lopez 3929972d90 Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental ...

# Conflicts:
#	app/controllers/import/gitlab_project_controller.rb

2016-05-03 13:14:31 +02:00

..

badges

Add feature specs for list of badges page

2016-04-06 19:56:34 +02:00

commit

Fix error on commit builds page when no builds yet

2016-04-25 17:19:57 +02:00

commits

Move cherry-pick feature specs to proper directory

2016-04-22 13:34:03 +02:00

files

Fix specs

2016-04-18 14:47:50 +02:00

import_export

fixed integration test

2016-05-02 11:58:35 +02:00

members

Use the can? helper instead of current_user.can?

2016-04-22 15:48:58 +02:00

wiki

Simplify specs by not over-expecting

2016-05-02 18:34:14 +02:00