Douwe Maan 5a8f727fd5 Merge branch 'master' into faster-diffs ... # Conflicts: # app/helpers/notes_helper.rb # app/views/projects/diffs/_line.html.haml # app/views/projects/diffs/_parallel_view.html.haml # app/views/projects/diffs/_text_file.html.haml # features/steps/shared/diff_note.rb		2016-07-07 18:05:34 -04:00
..
admin	Layout for Users Groups and Projects on admin area	2016-07-07 13:25:58 -05:00
dashboard	Make GH one-off auth the default again for importing GH projects	2016-06-30 18:48:17 +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	Diffs will create button/diff form on demand no on server side	2016-07-06 08:29:57 +02:00
snippets	fix spinach features to use new button wordings	2015-10-15 17:59:17 +11:00
steps	Merge branch 'master' into faster-diffs	2016-07-07 18:05:34 -04:00
support	Remove coveralls lines	2016-06-30 19:52:36 +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 logout tests	2016-06-28 13:17:29 +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