Skip to content

Commit 6bcf72f

Browse files
committed
Trigger CI again
2 parents 783fa74 + 1174ab5 commit 6bcf72f

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

KUDOS.md

+6
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,9 @@ https://twitter.com/ollieglass/status/713372606804729856
2525
![2016-06-15_08-57-25](https://cloud.githubusercontent.com/assets/1118459/16093324/33077310-32d7-11e6-88f3-69aa73bd7d9f.png)
2626

2727
![2016-09-11_17-55-46](https://cloud.githubusercontent.com/assets/1118459/18424209/0c8bdade-7849-11e6-96a7-3b58b26308ce.png)
28+
29+
### October 29, 2016 by Email
30+
![2016-10-29_17-10-25](https://cloud.githubusercontent.com/assets/1118459/20163712/72307a82-a6b3-11e6-9c46-aee526192b23.png)
31+
32+
### November 9, 2016, in our Slack Room for ShakaCode
33+
![2016-11-09_19-28-32](https://cloud.githubusercontent.com/assets/1118459/20163679/405229ca-a6b3-11e6-8dff-6dc3f59bf341.png)

README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ We're definitely not doing that. With react_on_rails, webpack is mainly generati
8989
## Getting Started
9090

9191
**For more detailed instructions**, see the [React on Rails Basic Tutorial](docs/tutorial.md).
92-
1. Add the following to your Gemfile and bundle install.
92+
93+
1. Add the following to your Gemfile and `bundle install`.
9394

9495
```ruby
9596
gem "react_on_rails", "~> 6"
@@ -434,7 +435,7 @@ See [ReactOnRails JavaScript API](docs/api/javascript-api.md).
434435

435436
#### Using Rails built-in CSRF protection in JavaScript
436437

437-
Rails has built-in protection for Cross-Site Request Forgery (CSRF), see [Rails Documentation](http://guides.rubyonrails.org/security.html#cross-site-request-forgery-csrf). To nicely utilize this feature in JavaScript requests, React on Rails is offerring two helpers that can be used as following for POST, PULL or DELETE requests:
438+
Rails has built-in protection for Cross-Site Request Forgery (CSRF), see [Rails Documentation](http://guides.rubyonrails.org/security.html#cross-site-request-forgery-csrf). To nicely utilize this feature in JavaScript requests, React on Rails is offerring two helpers that can be used as following for POST, PUT or DELETE requests:
438439

439440
```js
440441
import ReactOnRails from 'react-on-rails';

docs/additional-reading/hot-reloading-rails-development.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
This document outlines the steps to setup your React On Rails Environment so that you can experience the pleasure of hot reloading of JavaScript and Sass during your Rails development work. There are 2 examples of this setup:
44

5-
1. [spec/dummy](../../spec/dummy): Simpler setup used for integration testing this gem.
5+
1. [spec/dummy](https://github.com/shakacode/react_on_rails/tree/master/spec/dummy): Simpler setup used for integration testing this gem.
66
1. [shakacode/react-webpack-rails-tutorial](https://github.com/shakacode/react-webpack-rails-tutorial/). Full featured setup using Twitter bootstrap.
77

88
## High Level Strategy

docs/basics/installation-overview.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Here's an overview of installation if you're not using the generator.
44

5-
Note, the best to understand how to use ReactOnRails is to study the examples:
5+
Note, the best way to understand how to use ReactOnRails is to study the examples:
66

77
1. [spec/dummy](../../spec/dummy): Simple, no DB example.
88
2. [github.com/shakacode/react-webpack-rails-tutorial](https://github.com/shakacode/react-webpack-rails-tutorial): Full featured example.

0 commit comments

Comments
 (0)