Vinnie Okada 2a9eed6620 Merge branch 'master' into rails-4.1.9 ... Conflicts: app/views/projects/commits/_commit.html.haml app/views/projects/issues/_issue.html.haml app/views/projects/issues/_issue_context.html.haml app/views/projects/merge_requests/_merge_request.html.haml app/views/projects/merge_requests/show/_context.html.haml		2015-02-21 12:55:28 -07:00
..
concerns	Add ExternalIssue base model to make issue referencing more robust for external issue trackers.	2015-02-11 09:21:57 -08:00
hooks	Explicitly define ordering in models using default_scope	2015-02-05 14:20:55 -08:00
members	Add "User created project Namespace / Project" event	2015-02-13 12:02:58 +01:00
network	Merge pull request #7999 from cirosantilli/append-inplace	2015-01-21 23:07:15 -08:00
project_services	Upgrade to Rails 4.1.9	2015-02-14 11:09:23 -07:00
.gitkeep
ability.rb	Append in place for strings and arrays	2015-01-01 21:12:00 +01:00
application_setting.rb	Add link to share via twitter to "created project" event.	2015-02-13 12:07:59 +01:00
broadcast_message.rb	Explicitly define ordering in models using default_scope	2015-02-05 14:20:55 -08:00
commit.rb	Rubocop: Style/ElseAlignment enabled	2015-02-02 21:38:50 -08:00
deploy_key.rb	Re-annotate models	2014-04-09 15:05:03 +03:00
deploy_keys_project.rb	Use strong params for 5 more models	2014-06-26 15:00:09 +03:00
diff_line.rb	Refactor Parallel Diff feature and add scrollbars	2014-03-27 09:15:25 +13:00
email.rb	Explicitly define ordering in models using default_scope	2015-02-05 14:20:55 -08:00
event.rb	Fix event loading with associations	2015-02-18 09:38:46 -08:00
external_issue.rb	Add ExternalIssue base model to make issue referencing more robust for external issue trackers.	2015-02-11 09:21:57 -08:00
forked_project_link.rb	Use strong params for 5 more models	2014-06-26 15:00:09 +03:00
group.rb	Revert "Fix broken access control and refactor avatar upload"	2015-02-19 08:57:35 -08:00
group_milestone.rb	Remove duplicates from group milestone participants list.	2015-02-05 21:26:57 +01:00
identity.rb	Explicitly define ordering in models using default_scope	2015-02-05 14:20:55 -08:00
issue.rb	Fix method overlap for issue sorting	2015-02-05 16:49:41 -08:00
key.rb	Explicitly define ordering in models using default_scope	2015-02-05 14:20:55 -08:00
label.rb	Apply default scope to labels and remove one for notes	2015-02-05 20:29:41 -08:00
label_link.rb	Annotate models	2014-08-25 12:25:02 +03:00
member.rb	Explicitly define ordering in models using default_scope	2015-02-05 14:20:55 -08:00
merge_request.rb	Fix method overlap for issue sorting	2015-02-05 16:49:41 -08:00
merge_request_diff.rb	Explicitly define ordering in models using default_scope	2015-02-05 14:20:55 -08:00
milestone.rb	Fix method overlap for issue sorting	2015-02-05 16:49:41 -08:00
namespace.rb	Prevent autogenerated OAuth username to clash with existing namespace.	2015-02-13 12:39:11 +01:00
note.rb	Fix commit comments on first line of diff not rendering in Merge Request Discussion view.	2015-02-20 10:23:34 +01:00
notification.rb	New feature: add 'Mention' notification level	2014-12-29 15:55:21 +02:00
personal_snippet.rb	annotate	2014-10-09 18:22:20 +03:00
project.rb	Revert "Fix broken access control and refactor avatar upload"	2015-02-19 08:57:35 -08:00
project_contributions.rb	Improve contribution calendar on user page	2015-01-29 17:07:44 -08:00
project_snippet.rb	annotate	2014-10-09 18:22:20 +03:00
project_team.rb	Append in place for strings and arrays	2015-01-01 21:12:00 +01:00
project_wiki.rb	Rubocop enabled for: Use spaces inside hash literal braces	2015-02-02 20:36:54 -08:00
protected_branch.rb	Annotate models	2015-01-22 09:40:03 -08:00
repository.rb	Refactor Repository to use new RepositoryCache class	2015-01-29 13:03:47 -05:00
service.rb	All services can have templates.	2015-02-12 09:19:55 -08:00
snippet.rb	Explicitly define ordering in models using default_scope	2015-02-05 14:20:55 -08:00
tree.rb	Factor markup? || gitlab_markdown? into new method	2014-10-04 17:56:12 +02:00
user.rb	Merge branch 'projects-limit-default' into 'master'	2015-02-19 20:48:49 +00:00
users_star_project.rb	Annotate models	2014-08-25 12:25:02 +03:00
wiki_page.rb	Rubocop: Style/Alias enabled	2015-02-02 20:57:10 -08:00