gitlab-org--gitlab-foss/app/models
Vinnie Okada 9e9ce95d62 Merge branch 'master' into rails-4.1.9
Conflicts:
	app/views/dashboard/_project.html.haml
	app/views/events/event/_common.html.haml
	app/views/explore/projects/_project.html.haml
	app/views/groups/_projects.html.haml
	app/views/projects/_home_panel.html.haml
	app/views/projects/_issues_nav.html.haml
	app/views/projects/issues/_discussion.html.haml
	app/views/projects/issues/_issues.html.haml
	app/views/projects/issues/show.html.haml
	app/views/projects/merge_requests/_discussion.html.haml
	app/views/projects/merge_requests/_show.html.haml
	app/views/projects/milestones/index.html.haml
	app/views/projects/notes/_edit_form.html.haml
	app/views/shared/_issuable_filter.html.haml
2015-02-19 20:53:05 -07:00
..
concerns
hooks
members
network
project_services Upgrade to Rails 4.1.9 2015-02-14 11:09:23 -07:00
.gitkeep
ability.rb
application_setting.rb
broadcast_message.rb
commit.rb
deploy_key.rb
deploy_keys_project.rb
diff_line.rb
email.rb
event.rb Fix event loading with associations 2015-02-18 09:38:46 -08:00
external_issue.rb
forked_project_link.rb
group.rb Revert "Fix broken access control and refactor avatar upload" 2015-02-19 08:57:35 -08:00
group_milestone.rb
identity.rb
issue.rb
key.rb
label.rb
label_link.rb
member.rb
merge_request.rb
merge_request_diff.rb
milestone.rb
namespace.rb
note.rb
notification.rb
personal_snippet.rb
project.rb Revert "Fix broken access control and refactor avatar upload" 2015-02-19 08:57:35 -08:00
project_contributions.rb
project_snippet.rb
project_team.rb
project_wiki.rb
protected_branch.rb
repository.rb
service.rb
snippet.rb
tree.rb
user.rb Merge branch 'projects-limit-default' into 'master' 2015-02-19 20:48:49 +00:00
users_star_project.rb
wiki_page.rb