Douwe Maan eab086bde1 Merge branch 'master' into merge-if-green ... # Conflicts: # app/controllers/projects/merge_requests_controller.rb # config/routes.rb		2015-12-09 09:00:25 +01:00
..
ci	Specs for 'Merge When Build Succeeds'	2015-12-02 13:27:16 +01:00
abuse_reports.rb	Re-annotate models	2015-09-06 07:48:48 -07:00
broadcast_messages.rb	Re-annotate models	2014-04-09 15:05:03 +03:00
commit_statuses.rb	Specs for 'Merge When Build Succeeds'	2015-12-02 13:27:16 +01:00
forked_project_links.rb	Re-annotate models	2014-04-09 15:05:03 +03:00
group_members.rb	Replace project_access attribute with access_level in specs and API	2014-09-15 11:36:50 +03:00
label_links.rb	Annotate models	2014-08-25 12:25:02 +03:00
labels.rb	Annotate models	2015-11-13 19:22:46 +01:00
lfs_objects.rb	Update annotations	2015-12-08 21:00:01 -08:00
lfs_objects_projects.rb	Update annotations	2015-12-08 21:00:01 -08:00
merge_requests.rb	Incorporate feedback	2015-12-05 15:42:38 +01:00
notes.rb	Update annotations	2015-12-08 21:00:01 -08:00
projects.rb	Update annotations	2015-12-08 21:00:01 -08:00
releases.rb	Annotate models	2015-11-13 19:22:46 +01:00