Skip to content

Commit 7938073

Browse files
authored
Merge pull request rails#30373 from yhirano55/use_https_instead_of_http_in_rails_guide
Use https instead of http in guide [ci skip]
2 parents 6655f1e + bf48e90 commit 7938073

18 files changed

+27
-27
lines changed

guides/source/3_0_release_notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ $ cd myapp
8888

8989
Rails now uses a `Gemfile` in the application root to determine the gems you require for your application to start. This `Gemfile` is processed by the [Bundler](https://github.com/bundler/bundler) which then installs all your dependencies. It can even install all the dependencies locally to your application so that it doesn't depend on the system gems.
9090

91-
More information: - [bundler homepage](http://bundler.io/)
91+
More information: - [bundler homepage](https://bundler.io/)
9292

9393
### Living on the Edge
9494

guides/source/3_1_release_notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ $ cd myapp
151151
152152
Rails now uses a `Gemfile` in the application root to determine the gems you require for your application to start. This `Gemfile` is processed by the [Bundler](https://github.com/carlhuda/bundler) gem, which then installs all your dependencies. It can even install all the dependencies locally to your application so that it doesn't depend on the system gems.
153153

154-
More information: - [bundler homepage](http://bundler.io/)
154+
More information: - [bundler homepage](https://bundler.io/)
155155

156156
### Living on the Edge
157157

guides/source/3_2_release_notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ $ cd myapp
8181

8282
Rails now uses a `Gemfile` in the application root to determine the gems you require for your application to start. This `Gemfile` is processed by the [Bundler](https://github.com/carlhuda/bundler) gem, which then installs all your dependencies. It can even install all the dependencies locally to your application so that it doesn't depend on the system gems.
8383
84-
More information: [Bundler homepage](http://bundler.io/)
84+
More information: [Bundler homepage](https://bundler.io/)
8585
8686
### Living on the Edge
8787

guides/source/4_0_release_notes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ $ cd myapp
3636

3737
Rails now uses a `Gemfile` in the application root to determine the gems you require for your application to start. This `Gemfile` is processed by the [Bundler](https://github.com/carlhuda/bundler) gem, which then installs all your dependencies. It can even install all the dependencies locally to your application so that it doesn't depend on the system gems.
3838

39-
More information: [Bundler homepage](http://bundler.io)
39+
More information: [Bundler homepage](https://bundler.io)
4040

4141
### Living on the Edge
4242

@@ -60,7 +60,7 @@ Major Features
6060
### Upgrade
6161

6262
* **Ruby 1.9.3** ([commit](https://github.com/rails/rails/commit/a0380e808d3dbd2462df17f5d3b7fcd8bd812496)) - Ruby 2.0 preferred; 1.9.3+ required
63-
* **[New deprecation policy](http://www.youtube.com/watch?v=z6YgD6tVPQs)** - Deprecated features are warnings in Rails 4.0 and will be removed in Rails 4.1.
63+
* **[New deprecation policy](https://www.youtube.com/watch?v=z6YgD6tVPQs)** - Deprecated features are warnings in Rails 4.0 and will be removed in Rails 4.1.
6464
* **ActionPack page and action caching** ([commit](https://github.com/rails/rails/commit/b0a7068564f0c95e7ef28fc39d0335ed17d93e90)) - Page and action caching are extracted to a separate gem. Page and action caching requires too much manual intervention (manually expiring caches when the underlying model objects are updated). Instead, use Russian doll caching.
6565
* **ActiveRecord observers** ([commit](https://github.com/rails/rails/commit/ccecab3ba950a288b61a516bf9b6962e384aae0b)) - Observers are extracted to a separate gem. Observers are only needed for page and action caching, and can lead to spaghetti code.
6666
* **ActiveRecord session store** ([commit](https://github.com/rails/rails/commit/0ffe19056c8e8b2f9ae9d487b896cad2ce9387ad)) - The ActiveRecord session store is extracted to a separate gem. Storing sessions in SQL is costly. Instead, use cookie sessions, memcache sessions, or a custom session store.

guides/source/action_controller_overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ What Does a Controller Do?
2323

2424
Action Controller is the C in MVC. After the router has determined which controller to use for a request, the controller is responsible for making sense of the request and producing the appropriate output. Luckily, Action Controller does most of the groundwork for you and uses smart conventions to make this as straightforward as possible.
2525

26-
For most conventional [RESTful](http://en.wikipedia.org/wiki/Representational_state_transfer) applications, the controller will receive the request (this is invisible to you as the developer), fetch or save data from a model and use a view to create HTML output. If your controller needs to do things a little differently, that's not a problem, this is just the most common way for a controller to work.
26+
For most conventional [RESTful](https://en.wikipedia.org/wiki/Representational_state_transfer) applications, the controller will receive the request (this is invisible to you as the developer), fetch or save data from a model and use a view to create HTML output. If your controller needs to do things a little differently, that's not a problem, this is just the most common way for a controller to work.
2727

2828
A controller can thus be thought of as a middleman between models and views. It makes the model data available to the view so it can display that data to the user, and it saves or updates user data to the model.
2929

guides/source/active_record_basics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ After reading this guide, you will know:
2020
What is Active Record?
2121
----------------------
2222

23-
Active Record is the M in [MVC](http://en.wikipedia.org/wiki/Model%E2%80%93view%E2%80%93controller) - the
23+
Active Record is the M in [MVC](https://en.wikipedia.org/wiki/Model%E2%80%93view%E2%80%93controller) - the
2424
model - which is the layer of the system responsible for representing business
2525
data and logic. Active Record facilitates the creation and use of business
2626
objects whose data requires persistent storage to a database. It is an

guides/source/active_record_migrations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Migration Overview
2121
------------------
2222

2323
Migrations are a convenient way to
24-
[alter your database schema over time](http://en.wikipedia.org/wiki/Schema_migration)
24+
[alter your database schema over time](https://en.wikipedia.org/wiki/Schema_migration)
2525
in a consistent and easy way. They use a Ruby DSL so that you don't have to
2626
write SQL by hand, allowing your schema and changes to be database independent.
2727

guides/source/active_record_querying.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1539,7 +1539,7 @@ Read the full documentation about enums
15391539
Understanding The Method Chaining
15401540
---------------------------------
15411541

1542-
The Active Record pattern implements [Method Chaining](http://en.wikipedia.org/wiki/Method_chaining),
1542+
The Active Record pattern implements [Method Chaining](https://en.wikipedia.org/wiki/Method_chaining),
15431543
which allow us to use multiple Active Record methods together in a simple and straightforward way.
15441544

15451545
You can chain methods in a statement when the previous method called returns an

guides/source/api_app.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ Handled at the middleware layer:
6666
about the request environment, database queries, and basic performance
6767
information.
6868
- Security: Rails detects and thwarts [IP spoofing
69-
attacks](http://en.wikipedia.org/wiki/IP_address_spoofing) and handles
69+
attacks](https://en.wikipedia.org/wiki/IP_address_spoofing) and handles
7070
cryptographic signatures in a [timing
71-
attack](http://en.wikipedia.org/wiki/Timing_attack) aware way. Don't know what
71+
attack](https://en.wikipedia.org/wiki/Timing_attack) aware way. Don't know what
7272
an IP spoofing attack or a timing attack is? Exactly.
7373
- Parameter Parsing: Want to specify your parameters as JSON instead of as a
7474
URL-encoded String? No problem. Rails will decode the JSON for you and make

guides/source/api_documentation_guidelines.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,12 @@ used. Instead of:
8282
English
8383
-------
8484

85-
Please use American English (*color*, *center*, *modularize*, etc). See [a list of American and British English spelling differences here](http://en.wikipedia.org/wiki/American_and_British_English_spelling_differences).
85+
Please use American English (*color*, *center*, *modularize*, etc). See [a list of American and British English spelling differences here](https://en.wikipedia.org/wiki/American_and_British_English_spelling_differences).
8686

8787
Oxford Comma
8888
------------
8989

90-
Please use the [Oxford comma](http://en.wikipedia.org/wiki/Serial_comma)
90+
Please use the [Oxford comma](https://en.wikipedia.org/wiki/Serial_comma)
9191
("red, white, and blue", instead of "red, white and blue").
9292

9393
Example Code

guides/source/asset_pipeline.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ it would make sense to have an image in one of the asset load paths, such as
383383
already available in `public/assets` as a fingerprinted file, then that path is
384384
referenced.
385385

386-
If you want to use a [data URI](http://en.wikipedia.org/wiki/Data_URI_scheme) -
386+
If you want to use a [data URI](https://en.wikipedia.org/wiki/Data_URI_scheme) -
387387
a method of embedding the image data directly into the CSS file - you can use
388388
the `asset_data_uri` helper.
389389

@@ -861,7 +861,7 @@ end
861861
### CDNs
862862

863863
CDN stands for [Content Delivery
864-
Network](http://en.wikipedia.org/wiki/Content_delivery_network), they are
864+
Network](https://en.wikipedia.org/wiki/Content_delivery_network), they are
865865
primarily designed to cache assets all over the world so that when a browser
866866
requests the asset, a cached copy will be geographically close to that browser.
867867
If you are serving assets directly from your Rails server in production, the
@@ -909,7 +909,7 @@ domain, you do not need to specify a protocol or "scheme" such as `http://` or
909909
that is generated will match how the webpage is accessed by default.
910910

911911
You can also set this value through an [environment
912-
variable](http://en.wikipedia.org/wiki/Environment_variable) to make running a
912+
variable](https://en.wikipedia.org/wiki/Environment_variable) to make running a
913913
staging copy of your site easier:
914914

915915
```

guides/source/development_dependencies_install.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ For FreeBSD users, you're done with:
8080

8181
Or compile the `databases/sqlite3` port.
8282

83-
Get a recent version of [Bundler](http://bundler.io/)
83+
Get a recent version of [Bundler](https://bundler.io/)
8484

8585
```bash
8686
$ gem install bundler

guides/source/getting_started.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ of the files and folders that Rails created by default:
174174
|config/|Configure your application's routes, database, and more. This is covered in more detail in [Configuring Rails Applications](configuring.html).|
175175
|config.ru|Rack configuration for Rack based servers used to start the application.|
176176
|db/|Contains your current database schema, as well as the database migrations.|
177-
|Gemfile<br>Gemfile.lock|These files allow you to specify what gem dependencies are needed for your Rails application. These files are used by the Bundler gem. For more information about Bundler, see the [Bundler website](http://bundler.io).|
177+
|Gemfile<br>Gemfile.lock|These files allow you to specify what gem dependencies are needed for your Rails application. These files are used by the Bundler gem. For more information about Bundler, see the [Bundler website](https://bundler.io).|
178178
|lib/|Extended modules for your application.|
179179
|log/|Application log files.|
180180
|public/|The only folder seen by the world as-is. Contains static files and compiled assets.|
@@ -309,7 +309,7 @@ end
309309
```
310310

311311
This is your application's _routing file_ which holds entries in a special
312-
[DSL (domain-specific language)](http://en.wikipedia.org/wiki/Domain-specific_language)
312+
[DSL (domain-specific language)](https://en.wikipedia.org/wiki/Domain-specific_language)
313313
that tells Rails how to connect incoming requests to
314314
controllers and actions.
315315
Edit this file by adding the line of code `root 'welcome#index'`.

guides/source/i18n.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ In general, this approach is far less reliable than using the language header an
310310

311311
#### Storing the Locale from the Session or Cookies
312312

313-
WARNING: You may be tempted to store the chosen locale in a _session_ or a *cookie*. However, **do not do this**. The locale should be transparent and a part of the URL. This way you won't break people's basic assumptions about the web itself: if you send a URL to a friend, they should see the same page and content as you. A fancy word for this would be that you're being [*RESTful*](http://en.wikipedia.org/wiki/Representational_State_Transfer). Read more about the RESTful approach in [Stefan Tilkov's articles](http://www.infoq.com/articles/rest-introduction). Sometimes there are exceptions to this rule and those are discussed below.
313+
WARNING: You may be tempted to store the chosen locale in a _session_ or a *cookie*. However, **do not do this**. The locale should be transparent and a part of the URL. This way you won't break people's basic assumptions about the web itself: if you send a URL to a friend, they should see the same page and content as you. A fancy word for this would be that you're being [*RESTful*](https://en.wikipedia.org/wiki/Representational_State_Transfer). Read more about the RESTful approach in [Stefan Tilkov's articles](https://www.infoq.com/articles/rest-introduction). Sometimes there are exceptions to this rule and those are discussed below.
314314

315315
Internationalization and Localization
316316
-----------------------------------
@@ -1201,7 +1201,7 @@ Authors
12011201
Footnotes
12021202
---------
12031203

1204-
[^1]: Or, to quote [Wikipedia](http://en.wikipedia.org/wiki/Internationalization_and_localization): _"Internationalization is the process of designing a software application so that it can be adapted to various languages and regions without engineering changes. Localization is the process of adapting software for a specific region or language by adding locale-specific components and translating text."_
1204+
[^1]: Or, to quote [Wikipedia](https://en.wikipedia.org/wiki/Internationalization_and_localization): _"Internationalization is the process of designing a software application so that it can be adapted to various languages and regions without engineering changes. Localization is the process of adapting software for a specific region or language by adding locale-specific components and translating text."_
12051205

12061206
[^2]: Other backends might allow or require to use other formats, e.g. a GetText backend might allow to read GetText files.
12071207

guides/source/layout.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<li class="more-info"><a href="http://weblog.rubyonrails.org/">Blog</a></li>
3333
<li class="more-info"><a href="http://guides.rubyonrails.org/">Guides</a></li>
3434
<li class="more-info"><a href="http://api.rubyonrails.org/">API</a></li>
35-
<li class="more-info"><a href="http://stackoverflow.com/questions/tagged/ruby-on-rails">Ask for help</a></li>
35+
<li class="more-info"><a href="https://stackoverflow.com/questions/tagged/ruby-on-rails">Ask for help</a></li>
3636
<li class="more-info"><a href="https://github.com/rails/rails">Contribute on GitHub</a></li>
3737
</ul>
3838
</div>

guides/source/testing.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1064,9 +1064,9 @@ end
10641064

10651065
### Setting Headers and CGI variables
10661066

1067-
[HTTP headers](http://tools.ietf.org/search/rfc2616#section-5.3)
1067+
[HTTP headers](https://tools.ietf.org/search/rfc2616#section-5.3)
10681068
and
1069-
[CGI variables](http://tools.ietf.org/search/rfc3875#section-4.1)
1069+
[CGI variables](https://tools.ietf.org/search/rfc3875#section-4.1)
10701070
can be passed as headers:
10711071

10721072
```ruby

guides/source/upgrading_ruby_on_rails.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1106,7 +1106,7 @@ on the Rails blog.
11061106

11071107
The errata for the `PATCH` verb [specifies that a 'diff' media type should be
11081108
used with `PATCH`](http://www.rfc-editor.org/errata_search.php?rfc=5789). One
1109-
such format is [JSON Patch](http://tools.ietf.org/html/rfc6902). While Rails
1109+
such format is [JSON Patch](https://tools.ietf.org/html/rfc6902). While Rails
11101110
does not support JSON Patch natively, it's easy enough to add support:
11111111

11121112
```
@@ -1310,7 +1310,7 @@ get 'こんにちは', controller: 'welcome', action: 'index'
13101310
get '/' => 'root#index'
13111311
```
13121312

1313-
* Rails 4.0 has removed `ActionDispatch::BestStandardsSupport` middleware, `<!DOCTYPE html>` already triggers standards mode per http://msdn.microsoft.com/en-us/library/jj676915(v=vs.85).aspx and ChromeFrame header has been moved to `config.action_dispatch.default_headers`.
1313+
* Rails 4.0 has removed `ActionDispatch::BestStandardsSupport` middleware, `<!DOCTYPE html>` already triggers standards mode per https://msdn.microsoft.com/en-us/library/jj676915(v=vs.85).aspx and ChromeFrame header has been moved to `config.action_dispatch.default_headers`.
13141314

13151315
Remember you must also remove any references to the middleware from your application code, for example:
13161316

guides/source/working_with_javascript_in_rails.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ attributes to accomplish this.
256256
#### `data-method`
257257

258258
Activating hyperlinks always results in an HTTP GET request. However, if your
259-
application is [RESTful](http://en.wikipedia.org/wiki/Representational_State_Transfer),
259+
application is [RESTful](https://en.wikipedia.org/wiki/Representational_State_Transfer),
260260
some links are in fact actions that change data on the server, and must be
261261
performed with non-GET requests. This attribute allows marking up such links
262262
with an explicit method such as "post", "put" or "delete".

0 commit comments

Comments
 (0)