Marin Jankovski 0da59cb55b Merge branch 'master' into move_external_issue_tracker_away_from_yml_config ...

Conflicts:
	app/models/project.rb
	spec/models/project_spec.rb

2015-01-26 22:12:53 -08:00

..

assets

Merge branch 'master' into move_external_issue_tracker_away_from_yml_config

2015-01-26 22:12:53 -08:00

controllers

Merge branch 'master' into move_external_issue_tracker_away_from_yml_config

2015-01-26 22:12:53 -08:00

finders

Add author filter for issues & merge requests pages

2014-12-05 17:13:07 +02:00

helpers

Merge branch 'master' into move_external_issue_tracker_away_from_yml_config

2015-01-26 22:12:53 -08:00

mailers

Fix various typos

2015-01-18 10:29:37 -05:00

models

Merge branch 'master' into move_external_issue_tracker_away_from_yml_config

2015-01-26 22:12:53 -08:00

services

Files::CreateService can now commit file to empty repository

2015-01-26 13:31:24 -08:00

uploaders

Revert "Merge pull request #7349 from srna/patch-1"

2014-12-05 15:33:22 +01:00

views

Merge branch 'master' into move_external_issue_tracker_away_from_yml_config

2015-01-26 22:12:53 -08:00

workers

Merge branch 'github_importer'

2015-01-13 10:35:16 -08:00