Douwe Maan be1ae2d660 Merge branch 'rs-note-delegates-mentionable' ... # Conflicts: # app/models/note.rb		2016-03-07 09:38:16 +01:00
..
assets	Merge branch 'issue-sidebar-mobile' into 'master'	2016-03-05 11:48:21 +00:00
controllers	Merge branch 'rs-no-default-credentials' into 'master'	2016-03-04 23:48:56 +00:00
finders	…
helpers	Merge branch 'issue-sidebar-mobile' into 'master'	2016-03-05 11:48:21 +00:00
mailers	…
models	Merge branch 'rs-note-delegates-mentionable'	2016-03-07 09:38:16 +01:00
services	Use Gitlab::Git::DiffCollections	2016-03-03 18:38:44 +01:00
uploaders	…
validators	Allow webhooks URL to have leading and trailing spaces	2016-02-26 14:34:06 -05:00
views	Merge branch 'issue-sidebar-mobile' into 'master'	2016-03-05 11:48:21 +00:00
workers	Use Gitlab::Git::DiffCollections	2016-03-03 18:38:44 +01:00