Skip to content

Update dependencies and fix couple lint issues #195

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 1 commit into from
Jan 7, 2016
Merged

Update dependencies and fix couple lint issues #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion client/app/bundles/comments/components/CommentBox/CommentBox.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ export default class CommentBox extends BaseComponent {
Comments {data.get('isFetching') && 'Loading...'}
</h2>
<p>
<b>Text</b> supports Github Flavored Markdown. Comments older than 24 hours are deleted.<br/>
<b>Text</b> supports Github Flavored Markdown.
Comments older than 24 hours are deleted.<br/>
<b>Name</b> is preserved. <b>Text</b> is reset, between submits.
</p>
<CommentForm
Expand Down
29 changes: 17 additions & 12 deletions client/npm-shrinkwrap.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"css-loader": "^0.23.0",
"es5-shim": "^4.3.1",
"expose-loader": "^0.7.1",
"extract-text-webpack-plugin": "^0.9.1",
"extract-text-webpack-plugin": "^1.0.1",
"file-loader": "^0.8.4",
"history": "^1.13.1",
"immutable": "^3.7.5",
Expand Down Expand Up @@ -88,7 +88,7 @@
"chai": "^3.4.1",
"chai-immutable": "^1.5.3",
"eslint": "^1.10.3",
"eslint-config-airbnb": "^2.0.0",
"eslint-config-airbnb": "^3.0.2",
"eslint-plugin-react": "^3.11.3",
"express": "^4.13.3",
"jade": "^1.11.0",
Expand Down
5 changes: 4 additions & 1 deletion client/webpack.client.rails.build.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,10 @@ config.module.loaders.push(
'!sass-resources'
),
},
{ test: require.resolve('react'), loader: 'imports?shim=es5-shim/es5-shim&sham=es5-shim/es5-sham' }
{
test: require.resolve('react'),
loader: 'imports?shim=es5-shim/es5-shim&sham=es5-shim/es5-sham',
}
);

config.plugins.push(
Expand Down