/
contributing_to_ruby_on_rails.html
711 lines (651 loc) · 53.1 KB
/
contributing_to_ruby_on_rails.html
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Contributing to Ruby on Rails — Ruby on Rails Guides</title>
<link rel="stylesheet" type="text/css" href="stylesheets/style.css" data-turbolinks-track="reload">
<link rel="stylesheet" type="text/css" href="stylesheets/print.css" media="print">
<link rel="stylesheet" type="text/css" href="stylesheets/syntaxhighlighter/shCore.css" data-turbolinks-track="reload">
<link rel="stylesheet" type="text/css" href="stylesheets/syntaxhighlighter/shThemeRailsGuides.css" data-turbolinks-track="reload">
<link rel="stylesheet" type="text/css" href="stylesheets/fixes.css" data-turbolinks-track="reload">
<link href="images/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<script src="javascripts/syntaxhighlighter.js" data-turbolinks-track="reload"></script>
<script src="javascripts/turbolinks.js" data-turbolinks-track="reload"></script>
<script src="javascripts/guides.js" data-turbolinks-track="reload"></script>
<script src="javascripts/responsive-tables.js" data-turbolinks-track="reload"></script>
</head>
<body class="guide">
<div>
<img src="images/edge_badge.png" alt="edge-badge" id="edge-badge" />
</div>
<div id="topNav">
<div class="wrapper">
<strong class="more-info-label">Veja mais em <a href="http://rubyonrails.org/">rubyonrails.org:</a> </strong>
<span class="red-button more-info-button">
Mais Ruby on Rails
</span>
<ul class="more-info-links s-hidden">
<li class="more-info"><a href="https://weblog.rubyonrails.org/">Blog</a></li>
<li class="more-info"><a href="https://guides.rubyonrails.org/">Guia</a></li>
<li class="more-info"><a href="http://api.rubyonrails.org/">API</a></li>
<li class="more-info"><a href="https://stackoverflow.com/questions/tagged/ruby-on-rails">Pedir ajuda</a></li>
<li class="more-info"><a href="https://github.com/rails/rails">Contribuir no GitHub</a></li>
</ul>
</div>
</div>
<div id="header">
<div class="wrapper clearfix">
<h1><a href="index.html" title="Return to home page">Guides.rubyonrails.org</a></h1>
<ul class="nav">
<li><a class="nav-item" href="index.html">Home</a></li>
<li class="guides-index guides-index-large">
<a href="index.html" id="guidesMenu" class="guides-index-item nav-item">Guias</a>
<div id="guides" class="clearfix" style="display: none;">
<hr />
<div class="guides-section-container">
<div class="guides-section">
<dt>Comece Aqui</dt>
</div>
<div class="guides-section">
<dt>Models</dt>
</div>
<div class="guides-section">
<dt>Views</dt>
</div>
<div class="guides-section">
<dt>Controllers</dt>
</div>
<div class="guides-section">
<dt>Other Components</dt>
</div>
<div class="guides-section">
<dt>Digging Deeper</dt>
</div>
<div class="guides-section">
<dt>Extending Rails</dt>
<dd><a href="rails_on_rack.html">Rails on Rack</a></dd>
<dd><a href="generators.html">Creating and Customizing Rails Generators & Templates</a></dd>
</div>
<div class="guides-section">
<dt>Contributions</dt>
<dd><a href="contributing_to_ruby_on_rails.html">Contributing to Ruby on Rails</a></dd>
<dd><a href="api_documentation_guidelines.html">API Documentation Guidelines</a></dd>
<dd><a href="ruby_on_rails_guides_guidelines.html">Guides Guidelines</a></dd>
</div>
<div class="guides-section">
<dt>Policies</dt>
<dd><a href="maintenance_policy.html">Maintenance Policy</a></dd>
</div>
<div class="guides-section">
<dt>Release Notes</dt>
<dd><a href="upgrading_ruby_on_rails.html">Upgrading Ruby on Rails</a></dd>
<dd><a href="5_2_release_notes.html">Version 5.2 - April 2018</a></dd>
<dd><a href="5_1_release_notes.html">Version 5.1 - April 2017</a></dd>
<dd><a href="5_0_release_notes.html">Version 5.0 - June 2016</a></dd>
<dd><a href="4_2_release_notes.html">Version 4.2 - December 2014</a></dd>
<dd><a href="4_1_release_notes.html">Version 4.1 - April 2014</a></dd>
<dd><a href="4_0_release_notes.html">Version 4.0 - June 2013</a></dd>
<dd><a href="3_2_release_notes.html">Version 3.2 - January 2012</a></dd>
<dd><a href="3_1_release_notes.html">Version 3.1 - August 2011</a></dd>
<dd><a href="3_0_release_notes.html">Version 3.0 - August 2010</a></dd>
<dd><a href="2_3_release_notes.html">Version 2.3 - March 2009</a></dd>
<dd><a href="2_2_release_notes.html">Version 2.2 - November 2008</a></dd>
</div>
</div>
</div>
</li>
<li><a class="nav-item" href="contributing_to_ruby_on_rails.html">Contribua</a></li>
<li class="guides-index guides-index-small">
<select class="guides-index-item nav-item">
<option value="index.html">Guias</option>
<optgroup label="Comece Aqui">
</optgroup>
<optgroup label="Models">
</optgroup>
<optgroup label="Views">
</optgroup>
<optgroup label="Controllers">
</optgroup>
<optgroup label="Other Components">
</optgroup>
<optgroup label="Digging Deeper">
</optgroup>
<optgroup label="Extending Rails">
<option value="rails_on_rack.html">Rails on Rack</option>
<option value="generators.html">Creating and Customizing Rails Generators & Templates</option>
</optgroup>
<optgroup label="Contributions">
<option value="contributing_to_ruby_on_rails.html">Contributing to Ruby on Rails</option>
<option value="api_documentation_guidelines.html">API Documentation Guidelines</option>
<option value="ruby_on_rails_guides_guidelines.html">Guides Guidelines</option>
</optgroup>
<optgroup label="Policies">
<option value="maintenance_policy.html">Maintenance Policy</option>
</optgroup>
<optgroup label="Release Notes">
<option value="upgrading_ruby_on_rails.html">Upgrading Ruby on Rails</option>
<option value="5_2_release_notes.html">Version 5.2 - April 2018</option>
<option value="5_1_release_notes.html">Version 5.1 - April 2017</option>
<option value="5_0_release_notes.html">Version 5.0 - June 2016</option>
<option value="4_2_release_notes.html">Version 4.2 - December 2014</option>
<option value="4_1_release_notes.html">Version 4.1 - April 2014</option>
<option value="4_0_release_notes.html">Version 4.0 - June 2013</option>
<option value="3_2_release_notes.html">Version 3.2 - January 2012</option>
<option value="3_1_release_notes.html">Version 3.1 - August 2011</option>
<option value="3_0_release_notes.html">Version 3.0 - August 2010</option>
<option value="2_3_release_notes.html">Version 2.3 - March 2009</option>
<option value="2_2_release_notes.html">Version 2.2 - November 2008</option>
</optgroup>
</select>
</li>
</ul>
</div>
</div>
<hr class="hide" />
<div id="feature">
<div class="wrapper">
<h2>Contributing to Ruby on Rails</h2><p>This guide covers ways in which <em>you</em> can become a part of the ongoing development of Ruby on Rails.</p><p>After reading this guide, you will know:</p>
<ul>
<li>How to use GitHub to report issues.</li>
<li>How to clone master and run the test suite.</li>
<li>How to help resolve existing issues.</li>
<li>How to contribute to the Ruby on Rails documentation.</li>
<li>How to contribute to the Ruby on Rails code.</li>
</ul>
<p>Ruby on Rails is not "someone else's framework." Over the years, thousands of people have contributed to Ruby on Rails ranging from a single character to massive architectural changes or significant documentation - all with the goal of making Ruby on Rails better for everyone. Even if you don't feel up to writing code or documentation yet, there are a variety of other ways that you can contribute, from reporting issues to testing patches.</p><p>As mentioned in <a href="https://github.com/rails/rails/blob/master/README.md">Rails'
README</a>, everyone interacting in Rails and its sub-projects' codebases, issue trackers, chat rooms, and mailing lists is expected to follow the Rails <a href="http://rubyonrails.org/conduct/">code of conduct</a>.</p>
<div id="subCol">
<h3 class="chapter"><img src="images/chapters_icon.gif" alt="" />Chapters</h3>
<ol class="chapters">
<li>
<a href="#reporting-an-issue">Reporting an Issue</a>
<ul>
<li><a href="#creating-a-bug-report">Creating a Bug Report</a></li>
<li><a href="#create-an-executable-test-case">Create an Executable Test Case</a></li>
<li><a href="#special-treatment-for-security-issues">Special Treatment for Security Issues</a></li>
<li><a href="#what-about-feature-requests-questionmark">What about Feature Requests?</a></li>
</ul>
</li>
<li>
<a href="#helping-to-resolve-existing-issues">Helping to Resolve Existing Issues</a>
<ul>
<li><a href="#verifying-bug-reports">Verifying Bug Reports</a></li>
<li><a href="#testing-patches">Testing Patches</a></li>
</ul>
</li>
<li><a href="#contributing-to-the-rails-documentation">Contributing to the Rails Documentation</a></li>
<li><a href="#translating-rails-guides">Translating Rails Guides</a></li>
<li>
<a href="#contributing-to-the-rails-code">Contributing to the Rails Code</a>
<ul>
<li><a href="#setting-up-a-development-environment">Setting Up a Development Environment</a></li>
<li><a href="#clone-the-rails-repository">Clone the Rails Repository</a></li>
<li><a href="#bundle-install">Bundle install</a></li>
<li><a href="#running-an-application-against-your-local-branch">Running an Application Against Your Local Branch</a></li>
<li><a href="#write-your-code">Write Your Code</a></li>
<li><a href="#benchmark-your-code">Benchmark Your Code</a></li>
<li><a href="#running-tests">Running Tests</a></li>
<li><a href="#warnings">Warnings</a></li>
<li><a href="#updating-the-changelog">Updating the CHANGELOG</a></li>
<li><a href="#updating-the-gemfile-lock">Updating the Gemfile.lock</a></li>
<li><a href="#commit-your-changes">Commit Your Changes</a></li>
<li><a href="#update-your-branch">Update Your Branch</a></li>
<li><a href="#fork">Fork</a></li>
<li><a href="#issue-a-pull-request">Issue a Pull Request</a></li>
<li><a href="#get-some-feedback">Get some Feedback</a></li>
<li><a href="#iterate-as-necessary">Iterate as Necessary</a></li>
<li><a href="#older-versions-of-ruby-on-rails">Older Versions of Ruby on Rails</a></li>
</ul>
</li>
<li><a href="#rails-contributors">Rails Contributors</a></li>
</ol>
</div>
</div>
</div>
<div id="container">
<div class="wrapper">
<div id="mainCol">
<h3 id="reporting-an-issue"><a class="anchorlink" href="#reporting-an-issue">1 Reporting an Issue</a></h3><p>Ruby on Rails uses <a href="https://github.com/rails/rails/issues">GitHub Issue Tracking</a> to track issues (primarily bugs and contributions of new code). If you've found a bug in Ruby on Rails, this is the place to start. You'll need to create a (free) GitHub account in order to submit an issue, to comment on them, or to create pull requests.</p><div class="note"><p>Bugs in the most recent released version of Ruby on Rails are likely to get the most attention. Also, the Rails core team is always interested in feedback from those who can take the time to test <em>edge Rails</em> (the code for the version of Rails that is currently under development). Later in this guide, you'll find out how to get edge Rails for testing.</p></div><h4 id="creating-a-bug-report"><a class="anchorlink" href="#creating-a-bug-report">1.1 Creating a Bug Report</a></h4><p>If you've found a problem in Ruby on Rails which is not a security risk, do a search on GitHub under <a href="https://github.com/rails/rails/issues">Issues</a> in case it has already been reported. If you are unable to find any open GitHub issues addressing the problem you found, your next step will be to <a href="https://github.com/rails/rails/issues/new">open a new one</a>. (See the next section for reporting security issues.)</p><p>Your issue report should contain a title and a clear description of the issue at the bare minimum. You should include as much relevant information as possible and should at least post a code sample that demonstrates the issue. It would be even better if you could include a unit test that shows how the expected behavior is not occurring. Your goal should be to make it easy for yourself - and others - to reproduce the bug and figure out a fix.</p><p>Then, don't get your hopes up! Unless you have a "Code Red, Mission Critical, the World is Coming to an End" kind of bug, you're creating this issue report in the hope that others with the same problem will be able to collaborate with you on solving it. Do not expect that the issue report will automatically see any activity or that others will jump to fix it. Creating an issue like this is mostly to help yourself start on the path of fixing the problem and for others to confirm it with an "I'm having this problem too" comment.</p><h4 id="create-an-executable-test-case"><a class="anchorlink" href="#create-an-executable-test-case">1.2 Create an Executable Test Case</a></h4><p>Having a way to reproduce your issue will be very helpful for others to help confirm, investigate, and ultimately fix your issue. You can do this by providing an executable test case. To make this process easier, we have prepared several bug report templates for you to use as a starting point:</p>
<ul>
<li>Template for Active Record (models, database) issues: <a href="https://github.com/rails/rails/blob/master/guides/bug_report_templates/active_record_gem.rb">gem</a> / <a href="https://github.com/rails/rails/blob/master/guides/bug_report_templates/active_record_master.rb">master</a>
</li>
<li>Template for testing Active Record (migration) issues: <a href="https://github.com/rails/rails/blob/master/guides/bug_report_templates/active_record_migrations_gem.rb">gem</a> / <a href="https://github.com/rails/rails/blob/master/guides/bug_report_templates/active_record_migrations_master.rb">master</a>
</li>
<li>Template for Action Pack (controllers, routing) issues: <a href="https://github.com/rails/rails/blob/master/guides/bug_report_templates/action_controller_gem.rb">gem</a> / <a href="https://github.com/rails/rails/blob/master/guides/bug_report_templates/action_controller_master.rb">master</a>
</li>
<li>Template for Active Job issues: <a href="https://github.com/rails/rails/blob/master/guides/bug_report_templates/active_job_gem.rb">gem</a> / <a href="https://github.com/rails/rails/blob/master/guides/bug_report_templates/active_job_master.rb">master</a>
</li>
<li>Generic template for other issues: <a href="https://github.com/rails/rails/blob/master/guides/bug_report_templates/generic_gem.rb">gem</a> / <a href="https://github.com/rails/rails/blob/master/guides/bug_report_templates/generic_master.rb">master</a>
</li>
</ul>
<p>These templates include the boilerplate code to set up a test case against either a released version of Rails (<code>*_gem.rb</code>) or edge Rails (<code>*_master.rb</code>).</p><p>Simply copy the content of the appropriate template into a <code>.rb</code> file and make the necessary changes to demonstrate the issue. You can execute it by running <code>ruby the_file.rb</code> in your terminal. If all goes well, you should see your test case failing.</p><p>You can then share your executable test case as a <a href="https://gist.github.com">gist</a>, or simply paste the content into the issue description.</p><h4 id="special-treatment-for-security-issues"><a class="anchorlink" href="#special-treatment-for-security-issues">1.3 Special Treatment for Security Issues</a></h4><div class="warning"><p>Please do not report security vulnerabilities with public GitHub issue reports. The <a href="http://rubyonrails.org/security">Rails security policy page</a> details the procedure to follow for security issues.</p></div><h4 id="what-about-feature-requests-questionmark"><a class="anchorlink" href="#what-about-feature-requests-questionmark">1.4 What about Feature Requests?</a></h4><p>Please don't put "feature request" items into GitHub Issues. If there's a new
feature that you want to see added to Ruby on Rails, you'll need to write the
code yourself - or convince someone else to partner with you to write the code.
Later in this guide, you'll find detailed instructions for proposing a patch to
Ruby on Rails. If you enter a wish list item in GitHub Issues with no code, you
can expect it to be marked "invalid" as soon as it's reviewed.</p><p>Sometimes, the line between 'bug' and 'feature' is a hard one to draw.
Generally, a feature is anything that adds new behavior, while a bug is
anything that causes incorrect behavior. Sometimes,
the core team will have to make a judgment call. That said, the distinction
generally just affects which release your patch will get in to; we love feature
submissions! They just won't get backported to maintenance branches.</p><p>If you'd like feedback on an idea for a feature before doing the work to make
a patch, please send an email to the <a href="https://groups.google.com/forum/?fromgroups#!forum/rubyonrails-core">rails-core mailing
list</a>. You
might get no response, which means that everyone is indifferent. You might find
someone who's also interested in building that feature. You might get a "This
won't be accepted." But it's the proper place to discuss new ideas. GitHub
Issues are not a particularly good venue for the sometimes long and involved
discussions new features require.</p><h3 id="helping-to-resolve-existing-issues"><a class="anchorlink" href="#helping-to-resolve-existing-issues">2 Helping to Resolve Existing Issues</a></h3><p>As a next step beyond reporting issues, you can help the core team resolve existing ones by providing feedback about them. If you are new to Rails core development, that might be a great way to walk your first steps, you'll get familiar with the code base and the processes.</p><p>If you check the <a href="https://github.com/rails/rails/issues">issues list</a> in GitHub Issues, you'll find lots of issues already requiring attention. What can you do for these? Quite a bit, actually:</p><h4 id="verifying-bug-reports"><a class="anchorlink" href="#verifying-bug-reports">2.1 Verifying Bug Reports</a></h4><p>For starters, it helps just to verify bug reports. Can you reproduce the reported issue on your own computer? If so, you can add a comment to the issue saying that you're seeing the same thing.</p><p>If an issue is very vague, can you help narrow it down to something more specific? Maybe you can provide additional information to help reproduce a bug, or help by eliminating needless steps that aren't required to demonstrate the problem.</p><p>If you find a bug report without a test, it's very useful to contribute a failing test. This is also a great way to get started exploring the source code: looking at the existing test files will teach you how to write more tests. New tests are best contributed in the form of a patch, as explained later on in the "<a href="#contributing-to-the-rails-code">Contributing to the Rails Code</a>" section.</p><p>Anything you can do to make bug reports more succinct or easier to reproduce helps folks trying to write code to fix those bugs - whether you end up writing the code yourself or not.</p><h4 id="testing-patches"><a class="anchorlink" href="#testing-patches">2.2 Testing Patches</a></h4><p>You can also help out by examining pull requests that have been submitted to Ruby on Rails via GitHub. In order to apply someone's changes, you need to first create a dedicated branch:</p><div class="code_container">
<pre class="brush: plain; gutter: false; toolbar: false">
$ git checkout -b testing_branch
</pre>
</div>
<p>Then, you can use their remote branch to update your codebase. For example, let's say the GitHub user JohnSmith has forked and pushed to a topic branch "orange" located at <a href="https://github.com/JohnSmith/rails">https://github.com/JohnSmith/rails</a>.</p><div class="code_container">
<pre class="brush: plain; gutter: false; toolbar: false">
$ git remote add JohnSmith https://github.com/JohnSmith/rails.git
$ git pull JohnSmith orange
</pre>
</div>
<p>After applying their branch, test it out! Here are some things to think about:</p>
<ul>
<li>Does the change actually work?</li>
<li>Are you happy with the tests? Can you follow what they're testing? Are there any tests missing?</li>
<li>Does it have the proper documentation coverage? Should documentation elsewhere be updated?</li>
<li>Do you like the implementation? Can you think of a nicer or faster way to implement a part of their change?</li>
</ul>
<p>Once you're happy that the pull request contains a good change, comment on the GitHub issue indicating your approval. Your comment should indicate that you like the change and what you like about it. Something like:</p>
<blockquote>
<p>I like the way you've restructured that code in generate_finder_sql - much nicer. The tests look good too.</p>
</blockquote>
<p>If your comment simply reads "+1", then odds are that other reviewers aren't going to take it too seriously. Show that you took the time to review the pull request.</p><h3 id="contributing-to-the-rails-documentation"><a class="anchorlink" href="#contributing-to-the-rails-documentation">3 Contributing to the Rails Documentation</a></h3><p>Ruby on Rails has two main sets of documentation: the guides, which help you
learn about Ruby on Rails, and the API, which serves as a reference.</p><p>You can help improve the Rails guides by making them more coherent, consistent, or readable, adding missing information, correcting factual errors, fixing typos, or bringing them up to date with the latest edge Rails.</p><p>To do so, make changes to Rails guides source files (located <a href="https://github.com/rails/rails/tree/master/guides/source">here</a> on GitHub). Then open a pull request to apply your
changes to the master branch.</p><p>When working with documentation, please take into account the <a href="api_documentation_guidelines.html">API Documentation Guidelines</a> and the <a href="ruby_on_rails_guides_guidelines.html">Ruby on Rails Guides Guidelines</a>.</p><div class="note"><p>To help our CI servers you should add [ci skip] to your documentation commit message to skip build on that commit. Please remember to use it for commits containing only documentation changes.</p></div><h3 id="translating-rails-guides"><a class="anchorlink" href="#translating-rails-guides">4 Translating Rails Guides</a></h3><p>We are happy to have people volunteer to translate the Rails guides. Just follow these steps:</p>
<ul>
<li>Fork <a href="https://github.com/rails/rails">https://github.com/rails/rails</a>.</li>
<li>Add a source folder for your own language, for example: <em>guides/source/it-IT</em> for Italian.</li>
<li>Copy the contents of <em>guides/source</em> into your own language directory and translate them.</li>
<li>Do NOT translate the HTML files, as they are automatically generated.</li>
</ul>
<p>Note that translations are not submitted to the Rails repository. As detailed above, your work happens in a fork. This is so because in practice documentation maintenance via patches is only sustainable in English.</p><p>To generate the guides in HTML format cd into the <em>guides</em> directory then run (eg. for it-IT):</p><div class="code_container">
<pre class="brush: plain; gutter: false; toolbar: false">
$ bundle install
$ bundle exec rake guides:generate:html GUIDES_LANGUAGE=it-IT
</pre>
</div>
<p>This will generate the guides in an <em>output</em> directory.</p><div class="note"><p>The instructions are for Rails > 4. The Redcarpet Gem doesn't work with JRuby.</p></div><p>Translation efforts we know about (various versions):</p>
<ul>
<li>
<strong>Italian</strong>: <a href="https://github.com/rixlabs/docrails">https://github.com/rixlabs/docrails</a>
</li>
<li>
<strong>Spanish</strong>: <a href="https://github.com/gramos/docrails/wiki">https://github.com/gramos/docrails/wiki</a>
</li>
<li>
<strong>Polish</strong>: <a href="https://github.com/apohllo/docrails">https://github.com/apohllo/docrails</a>
</li>
<li>
<strong>French</strong> : <a href="https://github.com/railsfrance/docrails">https://github.com/railsfrance/docrails</a>
</li>
<li>
<strong>Czech</strong> : <a href="https://github.com/rubyonrails-cz/docrails/tree/czech">https://github.com/rubyonrails-cz/docrails/tree/czech</a>
</li>
<li>
<strong>Turkish</strong> : <a href="https://github.com/ujk/docrails">https://github.com/ujk/docrails</a>
</li>
<li>
<strong>Korean</strong> : <a href="https://github.com/rorlakr/rails-guides">https://github.com/rorlakr/rails-guides</a>
</li>
<li>
<strong>Simplified Chinese</strong> : <a href="https://github.com/ruby-china/guides">https://github.com/ruby-china/guides</a>
</li>
<li>
<strong>Traditional Chinese</strong> : <a href="https://github.com/docrails-tw/guides">https://github.com/docrails-tw/guides</a>
</li>
<li>
<strong>Russian</strong> : <a href="https://github.com/morsbox/rusrails">https://github.com/morsbox/rusrails</a>
</li>
<li>
<strong>Japanese</strong> : <a href="https://github.com/yasslab/railsguides.jp">https://github.com/yasslab/railsguides.jp</a>
</li>
</ul>
<h3 id="contributing-to-the-rails-code"><a class="anchorlink" href="#contributing-to-the-rails-code">5 Contributing to the Rails Code</a></h3><h4 id="setting-up-a-development-environment"><a class="anchorlink" href="#setting-up-a-development-environment">5.1 Setting Up a Development Environment</a></h4><p>To move on from submitting bugs to helping resolve existing issues or contributing your own code to Ruby on Rails, you <em>must</em> be able to run its test suite. In this section of the guide, you'll learn how to setup the tests on your own computer.</p><h5 id="the-easy-way"><a class="anchorlink" href="#the-easy-way">5.1.1 The Easy Way</a></h5><p>The easiest and recommended way to get a development environment ready to hack is to use the <a href="https://github.com/rails/rails-dev-box">rails-dev-box</a>.</p><h5 id="the-hard-way"><a class="anchorlink" href="#the-hard-way">5.1.2 The Hard Way</a></h5><p>In case you can't use the Rails development box, see <a href="development_dependencies_install.html">this other guide</a>.</p><h4 id="clone-the-rails-repository"><a class="anchorlink" href="#clone-the-rails-repository">5.2 Clone the Rails Repository</a></h4><p>To be able to contribute code, you need to clone the Rails repository:</p><div class="code_container">
<pre class="brush: plain; gutter: false; toolbar: false">
$ git clone https://github.com/rails/rails.git
</pre>
</div>
<p>and create a dedicated branch:</p><div class="code_container">
<pre class="brush: plain; gutter: false; toolbar: false">
$ cd rails
$ git checkout -b my_new_branch
</pre>
</div>
<p>It doesn't matter much what name you use, because this branch will only exist on your local computer and your personal repository on GitHub. It won't be part of the Rails Git repository.</p><h4 id="bundle-install"><a class="anchorlink" href="#bundle-install">5.3 Bundle install</a></h4><p>Install the required gems.</p><div class="code_container">
<pre class="brush: plain; gutter: false; toolbar: false">
$ bundle install
</pre>
</div>
<h4 id="running-an-application-against-your-local-branch"><a class="anchorlink" href="#running-an-application-against-your-local-branch">5.4 Running an Application Against Your Local Branch</a></h4><p>In case you need a dummy Rails app to test changes, the <code>--dev</code> flag of <code>rails new</code> generates an application that uses your local branch:</p><div class="code_container">
<pre class="brush: plain; gutter: false; toolbar: false">
$ cd rails
$ bundle exec rails new ~/my-test-app --dev
</pre>
</div>
<p>The application generated in <code>~/my-test-app</code> runs against your local branch
and in particular sees any modifications upon server reboot.</p><h4 id="write-your-code"><a class="anchorlink" href="#write-your-code">5.5 Write Your Code</a></h4><p>Now get busy and add/edit code. You're on your branch now, so you can write whatever you want (make sure you're on the right branch with <code>git branch -a</code>). But if you're planning to submit your change back for inclusion in Rails, keep a few things in mind:</p>
<ul>
<li>Get the code right.</li>
<li>Use Rails idioms and helpers.</li>
<li>Include tests that fail without your code, and pass with it.</li>
<li>Update the (surrounding) documentation, examples elsewhere, and the guides: whatever is affected by your contribution.</li>
</ul>
<div class="info"><p>Changes that are cosmetic in nature and do not add anything substantial to the stability, functionality, or testability of Rails will generally not be accepted (read more about <a href="https://github.com/rails/rails/pull/13771#issuecomment-32746700">our rationales behind this decision</a>).</p></div><h5 id="follow-the-coding-conventions"><a class="anchorlink" href="#follow-the-coding-conventions">5.5.1 Follow the Coding Conventions</a></h5><p>Rails follows a simple set of coding style conventions:</p>
<ul>
<li>Two spaces, no tabs (for indentation).</li>
<li>No trailing whitespace. Blank lines should not have any spaces.</li>
<li>Indent after private/protected.</li>
<li>Use Ruby >= 1.9 syntax for hashes. Prefer <code>{ a: :b }</code> over <code>{ :a => :b }</code>.</li>
<li>Prefer <code>&&</code>/<code>||</code> over <code>and</code>/<code>or</code>.</li>
<li>Prefer class << self over self.method for class methods.</li>
<li>Use <code>my_method(my_arg)</code> not <code>my_method( my_arg )</code> or <code>my_method my_arg</code>.</li>
<li>Use <code>a = b</code> and not <code>a=b</code>.</li>
<li>Use assert_not methods instead of refute.</li>
<li>Prefer <code>method { do_stuff }</code> instead of <code>method{do_stuff}</code> for single-line blocks.</li>
<li>Follow the conventions in the source you see used already.</li>
</ul>
<p>The above are guidelines - please use your best judgment in using them.</p><p>Additionally, we have <a href="https://www.rubocop.org/">RuboCop</a> rules defined to codify some of our coding conventions. You can run RuboCop locally against the file that you have modified before submitting a pull request:</p><div class="code_container">
<pre class="brush: plain; gutter: false; toolbar: false">
$ rubocop actionpack/lib/action_controller/metal/strong_parameters.rb
Inspecting 1 file
.
1 file inspected, no offenses detected
</pre>
</div>
<p>For <code>rails-ujs</code> CoffeeScript and JavaScript files, you can run <code>npm run lint</code> in <code>actionview</code> folder.</p><h4 id="benchmark-your-code"><a class="anchorlink" href="#benchmark-your-code">5.6 Benchmark Your Code</a></h4><p>For changes that might have an impact on performance, please benchmark your
code and measure the impact. Please share the benchmark script you used as well
as the results. You should consider including this information in your commit
message, which allows future contributors to easily verify your findings and
determine if they are still relevant. (For example, future optimizations in the
Ruby VM might render certain optimizations unnecessary.)</p><p>It is very easy to make an optimization that improves performance for a
specific scenario you care about but regresses on other common cases.
Therefore, you should test your change against a list of representative
scenarios. Ideally, they should be based on real-world scenarios extracted
from production applications.</p><p>You can use the <a href="https://github.com/rails/rails/blob/master/guides/bug_report_templates/benchmark.rb">benchmark template</a>
as a starting point. It includes the boilerplate code to setup a benchmark
using the <a href="https://github.com/evanphx/benchmark-ips">benchmark-ips</a> gem. The
template is designed for testing relatively self-contained changes that can be
inlined into the script.</p><h4 id="running-tests"><a class="anchorlink" href="#running-tests">5.7 Running Tests</a></h4><p>It is not customary in Rails to run the full test suite before pushing
changes. The railties test suite in particular takes a long time, and takes an
especially long time if the source code is mounted in <code>/vagrant</code> as happens in
the recommended workflow with the <a href="https://github.com/rails/rails-dev-box">rails-dev-box</a>.</p><p>As a compromise, test what your code obviously affects, and if the change is
not in railties, run the whole test suite of the affected component. If all
tests are passing, that's enough to propose your contribution. We have
<a href="https://travis-ci.org/rails/rails">Travis CI</a> as a safety net for catching
unexpected breakages elsewhere.</p><h5 id="entire-rails"><a class="anchorlink" href="#entire-rails">5.7.1 Entire Rails:</a></h5><p>To run all the tests, do:</p><div class="code_container">
<pre class="brush: plain; gutter: false; toolbar: false">
$ cd rails
$ bundle exec rake test
</pre>
</div>
<h5 id="for-a-particular-component"><a class="anchorlink" href="#for-a-particular-component">5.7.2 For a Particular Component</a></h5><p>You can run tests only for a particular component (e.g. Action Pack). For example,
to run Action Mailer tests:</p><div class="code_container">
<pre class="brush: plain; gutter: false; toolbar: false">
$ cd actionmailer
$ bundle exec rake test
</pre>
</div>
<h5 id="for-a-specific-directory"><a class="anchorlink" href="#for-a-specific-directory">5.7.3 For a Specific Directory</a></h5><p>If you want to run the tests located in a specific directory use the <code>TEST_DIR</code>
environment variable. For example, this will run the tests in the
<code>railties/test/generators</code> directory only:</p><div class="code_container">
<pre class="brush: plain; gutter: false; toolbar: false">
$ cd railties
$ TEST_DIR=generators bundle exec rake test
</pre>
</div>
<h5 id="for-a-specific-file"><a class="anchorlink" href="#for-a-specific-file">5.7.4 For a Specific File</a></h5><p>You can run the tests for a particular file by using:</p><div class="code_container">
<pre class="brush: plain; gutter: false; toolbar: false">
$ cd actionpack
$ bundle exec ruby -w -Itest test/template/form_helper_test.rb
</pre>
</div>
<h5 id="running-a-single-test"><a class="anchorlink" href="#running-a-single-test">5.7.5 Running a Single Test</a></h5><p>You can run a single test through ruby. For instance:</p><div class="code_container">
<pre class="brush: plain; gutter: false; toolbar: false">
$ cd actionmailer
$ bundle exec ruby -w -Itest test/mail_layout_test.rb -n test_explicit_class_layout
</pre>
</div>
<p>The <code>-n</code> option allows you to run a single method instead of the whole file.</p><h5 id="running-tests-with-a-specific-seed"><a class="anchorlink" href="#running-tests-with-a-specific-seed">5.7.6 Running tests with a specific seed</a></h5><p>Test execution is randomized with a randomization seed. If you are experiencing random
test failures you can more accurately reproduce a failing test scenario by specifically
setting the randomization seed.</p><p>Running all tests for a component:</p><div class="code_container">
<pre class="brush: plain; gutter: false; toolbar: false">
$ cd actionmailer
$ SEED=15002 bundle exec rake test
</pre>
</div>
<p>Running a single test file:</p><div class="code_container">
<pre class="brush: plain; gutter: false; toolbar: false">
$ cd actionmailer
$ SEED=15002 bundle exec ruby -w -Itest test/mail_layout_test.rb
</pre>
</div>
<h5 id="testing-active-record"><a class="anchorlink" href="#testing-active-record">5.7.7 Testing Active Record</a></h5><p>First, create the databases you'll need. You can find a list of the required
table names, usernames, and passwords in <code>activerecord/test/config.example.yml</code>.</p><p>For MySQL and PostgreSQL, running the SQL statements <code>create database
activerecord_unittest</code> and <code>create database activerecord_unittest2</code> is
sufficient. This is not necessary for SQLite3.</p><p>This is how you run the Active Record test suite only for SQLite3:</p><div class="code_container">
<pre class="brush: plain; gutter: false; toolbar: false">
$ cd activerecord
$ bundle exec rake test:sqlite3
</pre>
</div>
<p>You can now run the tests as you did for <code>sqlite3</code>. The tasks are respectively:</p><div class="code_container">
<pre class="brush: plain; gutter: false; toolbar: false">
test:mysql2
test:postgresql
</pre>
</div>
<p>Finally,</p><div class="code_container">
<pre class="brush: plain; gutter: false; toolbar: false">
$ bundle exec rake test
</pre>
</div>
<p>will now run the three of them in turn.</p><p>You can also run any single test separately:</p><div class="code_container">
<pre class="brush: plain; gutter: false; toolbar: false">
$ ARCONN=sqlite3 bundle exec ruby -Itest test/cases/associations/has_many_associations_test.rb
</pre>
</div>
<p>To run a single test against all adapters, use:</p><div class="code_container">
<pre class="brush: plain; gutter: false; toolbar: false">
$ bundle exec rake TEST=test/cases/associations/has_many_associations_test.rb
</pre>
</div>
<p>You can invoke <code>test_jdbcmysql</code>, <code>test_jdbcsqlite3</code> or <code>test_jdbcpostgresql</code> also. See the file <code>activerecord/RUNNING_UNIT_TESTS.rdoc</code> for information on running more targeted database tests, or the file <code>ci/travis.rb</code> for the test suite run by the continuous integration server.</p><h4 id="warnings"><a class="anchorlink" href="#warnings">5.8 Warnings</a></h4><p>The test suite runs with warnings enabled. Ideally, Ruby on Rails should issue no warnings, but there may be a few, as well as some from third-party libraries. Please ignore (or fix!) them, if any, and submit patches that do not issue new warnings.</p><h4 id="updating-the-changelog"><a class="anchorlink" href="#updating-the-changelog">5.9 Updating the CHANGELOG</a></h4><p>The CHANGELOG is an important part of every release. It keeps the list of changes for every Rails version.</p><p>You should add an entry <strong>to the top</strong> of the CHANGELOG of the framework that you modified if you're adding or removing a feature, committing a bug fix, or adding deprecation notices. Refactorings and documentation changes generally should not go to the CHANGELOG.</p><p>A CHANGELOG entry should summarize what was changed and should end with the author's name. You can use multiple lines if you need more space and you can attach code examples indented with 4 spaces. If a change is related to a specific issue, you should attach the issue's number. Here is an example CHANGELOG entry:</p><div class="code_container">
<pre class="brush: plain; gutter: false; toolbar: false">
* Summary of a change that briefly describes what was changed. You can use multiple
lines and wrap them at around 80 characters. Code examples are ok, too, if needed:
class Foo
def bar
puts 'baz'
end
end
You can continue after the code example and you can attach issue number. Fixes #1234.
*Your Name*
</pre>
</div>
<p>Your name can be added directly after the last word if there are no code
examples or multiple paragraphs. Otherwise, it's best to make a new paragraph.</p><h4 id="updating-the-gemfile-lock"><a class="anchorlink" href="#updating-the-gemfile-lock">5.10 Updating the Gemfile.lock</a></h4><p>Some changes require the dependencies to be upgraded. In these cases make sure you run <code>bundle update</code> to get the right version of the dependency and commit the <code>Gemfile.lock</code> file within your changes.</p><h4 id="commit-your-changes"><a class="anchorlink" href="#commit-your-changes">5.11 Commit Your Changes</a></h4><p>When you're happy with the code on your computer, you need to commit the changes to Git:</p><div class="code_container">
<pre class="brush: plain; gutter: false; toolbar: false">
$ git commit -a
</pre>
</div>
<p>This should fire up your editor to write a commit message. When you have
finished, save and close to continue.</p><p>A well-formatted and descriptive commit message is very helpful to others for
understanding why the change was made, so please take the time to write it.</p><p>A good commit message looks like this:</p><div class="code_container">
<pre class="brush: plain; gutter: false; toolbar: false">
Short summary (ideally 50 characters or less)
More detailed description, if necessary. It should be wrapped to
72 characters. Try to be as descriptive as you can. Even if you
think that the commit content is obvious, it may not be obvious
to others. Add any description that is already present in the
relevant issues; it should not be necessary to visit a webpage
to check the history.
The description section can have multiple paragraphs.
Code examples can be embedded by indenting them with 4 spaces:
class ArticlesController
def index
render json: Article.limit(10)
end
end
You can also add bullet points:
- make a bullet point by starting a line with either a dash (-)
or an asterisk (*)
- wrap lines at 72 characters, and indent any additional lines
with 2 spaces for readability
</pre>
</div>
<div class="info"><p>Please squash your commits into a single commit when appropriate. This
simplifies future cherry picks and keeps the git log clean.</p></div><h4 id="update-your-branch"><a class="anchorlink" href="#update-your-branch">5.12 Update Your Branch</a></h4><p>It's pretty likely that other changes to master have happened while you were working. Go get them:</p><div class="code_container">
<pre class="brush: plain; gutter: false; toolbar: false">
$ git checkout master
$ git pull --rebase
</pre>
</div>
<p>Now reapply your patch on top of the latest changes:</p><div class="code_container">
<pre class="brush: plain; gutter: false; toolbar: false">
$ git checkout my_new_branch
$ git rebase master
</pre>
</div>
<p>No conflicts? Tests still pass? Change still seems reasonable to you? Then move on.</p><h4 id="fork"><a class="anchorlink" href="#fork">5.13 Fork</a></h4><p>Navigate to the Rails <a href="https://github.com/rails/rails">GitHub repository</a> and press "Fork" in the upper right hand corner.</p><p>Add the new remote to your local repository on your local machine:</p><div class="code_container">
<pre class="brush: plain; gutter: false; toolbar: false">
$ git remote add fork https://github.com/<your user name>/rails.git
</pre>
</div>
<p>You may have cloned your local repository from rails/rails or you may have cloned from your forked repository. To avoid ambiguity the following git commands assume that you have made a "rails" remote that points to rails/rails.</p><div class="code_container">
<pre class="brush: plain; gutter: false; toolbar: false">
$ git remote add rails https://github.com/rails/rails.git
</pre>
</div>
<p>Download new commits and branches from the official repository:</p><div class="code_container">
<pre class="brush: plain; gutter: false; toolbar: false">
$ git fetch rails
</pre>
</div>
<p>Merge the new content:</p><div class="code_container">
<pre class="brush: plain; gutter: false; toolbar: false">
$ git checkout master
$ git rebase rails/master
$ git checkout my_new_branch
$ git rebase rails/master
</pre>
</div>
<p>Update your fork:</p><div class="code_container">
<pre class="brush: plain; gutter: false; toolbar: false">
$ git push fork master
$ git push fork my_new_branch
</pre>
</div>
<h4 id="issue-a-pull-request"><a class="anchorlink" href="#issue-a-pull-request">5.14 Issue a Pull Request</a></h4><p>Navigate to the Rails repository you just pushed to (e.g.
<a href="https://github.com/your-user-name/rails">https://github.com/your-user-name/rails</a>) and click on "Pull Requests" seen in
the right panel. On the next page, press "New pull request" in the upper right
hand corner.</p><p>Click on "Edit", if you need to change the branches being compared (it compares
"master" by default) and press "Click to create a pull request for this
comparison".</p><p>Ensure the changesets you introduced are included. Fill in some details about
your potential patch including a meaningful title. When finished, press "Send
pull request". The Rails core team will be notified about your submission.</p><h4 id="get-some-feedback"><a class="anchorlink" href="#get-some-feedback">5.15 Get some Feedback</a></h4><p>Most pull requests will go through a few iterations before they get merged.
Different contributors will sometimes have different opinions, and often
patches will need to be revised before they can get merged.</p><p>Some contributors to Rails have email notifications from GitHub turned on, but
others do not. Furthermore, (almost) everyone who works on Rails is a
volunteer, and so it may take a few days for you to get your first feedback on
a pull request. Don't despair! Sometimes it's quick, sometimes it's slow. Such
is the open source life.</p><p>If it's been over a week, and you haven't heard anything, you might want to try
and nudge things along. You can use the <a href="https://groups.google.com/forum/#!forum/rubyonrails-core">rubyonrails-core mailing
list</a> for this. You can also
leave another comment on the pull request.</p><p>While you're waiting for feedback on your pull request, open up a few other
pull requests and give someone else some! I'm sure they'll appreciate it in
the same way that you appreciate feedback on your patches.</p><h4 id="iterate-as-necessary"><a class="anchorlink" href="#iterate-as-necessary">5.16 Iterate as Necessary</a></h4><p>It's entirely possible that the feedback you get will suggest changes. Don't get discouraged: the whole point of contributing to an active open source project is to tap into the knowledge of the community. If people are encouraging you to tweak your code, then it's worth making the tweaks and resubmitting. If the feedback is that your code doesn't belong in the core, you might still think about releasing it as a gem.</p><h5 id="squashing-commits"><a class="anchorlink" href="#squashing-commits">5.16.1 Squashing commits</a></h5><p>One of the things that we may ask you to do is to "squash your commits", which
will combine all of your commits into a single commit. We prefer pull requests
that are a single commit. This makes it easier to backport changes to stable
branches, squashing makes it easier to revert bad commits, and the git history
can be a bit easier to follow. Rails is a large project, and a bunch of
extraneous commits can add a lot of noise.</p><div class="code_container">
<pre class="brush: plain; gutter: false; toolbar: false">
$ git fetch rails
$ git checkout my_new_branch
$ git rebase -i rails/master
< Choose 'squash' for all of your commits except the first one. >
< Edit the commit message to make sense, and describe all your changes. >
$ git push fork my_new_branch --force-with-lease
</pre>
</div>
<p>You should be able to refresh the pull request on GitHub and see that it has
been updated.</p><h5 id="updating-a-pull-request"><a class="anchorlink" href="#updating-a-pull-request">5.16.2 Updating a pull request</a></h5><p>Sometimes you will be asked to make some changes to the code you have
already committed. This can include amending existing commits. In this
case Git will not allow you to push the changes as the pushed branch
and local branch do not match. Instead of opening a new pull request,
you can force push to your branch on GitHub as described earlier in
squashing commits section:</p><div class="code_container">
<pre class="brush: plain; gutter: false; toolbar: false">
$ git push fork my_new_branch --force-with-lease
</pre>
</div>
<p>This will update the branch and pull request on GitHub with your new code.
By force pushing with <code>--force-with-lease</code>, git will more safely update
the remote than with a typical <code>-f</code>, which can delete work from the remote
that you don't already have.</p><h4 id="older-versions-of-ruby-on-rails"><a class="anchorlink" href="#older-versions-of-ruby-on-rails">5.17 Older Versions of Ruby on Rails</a></h4><p>If you want to add a fix to older versions of Ruby on Rails, you'll need to set up and switch to your own local tracking branch. Here is an example to switch to the 4-0-stable branch:</p><div class="code_container">
<pre class="brush: plain; gutter: false; toolbar: false">
$ git branch --track 4-0-stable rails/4-0-stable
$ git checkout 4-0-stable
</pre>
</div>
<div class="info"><p>You may want to <a href="http://qugstart.com/blog/git-and-svn/add-colored-git-branch-name-to-your-shell-prompt/">put your Git branch name in your shell prompt</a> to make it easier to remember which version of the code you're working with.</p></div><h5 id="backporting"><a class="anchorlink" href="#backporting">5.17.1 Backporting</a></h5><p>Changes that are merged into master are intended for the next major release of Rails. Sometimes, it might be beneficial for your changes to propagate back to the maintenance releases for older stable branches. Generally, security fixes and bug fixes are good candidates for a backport, while new features and patches that introduce a change in behavior will not be accepted. When in doubt, it is best to consult a Rails team member before backporting your changes to avoid wasted effort.</p><p>For simple fixes, the easiest way to backport your changes is to <a href="http://ariejan.net/2009/10/26/how-to-create-and-apply-a-patch-with-git">extract a diff from your changes in master and apply them to the target branch</a>.</p><p>First, make sure your changes are the only difference between your current branch and master:</p><div class="code_container">
<pre class="brush: plain; gutter: false; toolbar: false">
$ git log master..HEAD
</pre>
</div>
<p>Then extract the diff:</p><div class="code_container">
<pre class="brush: plain; gutter: false; toolbar: false">
$ git format-patch master --stdout > ~/my_changes.patch
</pre>
</div>
<p>Switch over to the target branch and apply your changes:</p><div class="code_container">
<pre class="brush: plain; gutter: false; toolbar: false">
$ git checkout -b my_backport_branch 4-2-stable
$ git apply ~/my_changes.patch
</pre>
</div>
<p>This works well for simple changes. However, if your changes are complicated or if the code in master has deviated significantly from your target branch, it might require more work on your part. The difficulty of a backport varies greatly from case to case, and sometimes it is simply not worth the effort.</p><p>Once you have resolved all conflicts and made sure all the tests are passing, push your changes and open a separate pull request for your backport. It is also worth noting that older branches might have a different set of build targets than master. When possible, it is best to first test your backport locally against the Ruby versions listed in <code>.travis.yml</code> before submitting your pull request.</p><p>And then... think about your next contribution!</p><h3 id="rails-contributors"><a class="anchorlink" href="#rails-contributors">6 Rails Contributors</a></h3><p>All contributions get credit in <a href="http://contributors.rubyonrails.org">Rails Contributors</a>.</p>
<h3>Feedback</h3>
<p>
You're encouraged to help improve the quality of this guide.
</p>
<p>
Please contribute if you see any typos or factual errors.
To get started, you can read our <a href="https://edgeguides.rubyonrails.org/contributing_to_ruby_on_rails.html#contributing-to-the-rails-documentation">documentation contributions</a> section.
</p>
<p>
You may also find incomplete content or stuff that is not up to date.
Please do add any missing documentation for master. Make sure to check
<a href="https://edgeguides.rubyonrails.org">Edge Guides</a> first to verify
if the issues are already fixed or not on the master branch.
Check the <a href="ruby_on_rails_guides_guidelines.html">Ruby on Rails Guides Guidelines</a>
for style and conventions.
</p>
<p>
If for whatever reason you spot something to fix but cannot patch it yourself, please
<a href="https://github.com/rails/rails/issues">open an issue</a>.
</p>
<p>And last but not least, any kind of discussion regarding Ruby on Rails
documentation is very welcome on the <a href="https://groups.google.com/forum/#!forum/rubyonrails-docs">rubyonrails-docs mailing list</a>.
</p>
</div>
</div>
</div>
<hr class="hide" />
<div id="footer">
<div class="wrapper">
<p>This work is licensed under a <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International</a> License</p>
<p>"Rails", "Ruby on Rails", and the Rails logo are trademarks of David Heinemeier Hansson. All rights reserved.</p>
</div>
</div>
</body>
</html>