Dmitriy Zaporozhets a52529f9b6 Merge branch 'bitbucket-import' ...

Conflicts:
	app/views/import/gitorious/status.html.haml
	db/schema.rb

2015-02-25 09:21:45 -08:00

..

assets

Merge branch 'bitbucket-import'

2015-02-25 09:21:45 -08:00

controllers

Merge branch 'bitbucket-import'

2015-02-25 09:21:45 -08:00

finders

Fix trending projects ordering

2015-02-18 22:23:24 -08:00

helpers

Merge branch 'bitbucket-import'

2015-02-25 09:21:45 -08:00

mailers

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

models

Merge branch 'bitbucket-import'

2015-02-25 09:21:45 -08:00

services

Web Editor: save to new branch

2015-02-24 11:43:20 +02:00

uploaders

Revert "Fix broken access control and refactor avatar upload"

2015-02-19 08:57:35 -08:00

views

Merge branch 'bitbucket-import'

2015-02-25 09:21:45 -08:00

workers

Delete deploy key from Bitbucket after importing.

2015-02-24 15:07:24 +01:00