Vinnie Okada 5a8d8b6f20 Merge branch 'master' into rails-4.1.9 ...

Conflicts:
	app/views/dashboard/projects.html.haml

2015-02-22 07:55:30 -07:00

..

_discussion.html.haml

Merge branch 'master' into rails-4.1.9

2015-02-22 07:55:30 -07:00

_form.html.haml

Upgrade to Rails 4.1.9

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

_issue_context.html.haml

Merge branch 'master' into rails-4.1.9

2015-02-21 12:55:28 -07:00

_issue.html.haml

Merge branch 'master' into rails-4.1.9

2015-02-21 12:55:28 -07:00

_issues.html.haml

Restlye issueable filters to be more compact

2015-02-19 15:47:10 -08:00

edit.html.haml

Move projects controllers/views in Projects module

2013-06-23 19:47:22 +03:00

index.atom.builder

Upgrade to Rails 4.1.9

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

index.html.haml

Update path helper references

2015-02-19 21:25:28 -07:00

new.html.haml

Move projects controllers/views in Projects module

2013-06-23 19:47:22 +03:00

show.html.haml

Merge branch 'master' into rails-4.1.9

2015-02-21 12:55:28 -07:00

update.js.haml

Upgrade to Rails 4.1.9

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