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.

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

coalaOnline: Add support for optional settings #206

Merged
merged 3 commits into from Aug 15, 2017
Merged

coalaOnline: Add support for optional settings #206

merged 3 commits into from Aug 15, 2017

Conversation

hemangsk
Copy link
Member

@hemangsk hemangsk commented Aug 8, 2017

screen shot 2017-08-08 at 5 26 18 am
screen shot 2017-08-08 at 5 27 34 am

For short term contributors: we understand that getting your commits well
defined like we require is a hard task and takes some learning. If you
look to help without wanting to contribute long term there's no need
for you to learn this. Just drop us a message and we'll take care of brushing
up your stuff for merge!

Checklist

  • I read the commit guidelines and I've followed
    them.
  • I ran coala over my code locally. (All commits have to pass
    individually.
    It is not sufficient to have "fixup commits" on your PR,
    our bot will still report the issues for the previous commit.) You will
    likely receive a lot of bot comments and build failures if coala does not
    pass on every single commit!

After you submit your pull request, DO NOT click the 'Update Branch' button.
When asked for a rebase, consult coala.io/rebase
instead.

Please consider helping us by reviewing other peoples pull requests as well:

The more you review, the more your score will grow at coala.io and we will
review your PRs faster!

@@ -117,31 +117,47 @@
<div btf-markdown="currentBear.metadata.desc" class="description">

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line contains following spacing inconsistencies:

  • Trailing whitespaces.

Origin: SpaceConsistencyBear, Section: spacing.

The issue can be fixed by applying the following patch:

--- a/partials/tabs/languages.html
+++ b/partials/tabs/languages.html
@@ -122,7 +122,7 @@
               <div class="small-heading">SETTINGS</div>
 
               <br>
-              
+
               <div class="settings">
                 <span class="settings-options">
                   <i class="fa fa-square light-blue-text text-accent-3" aria-hidden="true"></i>

@@ -117,31 +117,47 @@
<div btf-markdown="currentBear.metadata.desc" class="description">

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Trailing Whitespace: Trailing white spaces are unnecessary and can complicate diffs: Remove the ' ' at the end of the line.

Origin: HTMLLintBear, Section: html.

@hemangsk hemangsk changed the title Hemangsk/fix WIP: Hemangsk/fix Aug 8, 2017
@sils
Copy link
Member

sils commented Aug 8, 2017

right align the setting names please

@hemangsk
Copy link
Member Author

Screenshot with Right Alignment
screen shot 2017-08-13 at 9 27 41 am

@hemangsk hemangsk changed the title WIP: Hemangsk/fix coalaOnline: Add support for optional settings Aug 13, 2017
@hemangsk hemangsk force-pushed the hemangsk/fix branch 2 times, most recently from 87be301 to 052539a Compare August 13, 2017 16:05
@hemangsk
Copy link
Member Author

Improved Section Card
screen shot 2017-08-13 at 9 40 05 pm

Ability to enter optional settings
screen shot 2017-08-13 at 9 40 20 pm

}
if (match_by_lang == 1) {
for (var x = 0; x < bears.length; x++) {
var found = returnArray.some(function (el) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this seems overly complicated, why don't you just return all bears that have the language listed plus all that have the all listed and just ignore the returnArray?

@sils
Copy link
Member

sils commented Aug 15, 2017

ack e5b8505 eb1d563 6d09ae9

@sils
Copy link
Member

sils commented Aug 15, 2017

@rultor merge

@rultor
Copy link

rultor commented Aug 15, 2017

@rultor merge

@sils OK, I'll try to merge now. You can check the progress of the merge here

@rultor
Copy link

rultor commented Aug 15, 2017

@rultor merge

@hemangsk @sils Oops, I failed. You can see the full log here (spent 2min)

Home: ~/.gnupg
Supported algorithms:
Pubkey: RSA, RSA-E, RSA-S, ELG-E, DSA
Cipher: IDEA, 3DES, CAST5, BLOWFISH, AES, AES192, AES256, TWOFISH,
        CAMELLIA128, CAMELLIA192, CAMELLIA256
Hash: MD5, SHA1, RIPEMD160, SHA256, SHA384, SHA512, SHA224
Compression: Uncompressed, ZIP, ZLIB, BZIP2
++ pwd
++ pwd
+ gpg --verbose --keyring=/tmp/rultor-DC3y/.gpg/pubring.gpg --secret-keyring=/tmp/rultor-DC3y/.gpg/secring.gpg --decrypt repo/.ci/rultor_github_secrets.sh.asc
gpg: public key is 9A839C3A
gpg: using subkey 9A839C3A instead of primary key 9AF0FA4C
gpg: using subkey 9A839C3A instead of primary key 9AF0FA4C
gpg: encrypted with 2048-bit RSA key, ID 9A839C3A, created 2014-08-17
      "Rultor.com <gpg@rultor.com>"
gpg: AES256 encrypted data
gpg: original file name='rultor-0HHV'
+ gpg --no-tty --batch --verbose --decrypt --passphrase rultor-key:coala/landing-frontend rultor_github_secrets.sh.enc
gpg: AES encrypted data
gpg: gpg-agent is not available in this session
gpg: encrypted with 1 passphrase
gpg: original file name='rultor_github_secrets.sh'
+ rm -rf rultor_github_secrets.sh.enc
+ rm -rf .gpg
+ cd repo
+ git remote add fork git@github.com:coala/landing-frontend.git
+ git remote update
Fetching origin
Fetching fork
From github.com:coala/landing-frontend
 * [new branch]      adtac/rultor-maint-check -> fork/adtac/rultor-maint-check
 * [new branch]      gh-pages   -> fork/gh-pages
 * [new branch]      hemangsk/fix -> fork/hemangsk/fix
 * [new branch]      master     -> fork/master
 * [new branch]      sils/coala-bears -> fork/sils/coala-bears
 * [new branch]      sils/nosent -> fork/sils/nosent
 * [new branch]      sils/tr    -> fork/sils/tr
+ args=
+ '[' only == default ']'
+ '[' only == no ']'
+ '[' only == only ']'
+ args=' --ff-only'
+ export BRANCH=__rultor
+ BRANCH=__rultor
++ git show-branch __rultor
++ wc -l
+ '[' 0 -gt 0 ']'
+ git checkout -B __rultor fork/hemangsk/fix
Switched to a new branch '__rultor'
Branch __rultor set up to track remote branch hemangsk/fix from fork.
+ git checkout -B master origin/master
Switched to and reset branch 'master'
Branch master set up to track remote branch master from origin.
Your branch is up-to-date with 'origin/master'.
+ '[' false == true ']'
+ '[' false == true ']'
+ git merge --ff-only __rultor
fatal: Not possible to fast-forward, aborting.
'cid' file is absent, container wasn't started correctly

@sils
Copy link
Member

sils commented Aug 15, 2017

@gitmate-bot rebase

@gitmate-bot
Copy link

Hey! This pull request is being rebased automatically. Please DO NOT push while rebase is in progress or your changes would be lost!

@sils
Copy link
Member

sils commented Aug 15, 2017

@gitmate-bot would you mind? A rebase please.

@gitmate-bot
Copy link

Hey! This pull request is being rebased automatically. Please DO NOT push while rebase is in progress or your changes would be lost!

@sils
Copy link
Member

sils commented Aug 15, 2017

@gitmate-bot would you mind? A rebase please.

@gitmate-bot
Copy link

Hey! This pull request is being rebased automatically. Please DO NOT push while rebase is in progress or your changes would be lost!

@gitmate-bot
Copy link

Automated rebase was successful!

@hemangsk
Copy link
Member Author

reack a48a08a faf3e0e 450332e

@sils
Copy link
Member

sils commented Aug 15, 2017

@rultor merge

1 similar comment
@hemangsk
Copy link
Member Author

@rultor merge

@rultor
Copy link

rultor commented Aug 15, 2017

@rultor merge

@sils OK, I'll try to merge now. You can check the progress of the merge here

@rultor
Copy link

rultor commented Aug 15, 2017

@rultor merge

@sils Done! FYI, the full log is here (took me 2min)

@rultor
Copy link

rultor commented Aug 15, 2017

@rultor merge

@hemangsk The pull request is closed already, so I can't merge it

@rultor
Copy link

rultor commented Aug 15, 2017

@rultor merge

@hemangsk I'm sorry, I don't understand you :( Check this page and try again please

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

None yet

4 participants