Douwe Maan 5f7a3e1bbd Merge branch 'master' into extend_markdown_upload ... # Conflicts: # app/controllers/files_controller.rb		2015-02-25 11:59:25 +01:00
..
admin	Upgrade to Rails 4.1.9	2015-02-14 11:09:23 -07:00
dashboard	Merge branch 'master' into rails-4.1.9	2015-02-19 20:53:05 -07:00
explore	Upgrade to Rails 4.1.9	2015-02-14 11:09:23 -07:00
profile	Split up AttachmentUploader.	2015-02-20 15:19:50 +01:00
project	Merge branch 'master' into extend_markdown_upload	2015-02-25 11:59:25 +01:00
shared	Improve sidebar menu for project settings	2015-02-23 18:43:39 -08:00
snippets	Fix raw view for public snippets	2014-10-27 11:51:31 +02:00
groups.rb	Merge branch 'master' into extend_markdown_upload	2015-02-24 14:54:39 +01:00
search.rb	Fixes the search test that fails whenever faker uses a name with Bar in it. Limit check to being within the search results div.	2014-12-08 16:44:06 -08:00
snippet_search.rb	Replace old spinach step definitions with step.	2014-09-22 10:01:50 +02:00
user.rb	Remove unnecessary page. from tests.	2014-09-26 09:51:17 +02:00