Skip to content

Update dependencies #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 14, 2016
Merged

Update dependencies #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e34691
tests passing, react_on_rails 2.0.0
justin808 Jan 14, 2016
3ac263f
updated npm dependencies, tests pass
justin808 Jan 14, 2016
6d364af
remove link from header
justin808 Jan 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ gem "sdoc", group: :doc
# Use Rails Html Sanitizer for HTML sanitization
gem "rails-html-sanitizer"

gem "react_on_rails", "2.0.0.rc.4"
gem "react_on_rails", "2.0.0"

# See https://github.com/sstephenson/execjs#readme for more supported runtimes
gem "therubyracer"
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ GEM
rainbow (2.0.0)
rake (10.4.2)
rdoc (4.2.0)
react_on_rails (2.0.0.rc.4)
react_on_rails (2.0.0)
connection_pool
execjs (~> 2.5)
rails (>= 3.2)
Expand Down Expand Up @@ -347,7 +347,7 @@ DEPENDENCIES
rails-html-sanitizer
rails_12factor
rainbow
react_on_rails (= 2.0.0.rc.4)
react_on_rails (= 2.0.0)
rspec-rails
rspec-retry
rubocop
Expand Down
2 changes: 0 additions & 2 deletions app/views/layouts/application.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
<li><%= link_to "React Demo", no_router_path %></li>
<li><%= link_to "Simple React", simple_path %></li>
<li><%= link_to "Classic Rails", comments_path %></li>
<li><%= link_to "www.shakacode.com", "http://www.shakacode.com" %></li>
<li><%= link_to "Source on Github", "https://github.com/shakacode/react-webpack-rails-tutorial" %></li>
<li><%= link_to "Tutorial Article", "http://www.railsonmaui.com/blog/2014/10/03/integrating-webpack-and-the-es6-transpiler-into-an-existing-rails-project/" %></li>
<li><%= link_to "Forum Discussion", "http://forum.shakacode.com/t/fast-rich-client-rails-development-with-webpack-and-the-es6-transpiler/82/22" %></li>
Expand All @@ -37,7 +36,6 @@
</div><!-- /.container-fluid -->
</nav>


<div class="container">
<%= yield %>
</div>
Expand Down
2 changes: 1 addition & 1 deletion client/app/bundles/comments/layout/Layout.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export default class Layout extends React.Component {

static propTypes = {
children: PropTypes.object.isRequired,
}
};

render() {
return (
Expand Down
Loading