Vinnie Okada 742e6eeed2 Merge branch 'upstream-master' into markdown-preview ...

Conflicts:
	spec/routing/project_routing_spec.rb

2014-12-07 20:25:58 -07:00

..

active_tab.rb

Remove unnecessary page. from tests.

2014-09-26 09:51:17 +02:00

admin.rb

…

authentication.rb

…

diff_note.rb

Fix test assertions

2014-10-21 23:29:31 -05:00

group.rb

…

issuable.rb

Refactor Markdown preview tests

2014-10-18 17:58:34 -05:00

markdown.rb

Fix test assertions

2014-10-21 23:29:31 -05:00

note.rb

Fix test assertions

2014-10-21 23:29:31 -05:00

paths.rb

Use :message key, not :error for File::Service.

2014-10-13 20:55:09 +02:00

project_tab.rb

…

project.rb

Improve project factories

2014-11-30 10:50:15 +02:00

search.rb

…

shortcuts.rb

…

snippet.rb

fix for public snippet

2014-10-24 11:52:52 +03:00

user.rb

…