Dmitriy Zaporozhets c02d891cb5 Merge branch 'master' into new-emoji ...

Conflicts:
	Gemfile.lock

2015-03-11 18:02:37 -07:00

..

assets

Merge branch 'fix-code-preview' into 'master'

2015-03-11 18:41:36 +00:00

controllers

Merge branch 'master' into new-emoji

2015-03-11 18:02:37 -07:00

finders

Merge pull request #8092 from cirosantilli/factor-finder-perms

2015-03-02 15:24:59 -08:00

helpers

Merge branch 'fix-code-preview' into 'master'

2015-03-11 18:41:36 +00:00

mailers

Merge branch 'master' into 'master'

2015-03-11 05:41:58 +00:00

models

Remove placeholder methods to prevent calling methods rather than attributes.

2015-03-10 18:09:13 -07:00

services

Merge branch 'generate-valid-json' into 'master'

2015-03-11 16:53:10 +00:00

uploaders

Fix URL to uploaded file.

2015-02-20 16:01:37 +01:00

views

Merge branch 'dashboard-restyle' into 'master'

2015-03-11 16:56:01 +00:00

workers

Use Gitlab::Git helper methods and constants as much as possible.

2015-03-10 13:39:31 +01:00