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
..
api	Improve broadcast message API	2015-02-18 14:58:20 -08:00
assets
backup	Revert "Fix broken access control and refactor avatar upload"	2015-02-19 08:57:35 -08:00
gitlab	Merge branch 'master' into rails-4.1.9	2015-02-19 20:53:05 -07:00
redcarpet/render	Replace highlight.js with rouge-fork rugments	2015-01-15 13:41:11 +01:00
support	Socket [::]:123 on Linux listens on IPv4 and IPv6	2014-11-26 00:31:50 +01:00
tasks	Dont load rubocop in prod env	2015-02-03 19:25:57 -08:00
disable_email_interceptor.rb	Add email interceptor to prevent mail sending if email sending is disabled.	2014-10-27 13:05:50 +01:00
email_validator.rb	More rubocop rules enable	2015-02-02 21:31:03 -08:00
event_filter.rb	Add parenthesis to function def with arguments.	2014-10-03 09:18:46 +02:00
extracts_path.rb	Upgrade to Rails 4.1.9	2015-02-14 11:09:23 -07:00
file_size_validator.rb
gt_one_coercion.rb	diff unfold	2014-08-14 15:48:14 +04:00
repository_cache.rb	Fix RepositoryCache backend attr_reader	2015-01-30 10:17:55 -05:00
static_model.rb
unfold_form.rb	diff unfold	2014-08-14 15:48:14 +04:00