09 Dec, 2013
1 commit
20 Nov, 2013
2 commits
12 Nov, 2013
1 commit
21 Aug, 2013
1 commit
16 Jul, 2013
2 commits
-
…into merge-requests/343 Also replacing the load_comments method by a filter that receives a scope. Conflicts: app/controllers/public/content_viewer_controller.rb app/models/comment.rb app/views/content_viewer/view_page.rhtml test/functional/content_viewer_controller_test.rb test/unit/comment_test.rb
15 Jul, 2013
5 commits
13 Jul, 2013
3 commits
-
Also renaming dispatch_plugins to fetch_plugins and first_plugin to fetch_first_plugin
-
…into merge-requests/283 Conflicts: test/unit/comment_test.rb
12 Jul, 2013
15 commits
-
Removing obsolete FIXME's, trailing whitespaces and so.
-
Also a small logic fix.
-
…into merge-requests/282
11 Jul, 2013
8 commits
-
…into merge-requests/331
-
…into merge-requests/301
-
The first one should not test the redirect since it's not its concerns. The second one wasn't test if there was a confirmation at all.
-
…into merge-requests/291
-
…into merge-requests/287 Conflicts: app/models/environment.rb
-
…into merge-requests/285
08 Jul, 2013
2 commits