James Edwards-Jones b988faaf85 Merge branch 'master' into 'jej-pages-to-ce' ... # Conflicts: # db/schema.rb		2017-02-06 15:12:27 +00:00
..
dashboard	Move Dashboard shortcuts specs from Spinah to RSpec	2017-01-31 11:05:50 +01:00
explore	Show member roles to all users on members page	2016-08-11 11:08:07 -05:00
group	Remove repository trait from factories that don't need it in features	2017-01-17 16:02:09 -05:00
profile	Add the :repository trait to :project factories in Cucumber steps	2017-01-17 16:02:08 -05:00
project	Merge branch 'master' into 'jej-pages-to-ce'	2017-02-06 15:12:27 +00:00
shared	Merge branch 'master' into jej-pages-picked-from-ee	2017-02-03 17:25:26 +00:00
snippets	Move 'Explore Snippets' Spinach feature to Rspec	2016-11-08 06:37:02 +00:00
groups.rb	Remove repository trait from factories that don't need it in features	2017-01-17 16:02:09 -05: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
user.rb	Remove repository trait from factories that don't need it in features	2017-01-17 16:02:09 -05:00