Dmitriy Zaporozhets f9ece12e87 Merge branch 'master' into oauth2_provider ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/views/layouts/nav/_profile.html.haml		2014-12-25 18:48:15 +02:00
..
admin	Add tests for remove group member feature in admin area	2014-10-20 13:18:07 +03:00
dashboard	Make Spinach test names consistent	2014-10-05 18:21:11 +02:00
explore	Fix spinach tests	2014-12-24 14:34:37 +02:00
profile	Fix tests and add message if no oauth apps	2014-12-25 18:46:19 +02:00
project	Merge branch 'upstream-master' into markdown-preview	2014-12-07 20:25:58 -07:00
snippets	Fix raw view for public snippets	2014-10-27 11:51:31 +02:00
steps	Merge branch 'master' into oauth2_provider	2014-12-25 18:48:15 +02:00
support	Try wear_merged! without argument	2014-10-01 11:43:16 +03:00
groups.feature	Make Spinach test names consistent	2014-10-05 18:21:11 +02:00
search.feature	Save search options when switch between filter	2014-08-27 11:55:42 +03:00
snippet_search.feature	Updating to persist a params snippets variable	2014-09-05 13:30:55 -04:00
user.feature	Fix tests for user page	2014-06-02 13:43:07 +03:00