Skip to content
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

Jump to bottom

Add support for single digit version strings, closes #489 #491

Merged
merged 1 commit into from
Aug 1, 2016
Merged

Add support for single digit version strings, closes #489 #491

merged 1 commit into from
Aug 1, 2016

Conversation

samsondav
Copy link
Contributor

@samsondav samsondav commented Jul 27, 2016 •
edited by justin808
Loading

This change is Reviewable

@justin808
Copy link
Member

👍 Thanks @samphilipd!

Looks 💯.

I'll merge and release once this passes CI.

@justin808
Copy link
Member

@samphilipd One small request:

Provide changelog entry in the unreleased section of the CHANGELOG.md.

Per https://github.com/shakacode/react_on_rails/blob/master/docs/contributor-info/contributing.md

Please squash and push commit on top of master and I'll merge and release.

Thanks again @samphilipd!

@justin808
Copy link
Member

@samphilipd can you please rebase your commit on top of master and take a look a the ci results:

2016-07-29_15-29-28

@coveralls
Copy link

Coverage Status

Coverage increased (+0.02%) to 82.329% when pulling 6279887 on samphilipd:master into cdb246b on shakacode:master.

@justin808
Copy link
Member

@samphilipd Can you please rebase this on top of master and then I can merge this and cut a release.

@samsondav
Copy link
Contributor Author

Hi @justin808 I don't understand what you're asking, I have rebased on top of master?

@justin808
Copy link
Member

@samnang A number of changes have gone in since you did that.
2016-07-31_22-02-30

@samsondav
Copy link
Contributor Author

@justin808 I think I fixed it?

@coveralls
Copy link

Coverage Status

Coverage increased (+0.02%) to 82.293% when pulling d694df8 on samphilipd:master into b4cdfd2 on shakacode:master.

@justin808
Copy link
Member

Thanks @samphilipd!

@justin808 justin808 merged commit 63436ab into shakacode:master Aug 1, 2016
eacaps added a commit to eacaps/react_on_rails that referenced this pull request Aug 2, 2016
@eacaps
Squashed commit of the following:
ec97365 
commit 7d4e7fe
Merge: cb9fab4 3c0e6d9
Author: eacaps <[email protected]>
Date:   Mon Aug 1 11:46:35 2016 -0400

    Merge branch 'feature/no-request-context' of github.com:eacaps/react_on_rails into feature/no-request-context

commit cb9fab4
Author: eacaps <[email protected]>
Date:   Thu Jul 21 13:23:51 2016 -0400

    allow component rendering in contexts without requests

    allow custom_context even without request

    added broken test

    added fixes to allow actionmailer test to pass

    cleaned up rubocop warnings

    resolved some reviewed suggestions

    updated with proper handles for inMailer

    added inMailer to test

    added inMailer checks for test

    cleaned up rubocop suggestions

    a few final minor tweaks

commit 3c0e6d9
Merge: 5637162 63436ab
Author: eacaps <[email protected]>
Date:   Mon Aug 1 10:44:59 2016 -0400

    Merge branch 'master' into feature/no-request-context

commit 5637162
Author: eacaps <[email protected]>
Date:   Mon Aug 1 10:35:40 2016 -0400

    a few final minor tweaks

commit 63436ab
Merge: b4cdfd2 d694df8
Author: Justin Gordon <[email protected]>
Date:   Sun Jul 31 23:01:59 2016 -1000

    Merge pull request shakacode#491 from samphilipd/master

    Add support for single digit version strings, closes shakacode#489

commit d694df8
Author: Sam Davies <[email protected]>
Date:   Wed Jul 27 10:52:49 2016 +0100

    Add support for single digit version strings, closes shakacode#489

commit b4cdfd2
Author: Justin Gordon <[email protected]>
Date:   Sun Jul 31 21:25:57 2016 -1000

    Update README.md

commit 8824b88
Merge: e449d84 442dcd4
Author: Justin Gordon <[email protected]>
Date:   Sun Jul 31 21:25:35 2016 -1000

    Merge pull request shakacode#503 from markpenovich/master

    fixed spelling error

commit 442dcd4
Author: Mark Penovich <[email protected]>
Date:   Sun Jul 31 23:47:20 2016 -0500

    fixed spelling error in readme

commit e449d84
Merge: 95efecd 8cec9cf
Author: Justin Gordon <[email protected]>
Date:   Sun Jul 31 15:49:11 2016 -1000

    Merge pull request shakacode#497 from shakacode/justin808-skip-docker

    Remove docker from CI tests .travis.yml

commit 95efecd
Merge: 46ecf59 ef08742
Author: Justin Gordon <[email protected]>
Date:   Sun Jul 31 15:48:51 2016 -1000

    Merge pull request shakacode#502 from shakacode/move-contributing-to-top-level

    Move CONTRIBUTING.MD to project top level

commit ef08742
Author: Justin Gordon <[email protected]>
Date:   Sun Jul 31 15:06:11 2016 -1000

    Move CONTRIBUTING.MD to project top level

    This seems to make it show more prominently when making new issues or
    PRs.

commit 46ecf59
Merge: cdb246b a6e35fe
Author: Justin Gordon <[email protected]>
Date:   Sun Jul 31 15:42:20 2016 -1000

    Merge pull request shakacode#479 from shakacode/alleycat-at-git-alexey/replace_symlinks_copy

    * Enhancements to webpack asset preparation
    * Better messages when creating symlinks
    * Updated documentation
    * Enhanced example
    * Support subdirectories with webpack assets
    * Move logic for assets code to service object
    * Using defaults of the env settings or else values for directories and
      regexp can be provided.

commit 8cec9cf
Author: Justin Gordon <[email protected]>
Date:   Fri Jul 29 15:34:10 2016 -1000

    Remove Docker from setup

    * Update .travis.yml
    * Remove Dockerfile_tests and docker-compose.yml

commit a6e35fe
Author: dzirtusss <[email protected]>
Date:   Tue Jul 26 18:43:20 2016 +0300

    Update assets_precompile_spec.rb

    symlink tests with tempfs

commit 07a6e48
Author: Justin Gordon <[email protected]>
Date:   Sun Jul 17 23:23:03 2016 -1000

    Enhancements to webpack asset preparation

    * Better messages when creating symlinks
    * Updated documentation
    * Enhanced example
    * Support subdirectories with webpack assets
    * Move logic for assets code to service object
    * Using defaults of the env settings or else values for directories and
      regexp can be provided.

commit cdb246b
Author: Justin Gordon <[email protected]>
Date:   Sat Jul 30 12:30:33 2016 -1000

    Doc Fixes (shakacode#499)

    * Update node-server-rendering.md
    * Update README.md

commit 1e4c0ed
Author: Justin Gordon <[email protected]>
Date:   Sat Jul 30 11:16:25 2016 -1000

    Update README.md

commit 13f2cf0
Author: Justin Gordon <[email protected]>
Date:   Thu Jul 28 13:38:29 2016 -1000

    Update server-rendering-tips.md (shakacode#494)

    Update server-rendering-tips.md and README.md

commit 0604006
Merge: 8ca86ed e69480a
Author: Justin Gordon <[email protected]>
Date:   Wed Jul 27 22:14:17 2016 -1000

    Merge pull request shakacode#492 from cubadomingo/patch-1

    Fixes typo

commit e69480a
Author: Devin Osorio <[email protected]>
Date:   Wed Jul 27 22:34:13 2016 -0400

    Fixes typo

commit 566d62f
Author: eacaps <[email protected]>
Date:   Mon Jul 25 12:59:44 2016 -0400

    cleaned up rubocop suggestions

commit e24fb9f
Author: eacaps <[email protected]>
Date:   Mon Jul 25 11:28:56 2016 -0400

    added inMailer checks for test

commit eb6e700
Author: eacaps <[email protected]>
Date:   Mon Jul 25 11:14:41 2016 -0400

    added inMailer to test

commit 8d34353
Author: eacaps <[email protected]>
Date:   Mon Jul 25 10:41:35 2016 -0400

    updated with proper handles for inMailer

commit 52f0cbb
Merge: 840bc62 8ca86ed
Author: eacaps <[email protected]>
Date:   Mon Jul 25 10:27:23 2016 -0400

    Merge branch 'master' into feature/no-request-context

commit 8ca86ed
Merge: 9a8b54f 0257cae
Author: Justin Gordon <[email protected]>
Date:   Fri Jul 22 21:35:57 2016 -1000

    Merge pull request shakacode#487 from jooohn/fix/typo-in-readme

    fix(typo) remove duplicated word in readme

commit 0257cae
Author: jooohn <[email protected]>
Date:   Sat Jul 23 13:12:37 2016 +0900

    fix(typo) remove duplicated word in readme

commit 840bc62
Author: eacaps <[email protected]>
Date:   Fri Jul 22 09:57:28 2016 -0400

    resolved some reviewed suggestions

commit 9b958fb
Merge: 6fdb73a 9a8b54f
Author: eacaps <[email protected]>
Date:   Fri Jul 22 09:56:35 2016 -0400

    Merge branch 'master' into feature/no-request-context

commit 9a8b54f
Merge: e6afa98 4890486
Author: Justin Gordon <[email protected]>
Date:   Thu Jul 21 17:42:32 2016 -1000

    Merge pull request shakacode#483 from shakacode/justin808-inaccurate-build-test-message

    Update ensure_assets_compiled.rb

commit 6fdb73a
Author: eacaps <[email protected]>
Date:   Thu Jul 21 16:35:42 2016 -0400

    cleaned up rubocop warnings

commit d99fc36
Author: eacaps <[email protected]>
Date:   Thu Jul 21 14:46:20 2016 -0400

    added fixes to allow actionmailer test to pass

commit 05d3144
Author: eacaps <[email protected]>
Date:   Thu Jul 21 14:31:19 2016 -0400

    added broken test

commit 610906e
Author: eacaps <[email protected]>
Date:   Thu Jul 21 13:25:42 2016 -0400

    allow custom_context even without request

commit 1e9d58c
Author: eacaps <[email protected]>
Date:   Thu Jul 21 13:23:51 2016 -0400

    allow component rendering in contexts without requests

commit 4890486
Author: Justin Gordon <[email protected]>
Date:   Wed Jul 20 19:55:39 2016 -1000

    Update ensure_assets_compiled.rb
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
ready to merge waiting for submitter
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@samsondav @justin808 @coveralls