Jan-Gerd Tenberge b5c19bcc4d Fix merge error

2015-10-22 21:43:17 +02:00

..

assets

Merge branch 'readme-extra-padding' into 'master'

2015-10-22 17:08:04 +00:00

controllers

Merge branch 'hanloong/gitlab-ce-add-dates-snippets-show' into 'master'

2015-10-22 13:34:34 +00:00

finders

Rename confusing methods

2015-10-19 11:46:22 +02:00

helpers

Fix merge error

2015-10-22 21:43:17 +02:00

mailers

Only pass abuse report ID to AbuseReportMailer.

2015-10-18 11:58:45 +02:00

models

Fix merge error

2015-10-22 21:43:17 +02:00

services

Fix merge error

2015-10-22 21:43:17 +02:00

uploaders

Fix: Images cannot show when projects' path was changed

2015-10-14 18:50:35 +03:00

views

Merge branch 'cleanup-css' into 'master'

2015-10-22 16:20:43 +00:00

workers

Remove unused sidekiq worker

2015-10-20 17:11:31 +02:00