Skip to content

Fix rubocop parser warnings#4298

Merged
joshlory merged 2 commits into
stagingfrom
fix-rubocop-parser-warnings
Oct 2, 2015
Merged

Fix rubocop parser warnings#4298
joshlory merged 2 commits into
stagingfrom
fix-rubocop-parser-warnings

Conversation

@joshlory

@joshlory joshlory commented Oct 1, 2015

Copy link
Copy Markdown
Contributor

This change fixes the following warnings when running Rubocop:

$ bundle exec rubocop i18n/hourofcode.com/out.rb
Inspecting 1 file
/Users/joshlory/.rbenv/versions/2.0.0-p481/lib/ruby/gems/2.0.0/gems/parser-2.2.2.6/lib/parser/builders/default.rb:1409: warning: character class has '-' without escape: /(\---[^---]*\---)/
/Users/joshlory/.rbenv/versions/2.0.0-p481/lib/ruby/gems/2.0.0/gems/parser-2.2.2.6/lib/parser/builders/default.rb:1409: warning: character class has '-' without escape: /(\---[^---]*\---)/
/Users/joshlory/.rbenv/versions/2.0.0-p481/lib/ruby/gems/2.0.0/gems/parser-2.2.2.6/lib/parser/builders/default.rb:1409: warning: regular expression has ']' without escape: /\stwitter\[:hashtags]/
/Users/joshlory/.rbenv/versions/2.0.0-p481/lib/ruby/gems/2.0.0/gems/parser-2.2.2.6/lib/parser/builders/default.rb:1409: warning: regular expression has ']' without escape: /\stwitter\[:hashtags]/
/Users/joshlory/.rbenv/versions/2.0.0-p481/lib/ruby/gems/2.0.0/gems/parser-2.2.2.6/lib/parser/builders/default.rb:1409: warning: character class has '-' without escape: /^---[^---].*---/
/Users/joshlory/.rbenv/versions/2.0.0-p481/lib/ruby/gems/2.0.0/gems/parser-2.2.2.6/lib/parser/builders/default.rb:1409: warning: character class has '-' without escape: /^---[^---].*---/

Fixes cases where the metadata has a hyphen

Before: Metadata blocks containing hyphens are not matched.

irb(main):001:0> "---
irb(main):002:0" title: 'hour-of-code'
irb(main):003:0" ---".match /(\---[^---]*\---)/m
(irb):3: warning: character class has '-' without escape: /(\---[^---]*\---)/
(irb):3: warning: character class has '-' without escape: /(\---[^---]*\---)/
(irb):3: warning: character class has '-' without escape: /(\---[^---]*\---)/
(irb):3: warning: character class has '-' without escape: /(\---[^---]*\---)/
=> nil

After:

irb(main):004:0> "---
irb(main):005:0" title: 'hour-of-code'
irb(main):006:0" ---".match /(---.*?---)/m
=> #<MatchData "---\ntitle: 'hour-of-code'\n---" 1:"---\ntitle: 'hour-of-code'\n---">

Fixes cases where the file contains --- more than twice

Before: The regex eats everything between the first and very last ---.

irb(main):001:0> "---
irb(main):002:0" title: 123
irb(main):003:0" ---
irb(main):004:0" 
irb(main):005:0" puts 'this is a --- test'
irb(main):006:0" ".gsub(/^---[^---].*---/m, '---new metadata---')
(irb):6: warning: character class has '-' without escape: /^---[^---].*---/
(irb):6: warning: character class has '-' without escape: /^---[^---].*---/
(irb):6: warning: character class has '-' without escape: /^---[^---].*---/
(irb):6: warning: character class has '-' without escape: /^---[^---].*---/
=> "---new metadata--- test'"

After: Only the metadata is replaced, and the --- in code in unaffected.

irb(main):001:0> "---
irb(main):002:0" title: 123
irb(main):003:0" ---
irb(main):004:0" 
irb(main):005:0" puts 'this is a --- test'
irb(main):006:0" ".gsub(/^---.*?---/m, '---new metadata---')
=> "---new metadata---\n\nputs 'this is a --- test'"

Josh Lory added 2 commits October 1, 2015 15:14
Fix bracket escaping
b653bf8
Use non-greedy matching to find metadata
337c614 
Fixes cases where the metadata has a hyphen, or `---` later in the file.

"---
title: 'hour-of-code'
---".match /(\---[^---]*\---)/m
(irb): warning: character class has '-' without escape: /(\---[^---]*\---)/
(irb): warning: character class has '-' without escape: /(\---[^---]*\---)/
(irb): warning: character class has '-' without escape: /(\---[^---]*\---)/
(irb): warning: character class has '-' without escape: /(\---[^---]*\---)/
=> nil

"---
title: 'hour-of-code'
---".match /(---.*?---)/m
=> #<MatchData "---\ntitle: 'hour-of-code'\n---" ...>
@tanyaparker

tanyaparker commented Oct 1, 2015

Copy link
Copy Markdown
Contributor

Thank you for fixing, sorry for the trouble. I understand now. After this is merged, I'll sync and update all locales.

joshlory pushed a commit that referenced this pull request Oct 2, 2015
Merge pull request #4298 from code-dot-org/fix-rubocop-parser-warnings
d9f3f9b 
Fix rubocop parser warnings
@joshlory joshlory merged commit d9f3f9b into staging Oct 2, 2015
@joshlory joshlory deleted the fix-rubocop-parser-warnings branch October 2, 2015 20:20
deploy-code-org added a commit that referenced this pull request Oct 2, 2015
@deploy-code-org
Automatically built.
6a6abde 
commit 85041b3
Merge: 7376e38 6d2c4c4
Author: Brad Buchanan <bradley.c.buchanan@gmail.com>
Date:   Fri Oct 2 13:39:28 2015 -0700

    Merge pull request #4184 from code-dot-org/applab-google-charts

    Applab: Google charts integration

commit 7376e38
Author: Continuous Integration <dev@code.org>
Date:   Fri Oct 2 20:38:32 2015 +0000

    dropbox and gsheet changes

commit f97e84c
Merge: 5da36f9 a2f7980
Author: Caley Brock <caleybrock7@gmail.com>
Date:   Fri Oct 2 13:32:11 2015 -0700

    Merge pull request #4315 from code-dot-org/revert-4309-companies

    Revert "Change orgs to companies"

commit a2f7980
Author: Caley Brock <caleybrock7@gmail.com>
Date:   Fri Oct 2 13:32:01 2015 -0700

    Revert "Change orgs to companies"

commit 5da36f9
Merge: d9f3f9b 7cd8a05
Author: Caley Brock <caleybrock7@gmail.com>
Date:   Fri Oct 2 13:29:16 2015 -0700

    Merge pull request #4309 from code-dot-org/companies

    Change orgs to companies

commit d9f3f9b
Merge: 06a424d 337c614
Author: Josh Lory <josh.lory@code.org>
Date:   Fri Oct 2 13:20:11 2015 -0700

    Merge pull request #4298 from code-dot-org/fix-rubocop-parser-warnings

    Fix rubocop parser warnings

commit 06a424d
Merge: 6cf948f ef90eed
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Fri Oct 2 13:08:29 2015 -0700

    Merge pull request #4314 from code-dot-org/eslint

    get lint in dashboard passing again

commit ef90eed
Author: Brent Van Minnen <bjvanminnen@gmail.com>
Date:   Fri Oct 2 12:52:16 2015 -0700

    get lint in dashboard passing again

commit 6cf948f
Merge: 077e25f 351d29b
Author: ashercodeorg <asher@code.org>
Date:   Fri Oct 2 14:35:29 2015 -0500

    Merge pull request #4303 from code-dot-org/fixPosteErrors

    Checks whether header is nil before looking up the litmus_tracking_id_key.

commit 351d29b
Author: Asher Kach <asher@code.org>
Date:   Fri Oct 2 14:34:06 2015 -0500

    Adds the tracking bug URL to the TODO(andrew) in deliver_poste_messages.

commit 077e25f
Author: Brent Van Minnen <bjvanminnen@gmail.com>
Date:   Fri Oct 2 12:27:14 2015 -0700

    disable dashboard linting until fixed

commit 1061e95
Author: Continuous Integration <dev@code.org>
Date:   Fri Oct 2 19:12:10 2015 +0000

    Automatically built.

    commit d815b63
    Merge: 9699e34 d49c7b9
    Author: Bjvanminnen <Bjvanminnen@gmail.com>
    Date:   Fri Oct 2 12:07:04 2015 -0700

        Merge pull request #4288 from code-dot-org/eslint

        [Finishes #104348304] linting in dashboard

    commit 9699e34
    Author: Continuous Integration <dev@code.org>
    Date:   Fri Oct 2 18:23:20 2015 +0000

        Update the level used for auto open function editor eyes test.

    commit 05877e4
    Merge: ae5b9bb 03e36de
    Author: Brendan Reville <breville@users.noreply.github.com>
    Date:   Fri Oct 2 11:21:15 2015 -0700

        Merge pull request #4313 from code-dot-org/levelbuilder

        levelbuilder -> staging (one change)

    commit d49c7b9
    Author: Brent Van Minnen <bjvanminnen@gmail.com>
    Date:   Fri Oct 2 11:20:34 2015 -0700

        lint all javascripts in dashboard/apps

    commit 03e36de
    Author: Continuous Integration <dev@code.org>
    Date:   Fri Oct 2 18:20:02 2015 +0000

        Add level that auto opens function editor to /s/allthethings

    commit 3db7565
    Author: Brent Van Minnen <bjvanminnen@gmail.com>
    Date:   Fri Oct 2 10:57:46 2015 -0700

        remove $ from global list at the top of a bunch of files

    commit ae5b9bb
    Author: Continuous Integration <dev@code.org>
    Date:   Fri Oct 2 17:01:53 2015 +0000

        content changes -trevor

    commit 4f4e310
    Merge: c459711 4ada13c
    Author: Trevor Berg <trevor@code.org>
    Date:   Fri Oct 2 09:55:08 2015 -0700

        Merge pull request #4307 from code-dot-org/levelbuilder

        Levelbuilder -> Staging

    commit 4ada13c
    Author: Continuous Integration <dev@code.org>
    Date:   Fri Oct 2 16:54:05 2015 +0000

        levelbuilder changes -trevor

    commit 5c01e57
    Merge: 3e96865 c459711
    Author: Trevor Berg <trevor@code.org>
    Date:   Fri Oct 2 09:48:52 2015 -0700

        Merge pull request #4306 from code-dot-org/staging

        Levelbuilder -> Staging

    commit 3e96865
    Author: Continuous Integration <dev@code.org>
    Date:   Fri Oct 2 16:48:00 2015 +0000

        levelbuilder changes -Trevor

commit 2db4d53
Author: Continuous Integration <dev@code.org>
Date:   Fri Oct 2 19:08:07 2015 +0000

    Automatically built.

    commit d815b63
    Merge: 9699e34 d49c7b9
    Author: Bjvanminnen <Bjvanminnen@gmail.com>
    Date:   Fri Oct 2 12:07:04 2015 -0700

        Merge pull request #4288 from code-dot-org/eslint

        [Finishes #104348304] linting in dashboard

    commit 9699e34
    Author: Continuous Integration <dev@code.org>
    Date:   Fri Oct 2 18:23:20 2015 +0000

        Update the level used for auto open function editor eyes test.

    commit 05877e4
    Merge: ae5b9bb 03e36de
    Author: Brendan Reville <breville@users.noreply.github.com>
    Date:   Fri Oct 2 11:21:15 2015 -0700

        Merge pull request #4313 from code-dot-org/levelbuilder

        levelbuilder -> staging (one change)

    commit d49c7b9
    Author: Brent Van Minnen <bjvanminnen@gmail.com>
    Date:   Fri Oct 2 11:20:34 2015 -0700

        lint all javascripts in dashboard/apps

    commit 03e36de
    Author: Continuous Integration <dev@code.org>
    Date:   Fri Oct 2 18:20:02 2015 +0000

        Add level that auto opens function editor to /s/allthethings

    commit 3db7565
    Author: Brent Van Minnen <bjvanminnen@gmail.com>
    Date:   Fri Oct 2 10:57:46 2015 -0700

        remove $ from global list at the top of a bunch of files

    commit ae5b9bb
    Author: Continuous Integration <dev@code.org>
    Date:   Fri Oct 2 17:01:53 2015 +0000

        content changes -trevor

    commit 4f4e310
    Merge: c459711 4ada13c
    Author: Trevor Berg <trevor@code.org>
    Date:   Fri Oct 2 09:55:08 2015 -0700

        Merge pull request #4307 from code-dot-org/levelbuilder

        Levelbuilder -> Staging

    commit 4ada13c
    Author: Continuous Integration <dev@code.org>
    Date:   Fri Oct 2 16:54:05 2015 +0000

        levelbuilder changes -trevor

    commit 5c01e57
    Merge: 3e96865 c459711
    Author: Trevor Berg <trevor@code.org>
    Date:   Fri Oct 2 09:48:52 2015 -0700

        Merge pull request #4306 from code-dot-org/staging

        Levelbuilder -> Staging

    commit 3e96865
    Author: Continuous Integration <dev@code.org>
    Date:   Fri Oct 2 16:48:00 2015 +0000

        levelbuilder changes -Trevor

commit f948c38
Merge: 7822c7f d815b63
Author: Asher Kach <asher@code.org>
Date:   Fri Oct 2 14:07:32 2015 -0500

    Merge branch 'staging' of https://github.com/code-dot-org/code-dot-org into fixPosteErrors

commit d815b63
Merge: 9699e34 d49c7b9
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Fri Oct 2 12:07:04 2015 -0700

    Merge pull request #4288 from code-dot-org/eslint

    [Finishes #104348304] linting in dashboard

commit 7822c7f
Author: Asher Kach <asher@code.org>
Date:   Fri Oct 2 13:54:14 2015 -0500

    Adds a TODO(andrew) to surface a signal how often we are not seeing a tracking ID.

commit dd3472f
Author: Asher Kach <asher@code.org>
Date:   Thu Oct 1 20:36:17 2015 -0500

    Checks whether header is nil before looking up the litmus_tracking_id key. The intent is to eliminate the plethora of error messages being seen in the Staging Room.

commit 9699e34
Author: Continuous Integration <dev@code.org>
Date:   Fri Oct 2 18:23:20 2015 +0000

    Update the level used for auto open function editor eyes test.

commit 7cd8a05
Author: caleybrock <caleybrock7@gmail.com>
Date:   Fri Oct 2 11:23:11 2015 -0700

    change title

commit 05877e4
Merge: ae5b9bb 03e36de
Author: Brendan Reville <breville@users.noreply.github.com>
Date:   Fri Oct 2 11:21:15 2015 -0700

    Merge pull request #4313 from code-dot-org/levelbuilder

    levelbuilder -> staging (one change)

commit d49c7b9
Author: Brent Van Minnen <bjvanminnen@gmail.com>
Date:   Fri Oct 2 11:20:34 2015 -0700

    lint all javascripts in dashboard/apps

commit 03e36de
Author: Continuous Integration <dev@code.org>
Date:   Fri Oct 2 18:20:02 2015 +0000

    Add level that auto opens function editor to /s/allthethings
deploy-code-org added a commit that referenced this pull request Oct 2, 2015
@deploy-code-org
Automatically built.
26ccaac 
commit d08b2ca
Merge: 6a6abde 2ebef3a
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Fri Oct 2 13:40:36 2015 -0700

    Merge pull request #4297 from code-dot-org/oneReact

    [Finishes #102389490] single react

commit 6a6abde
Author: Continuous Integration <dev@code.org>
Date:   Fri Oct 2 20:40:07 2015 +0000

    Automatically built.

    commit 85041b3
    Merge: 7376e38 6d2c4c4
    Author: Brad Buchanan <bradley.c.buchanan@gmail.com>
    Date:   Fri Oct 2 13:39:28 2015 -0700

        Merge pull request #4184 from code-dot-org/applab-google-charts

        Applab: Google charts integration

    commit 7376e38
    Author: Continuous Integration <dev@code.org>
    Date:   Fri Oct 2 20:38:32 2015 +0000

        dropbox and gsheet changes

    commit f97e84c
    Merge: 5da36f9 a2f7980
    Author: Caley Brock <caleybrock7@gmail.com>
    Date:   Fri Oct 2 13:32:11 2015 -0700

        Merge pull request #4315 from code-dot-org/revert-4309-companies

        Revert "Change orgs to companies"

    commit a2f7980
    Author: Caley Brock <caleybrock7@gmail.com>
    Date:   Fri Oct 2 13:32:01 2015 -0700

        Revert "Change orgs to companies"

    commit 5da36f9
    Merge: d9f3f9b 7cd8a05
    Author: Caley Brock <caleybrock7@gmail.com>
    Date:   Fri Oct 2 13:29:16 2015 -0700

        Merge pull request #4309 from code-dot-org/companies

        Change orgs to companies

    commit d9f3f9b
    Merge: 06a424d 337c614
    Author: Josh Lory <josh.lory@code.org>
    Date:   Fri Oct 2 13:20:11 2015 -0700

        Merge pull request #4298 from code-dot-org/fix-rubocop-parser-warnings

        Fix rubocop parser warnings

    commit 06a424d
    Merge: 6cf948f ef90eed
    Author: Bjvanminnen <Bjvanminnen@gmail.com>
    Date:   Fri Oct 2 13:08:29 2015 -0700

        Merge pull request #4314 from code-dot-org/eslint

        get lint in dashboard passing again

    commit ef90eed
    Author: Brent Van Minnen <bjvanminnen@gmail.com>
    Date:   Fri Oct 2 12:52:16 2015 -0700

        get lint in dashboard passing again

    commit 6cf948f
    Merge: 077e25f 351d29b
    Author: ashercodeorg <asher@code.org>
    Date:   Fri Oct 2 14:35:29 2015 -0500

        Merge pull request #4303 from code-dot-org/fixPosteErrors

        Checks whether header is nil before looking up the litmus_tracking_id_key.

    commit 351d29b
    Author: Asher Kach <asher@code.org>
    Date:   Fri Oct 2 14:34:06 2015 -0500

        Adds the tracking bug URL to the TODO(andrew) in deliver_poste_messages.

    commit 077e25f
    Author: Brent Van Minnen <bjvanminnen@gmail.com>
    Date:   Fri Oct 2 12:27:14 2015 -0700

        disable dashboard linting until fixed

    commit 1061e95
    Author: Continuous Integration <dev@code.org>
    Date:   Fri Oct 2 19:12:10 2015 +0000

        Automatically built.

        commit d815b63
        Merge: 9699e34 d49c7b9
        Author: Bjvanminnen <Bjvanminnen@gmail.com>
        Date:   Fri Oct 2 12:07:04 2015 -0700

            Merge pull request #4288 from code-dot-org/eslint

            [Finishes #104348304] linting in dashboard

        commit 9699e34
        Author: Continuous Integration <dev@code.org>
        Date:   Fri Oct 2 18:23:20 2015 +0000

            Update the level used for auto open function editor eyes test.

        commit 05877e4
        Merge: ae5b9bb 03e36de
        Author: Brendan Reville <breville@users.noreply.github.com>
        Date:   Fri Oct 2 11:21:15 2015 -0700

            Merge pull request #4313 from code-dot-org/levelbuilder

            levelbuilder -> staging (one change)

        commit d49c7b9
        Author: Brent Van Minnen <bjvanminnen@gmail.com>
        Date:   Fri Oct 2 11:20:34 2015 -0700

            lint all javascripts in dashboard/apps

        commit 03e36de
        Author: Continuous Integration <dev@code.org>
        Date:   Fri Oct 2 18:20:02 2015 +0000

            Add level that auto opens function editor to /s/allthethings

        commit 3db7565
        Author: Brent Van Minnen <bjvanminnen@gmail.com>
        Date:   Fri Oct 2 10:57:46 2015 -0700

            remove $ from global list at the top of a bunch of files

        commit ae5b9bb
        Author: Continuous Integration <dev@code.org>
        Date:   Fri Oct 2 17:01:53 2015 +0000

            content changes -trevor

        commit 4f4e310
        Merge: c459711 4ada13c
        Author: Trevor Berg <trevor@code.org>
        Date:   Fri Oct 2 09:55:08 2015 -0700

            Merge pull request #4307 from code-dot-org/levelbuilder

            Levelbuilder -> Staging

        commit 4ada13c
        Author: Continuous Integration <dev@code.org>
        Date:   Fri Oct 2 16:54:05 2015 +0000

            levelbuilder changes -trevor

        commit 5c01e57
        Merge: 3e96865 c459711
        Author: Trevor Berg <trevor@code.org>
        Date:   Fri Oct 2 09:48:52 2015 -0700

            Merge pull request #4306 from code-dot-org/staging

            Levelbuilder -> Staging

        commit 3e96865
        Author: Continuous Integration <dev@code.org>
        Date:   Fri Oct 2 16:48:00 2015 +0000

            levelbuilder changes -Trevor

    commit 2db4d53
    Author: Continuous Integration <dev@code.org>
    Date:   Fri Oct 2 19:08:07 2015 +0000

        Automatically built.

        commit d815b63
        Merge: 9699e34 d49c7b9
        Author: Bjvanminnen <Bjvanminnen@gmail.com>
        Date:   Fri Oct 2 12:07:04 2015 -0700

            Merge pull request #4288 from code-dot-org/eslint

            [Finishes #104348304] linting in dashboard

        commit 9699e34
        Author: Continuous Integration <dev@code.org>
        Date:   Fri Oct 2 18:23:20 2015 +0000

            Update the level used for auto open function editor eyes test.

        commit 05877e4
        Merge: ae5b9bb 03e36de
        Author: Brendan Reville <breville@users.noreply.github.com>
        Date:   Fri Oct 2 11:21:15 2015 -0700

            Merge pull request #4313 from code-dot-org/levelbuilder

            levelbuilder -> staging (one change)

        commit d49c7b9
        Author: Brent Van Minnen <bjvanminnen@gmail.com>
        Date:   Fri Oct 2 11:20:34 2015 -0700

            lint all javascripts in dashboard/apps

        commit 03e36de
        Author: Continuous Integration <dev@code.org>
        Date:   Fri Oct 2 18:20:02 2015 +0000

            Add level that auto opens function editor to /s/allthethings

        commit 3db7565
        Author: Brent Van Minnen <bjvanminnen@gmail.com>
        Date:   Fri Oct 2 10:57:46 2015 -0700

            remove $ from global list at the top of a bunch of files

        commit ae5b9bb
        Author: Continuous Integration <dev@code.org>
        Date:   Fri Oct 2 17:01:53 2015 +0000

            content changes -trevor

        commit 4f4e310
        Merge: c459711 4ada13c
        Author: Trevor Berg <trevor@code.org>
        Date:   Fri Oct 2 09:55:08 2015 -0700

            Merge pull request #4307 from code-dot-org/levelbuilder

            Levelbuilder -> Staging

        commit 4ada13c
        Author: Continuous Integration <dev@code.org>
        Date:   Fri Oct 2 16:54:05 2015 +0000

            levelbuilder changes -trevor

        commit 5c01e57
        Merge: 3e96865 c459711
        Author: Trevor Berg <trevor@code.org>
        Date:   Fri Oct 2 09:48:52 2015 -0700

            Merge pull request #4306 from code-dot-org/staging

            Levelbuilder -> Staging

        commit 3e96865
        Author: Continuous Integration <dev@code.org>
        Date:   Fri Oct 2 16:48:00 2015 +0000

            levelbuilder changes -Trevor

    commit f948c38
    Merge: 7822c7f d815b63
    Author: Asher Kach <asher@code.org>
    Date:   Fri Oct 2 14:07:32 2015 -0500

        Merge branch 'staging' of https://github.com/code-dot-org/code-dot-org into fixPosteErrors

    commit d815b63
    Merge: 9699e34 d49c7b9
    Author: Bjvanminnen <Bjvanminnen@gmail.com>
    Date:   Fri Oct 2 12:07:04 2015 -0700

        Merge pull request #4288 from code-dot-org/eslint

        [Finishes #104348304] linting in dashboard

    commit 7822c7f
    Author: Asher Kach <asher@code.org>
    Date:   Fri Oct 2 13:54:14 2015 -0500

        Adds a TODO(andrew) to surface a signal how often we are not seeing a tracking ID.

    commit dd3472f
    Author: Asher Kach <asher@code.org>
    Date:   Thu Oct 1 20:36:17 2015 -0500

        Checks whether header is nil before looking up the litmus_tracking_id key. The intent is to eliminate the plethora of error messages being seen in the Staging Room.

    commit 9699e34
    Author: Continuous Integration <dev@code.org>
    Date:   Fri Oct 2 18:23:20 2015 +0000

        Update the level used for auto open function editor eyes test.

    commit 7cd8a05
    Author: caleybrock <caleybrock7@gmail.com>
    Date:   Fri Oct 2 11:23:11 2015 -0700

        change title

    commit 05877e4
    Merge: ae5b9bb 03e36de
    Author: Brendan Reville <breville@users.noreply.github.com>
    Date:   Fri Oct 2 11:21:15 2015 -0700

        Merge pull request #4313 from code-dot-org/levelbuilder

        levelbuilder -> staging (one change)

    commit d49c7b9
    Author: Brent Van Minnen <bjvanminnen@gmail.com>
    Date:   Fri Oct 2 11:20:34 2015 -0700

        lint all javascripts in dashboard/apps

    commit 03e36de
    Author: Continuous Integration <dev@code.org>
    Date:   Fri Oct 2 18:20:02 2015 +0000

        Add level that auto opens function editor to /s/allthethings
deploy-code-org added a commit that referenced this pull request Oct 2, 2015
@deploy-code-org
Automatically built.
944aa53 
commit 534bad3
Merge: b0cef5a e6e5220
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Fri Oct 2 14:31:28 2015 -0700

    Merge pull request #4278 from code-dot-org/abusedAssets

    [Finishes #103047632] Block assets in abusive projects

commit b0cef5a
Merge: 5d00c24 f26dd55
Author: Caley Brock <caleybrock7@gmail.com>
Date:   Fri Oct 2 14:06:56 2015 -0700

    Merge pull request #4312 from code-dot-org/permissions

    Add teacher permissions to special events

commit 5d00c24
Merge: 26ccaac 419c186
Author: Will Jordan <wjordan@users.noreply.github.com>
Date:   Fri Oct 2 14:04:55 2015 -0700

    Merge pull request #4301 from code-dot-org/varnish_hostname

    Match (dashboard|studio).code.org hostnames to dashboard in Varnish config

commit 26ccaac
Author: Continuous Integration <dev@code.org>
Date:   Fri Oct 2 20:54:05 2015 +0000

    Automatically built.

    commit d08b2ca
    Merge: 6a6abde 2ebef3a
    Author: Bjvanminnen <Bjvanminnen@gmail.com>
    Date:   Fri Oct 2 13:40:36 2015 -0700

        Merge pull request #4297 from code-dot-org/oneReact

        [Finishes #102389490] single react

    commit 6a6abde
    Author: Continuous Integration <dev@code.org>
    Date:   Fri Oct 2 20:40:07 2015 +0000

        Automatically built.

        commit 85041b3
        Merge: 7376e38 6d2c4c4
        Author: Brad Buchanan <bradley.c.buchanan@gmail.com>
        Date:   Fri Oct 2 13:39:28 2015 -0700

            Merge pull request #4184 from code-dot-org/applab-google-charts

            Applab: Google charts integration

        commit 7376e38
        Author: Continuous Integration <dev@code.org>
        Date:   Fri Oct 2 20:38:32 2015 +0000

            dropbox and gsheet changes

        commit f97e84c
        Merge: 5da36f9 a2f7980
        Author: Caley Brock <caleybrock7@gmail.com>
        Date:   Fri Oct 2 13:32:11 2015 -0700

            Merge pull request #4315 from code-dot-org/revert-4309-companies

            Revert "Change orgs to companies"

        commit a2f7980
        Author: Caley Brock <caleybrock7@gmail.com>
        Date:   Fri Oct 2 13:32:01 2015 -0700

            Revert "Change orgs to companies"

        commit 5da36f9
        Merge: d9f3f9b 7cd8a05
        Author: Caley Brock <caleybrock7@gmail.com>
        Date:   Fri Oct 2 13:29:16 2015 -0700

            Merge pull request #4309 from code-dot-org/companies

            Change orgs to companies

        commit d9f3f9b
        Merge: 06a424d 337c614
        Author: Josh Lory <josh.lory@code.org>
        Date:   Fri Oct 2 13:20:11 2015 -0700

            Merge pull request #4298 from code-dot-org/fix-rubocop-parser-warnings

            Fix rubocop parser warnings

        commit 06a424d
        Merge: 6cf948f ef90eed
        Author: Bjvanminnen <Bjvanminnen@gmail.com>
        Date:   Fri Oct 2 13:08:29 2015 -0700

            Merge pull request #4314 from code-dot-org/eslint

            get lint in dashboard passing again

        commit ef90eed
        Author: Brent Van Minnen <bjvanminnen@gmail.com>
        Date:   Fri Oct 2 12:52:16 2015 -0700

            get lint in dashboard passing again

        commit 6cf948f
        Merge: 077e25f 351d29b
        Author: ashercodeorg <asher@code.org>
        Date:   Fri Oct 2 14:35:29 2015 -0500

            Merge pull request #4303 from code-dot-org/fixPosteErrors

            Checks whether header is nil before looking up the litmus_tracking_id_key.

        commit 351d29b
        Author: Asher Kach <asher@code.org>
        Date:   Fri Oct 2 14:34:06 2015 -0500

            Adds the tracking bug URL to the TODO(andrew) in deliver_poste_messages.

        commit 077e25f
        Author: Brent Van Minnen <bjvanminnen@gmail.com>
        Date:   Fri Oct 2 12:27:14 2015 -0700

            disable dashboard linting until fixed

        commit 1061e95
        Author: Continuous Integration <dev@code.org>
        Date:   Fri Oct 2 19:12:10 2015 +0000

            Automatically built.

            commit d815b63
            Merge: 9699e34 d49c7b9
            Author: Bjvanminnen <Bjvanminnen@gmail.com>
            Date:   Fri Oct 2 12:07:04 2015 -0700

                Merge pull request #4288 from code-dot-org/eslint

                [Finishes #104348304] linting in dashboard

            commit 9699e34
            Author: Continuous Integration <dev@code.org>
            Date:   Fri Oct 2 18:23:20 2015 +0000

                Update the level used for auto open function editor eyes test.

            commit 05877e4
            Merge: ae5b9bb 03e36de
            Author: Brendan Reville <breville@users.noreply.github.com>
            Date:   Fri Oct 2 11:21:15 2015 -0700

                Merge pull request #4313 from code-dot-org/levelbuilder

                levelbuilder -> staging (one change)

            commit d49c7b9
            Author: Brent Van Minnen <bjvanminnen@gmail.com>
            Date:   Fri Oct 2 11:20:34 2015 -0700

                lint all javascripts in dashboard/apps

            commit 03e36de
            Author: Continuous Integration <dev@code.org>
            Date:   Fri Oct 2 18:20:02 2015 +0000

                Add level that auto opens function editor to /s/allthethings

            commit 3db7565
            Author: Brent Van Minnen <bjvanminnen@gmail.com>
            Date:   Fri Oct 2 10:57:46 2015 -0700

                remove $ from global list at the top of a bunch of files

            commit ae5b9bb
            Author: Continuous Integration <dev@code.org>
            Date:   Fri Oct 2 17:01:53 2015 +0000

                content changes -trevor

            commit 4f4e310
            Merge: c459711 4ada13c
            Author: Trevor Berg <trevor@code.org>
            Date:   Fri Oct 2 09:55:08 2015 -0700

                Merge pull request #4307 from code-dot-org/levelbuilder

                Levelbuilder -> Staging

            commit 4ada13c
            Author: Continuous Integration <dev@code.org>
            Date:   Fri Oct 2 16:54:05 2015 +0000

                levelbuilder changes -trevor

            commit 5c01e57
            Merge: 3e96865 c459711
            Author: Trevor Berg <trevor@code.org>
            Date:   Fri Oct 2 09:48:52 2015 -0700

                Merge pull request #4306 from code-dot-org/staging

                Levelbuilder -> Staging

            commit 3e96865
            Author: Continuous Integration <dev@code.org>
            Date:   Fri Oct 2 16:48:00 2015 +0000

                levelbuilder changes -Trevor

        commit 2db4d53
        Author: Continuous Integration <dev@code.org>
        Date:   Fri Oct 2 19:08:07 2015 +0000

            Automatically built.

            commit d815b63
            Merge: 9699e34 d49c7b9
            Author: Bjvanminnen <Bjvanminnen@gmail.com>
            Date:   Fri Oct 2 12:07:04 2015 -0700

                Merge pull request #4288 from code-dot-org/eslint

                [Finishes #104348304] linting in dashboard

            commit 9699e34
            Author: Continuous Integration <dev@code.org>
            Date:   Fri Oct 2 18:23:20 2015 +0000

                Update the level used for auto open function editor eyes test.

            commit 05877e4
            Merge: ae5b9bb 03e36de
            Author: Brendan Reville <breville@users.noreply.github.com>
            Date:   Fri Oct 2 11:21:15 2015 -0700

                Merge pull request #4313 from code-dot-org/levelbuilder

                levelbuilder -> staging (one change)

            commit d49c7b9
            Author: Brent Van Minnen <bjvanminnen@gmail.com>
            Date:   Fri Oct 2 11:20:34 2015 -0700

                lint all javascripts in dashboard/apps

            commit 03e36de
            Author: Continuous Integration <dev@code.org>
            Date:   Fri Oct 2 18:20:02 2015 +0000

                Add level that auto opens function editor to /s/allthethings

            commit 3db7565
            Author: Brent Van Minnen <bjvanminnen@gmail.com>
            Date:   Fri Oct 2 10:57:46 2015 -0700

                remove $ from global list at the top of a bunch of files

            commit ae5b9bb
            Author: Continuous Integration <dev@code.org>
            Date:   Fri Oct 2 17:01:53 2015 +0000

                content changes -trevor

            commit 4f4e310
            Merge: c459711 4ada13c
            Author: Trevor Berg <trevor@code.org>
            Date:   Fri Oct 2 09:55:08 2015 -0700

                Merge pull request #4307 from code-dot-org/levelbuilder

                Levelbuilder -> Staging

            commit 4ada13c
            Author: Continuous Integration <dev@code.org>
            Date:   Fri Oct 2 16:54:05 2015 +0000

                levelbuilder changes -trevor

            commit 5c01e57
            Merge: 3e96865 c459711
            Author: Trevor Berg <trevor@code.org>
            Date:   Fri Oct 2 09:48:52 2015 -0700

                Merge pull request #4306 from code-dot-org/staging

                Levelbuilder -> Staging

            commit 3e96865
            Author: Continuous Integration <dev@code.org>
            Date:   Fri Oct 2 16:48:00 2015 +0000

                levelbuilder changes -Trevor

        commit f948c38
        Merge: 7822c7f d815b63
        Author: Asher Kach <asher@code.org>
        Date:   Fri Oct 2 14:07:32 2015 -0500

            Merge branch 'staging' of https://github.com/code-dot-org/code-dot-org into fixPosteErrors

        commit d815b63
        Merge: 9699e34 d49c7b9
        Author: Bjvanminnen <Bjvanminnen@gmail.com>
        Date:   Fri Oct 2 12:07:04 2015 -0700

            Merge pull request #4288 from code-dot-org/eslint

            [Finishes #104348304] linting in dashboard

        commit 7822c7f
        Author: Asher Kach <asher@code.org>
        Date:   Fri Oct 2 13:54:14 2015 -0500

            Adds a TODO(andrew) to surface a signal how often we are not seeing a tracking ID.

        commit dd3472f
        Author: Asher Kach <asher@code.org>
        Date:   Thu Oct 1 20:36:17 2015 -0500

            Checks whether header is nil before looking up the litmus_tracking_id key. The intent is to eliminate the plethora of error messages being seen in the Staging Room.

        commit 9699e34
        Author: Continuous Integration <dev@code.org>
        Date:   Fri Oct 2 18:23:20 2015 +0000

            Update the level used for auto open function editor eyes test.

        commit 7cd8a05
        Author: caleybrock <caleybrock7@gmail.com>
        Date:   Fri Oct 2 11:23:11 2015 -0700

            change title

        commit 05877e4
        Merge: ae5b9bb 03e36de
        Author: Brendan Reville <breville@users.noreply.github.com>
        Date:   Fri Oct 2 11:21:15 2015 -0700

            Merge pull request #4313 from code-dot-org/levelbuilder

            levelbuilder -> staging (one change)

        commit d49c7b9
        Author: Brent Van Minnen <bjvanminnen@gmail.com>
        Date:   Fri Oct 2 11:20:34 2015 -0700

            lint all javascripts in dashboard/apps

        commit 03e36de
        Author: Continuous Integration <dev@code.org>
        Date:   Fri Oct 2 18:20:02 2015 +0000

            Add level that auto opens function editor to /s/allthethings

commit d08b2ca
Merge: 6a6abde 2ebef3a
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Fri Oct 2 13:40:36 2015 -0700

    Merge pull request #4297 from code-dot-org/oneReact

    [Finishes #102389490] single react

commit 6a6abde
Author: Continuous Integration <dev@code.org>
Date:   Fri Oct 2 20:40:07 2015 +0000

    Automatically built.

    commit 85041b3
    Merge: 7376e38 6d2c4c4
    Author: Brad Buchanan <bradley.c.buchanan@gmail.com>
    Date:   Fri Oct 2 13:39:28 2015 -0700

        Merge pull request #4184 from code-dot-org/applab-google-charts

        Applab: Google charts integration

    commit 7376e38
    Author: Continuous Integration <dev@code.org>
    Date:   Fri Oct 2 20:38:32 2015 +0000

        dropbox and gsheet changes

    commit f97e84c
    Merge: 5da36f9 a2f7980
    Author: Caley Brock <caleybrock7@gmail.com>
    Date:   Fri Oct 2 13:32:11 2015 -0700

        Merge pull request #4315 from code-dot-org/revert-4309-companies

        Revert "Change orgs to companies"

    commit a2f7980
    Author: Caley Brock <caleybrock7@gmail.com>
    Date:   Fri Oct 2 13:32:01 2015 -0700

        Revert "Change orgs to companies"

    commit 5da36f9
    Merge: d9f3f9b 7cd8a05
    Author: Caley Brock <caleybrock7@gmail.com>
    Date:   Fri Oct 2 13:29:16 2015 -0700

        Merge pull request #4309 from code-dot-org/companies

        Change orgs to companies

    commit d9f3f9b
    Merge: 06a424d 337c614
    Author: Josh Lory <josh.lory@code.org>
    Date:   Fri Oct 2 13:20:11 2015 -0700

        Merge pull request #4298 from code-dot-org/fix-rubocop-parser-warnings

        Fix rubocop parser warnings

    commit 06a424d
    Merge: 6cf948f ef90eed
    Author: Bjvanminnen <Bjvanminnen@gmail.com>
    Date:   Fri Oct 2 13:08:29 2015 -0700

        Merge pull request #4314 from code-dot-org/eslint

        get lint in dashboard passing again

    commit ef90eed
    Author: Brent Van Minnen <bjvanminnen@gmail.com>
    Date:   Fri Oct 2 12:52:16 2015 -0700

        get lint in dashboard passing again

    commit 6cf948f
    Merge: 077e25f 351d29b
    Author: ashercodeorg <asher@code.org>
    Date:   Fri Oct 2 14:35:29 2015 -0500

        Merge pull request #4303 from code-dot-org/fixPosteErrors

        Checks whether header is nil before looking up the litmus_tracking_id_key.

    commit 351d29b
    Author: Asher Kach <asher@code.org>
    Date:   Fri Oct 2 14:34:06 2015 -0500

        Adds the tracking bug URL to the TODO(andrew) in deliver_poste_messages.

    commit 077e25f
    Author: Brent Van Minnen <bjvanminnen@gmail.com>
    Date:   Fri Oct 2 12:27:14 2015 -0700

        disable dashboard linting until fixed

    commit 1061e95
    Author: Continuous Integration <dev@code.org>
    Date:   Fri Oct 2 19:12:10 2015 +0000

        Automatically built.

        commit d815b63
        Merge: 9699e34 d49c7b9
        Author: Bjvanminnen <Bjvanminnen@gmail.com>
        Date:   Fri Oct 2 12:07:04 2015 -0700

            Merge pull request #4288 from code-dot-org/eslint

            [Finishes #104348304] linting in dashboard

        commit 9699e34
        Author: Continuous Integration <dev@code.org>
        Date:   Fri Oct 2 18:23:20 2015 +0000

            Update the level used for auto open function editor eyes test.

        commit 05877e4
        Merge: ae5b9bb 03e36de
        Author: Brendan Reville <breville@users.noreply.github.com>
        Date:   Fri Oct 2 11:21:15 2015 -0700

            Merge pull request #4313 from code-dot-org/levelbuilder

            levelbuilder -> staging (one change)

        commit d49c7b9
        Author: Brent Van Minnen <bjvanminnen@gmail.com>
        Date:   Fri Oct 2 11:20:34 2015 -0700

            lint all javascripts in dashboard/apps

        commit 03e36de
        Author: Continuous Integration <dev@code.org>
        Date:   Fri Oct 2 18:20:02 2015 +0000

            Add level that auto opens function editor to /s/allthethings

        commit 3db7565
        Author: Brent Van Minnen <bjvanminnen@gmail.com>
        Date:   Fri Oct 2 10:57:46 2015 -0700

            remove $ from global list at the top of a bunch of files

        commit ae5b9bb
        Author: Continuous Integration <dev@code.org>
        Date:   Fri Oct 2 17:01:53 2015 +0000

            content changes -trevor

        commit 4f4e310
        Merge: c459711 4ada13c
        Author: Trevor Berg <trevor@code.org>
        Date:   Fri Oct 2 09:55:08 2015 -0700

            Merge pull request #4307 from code-dot-org/levelbuilder

            Levelbuilder -> Staging

        commit 4ada13c
        Author: Continuous Integration <dev@code.org>
        Date:   Fri Oct 2 16:54:05 2015 +0000

            levelbuilder changes -trevor

        commit 5c01e57
        Merge: 3e96865 c459711
        Author: Trevor Berg <trevor@code.org>
        Date:   Fri Oct 2 09:48:52 2015 -0700

            Merge pull request #4306 from code-dot-org/staging

            Levelbuilder -> Staging

        commit 3e96865
        Author: Continuous Integration <dev@code.org>
        Date:   Fri Oct 2 16:48:00 2015 +0000

            levelbuilder changes -Trevor

    commit 2db4d53
    Author: Continuous Integration <dev@code.org>
    Date:   Fri Oct 2 19:08:07 2015 +0000

        Automatically built.

        commit d815b63
        Merge: 9699e34 d49c7b9
        Author: Bjvanminnen <Bjvanminnen@gmail.com>
        Date:   Fri Oct 2 12:07:04 2015 -0700

            Merge pull request #4288 from code-dot-org/eslint

            [Finishes #104348304] linting in dashboard

        commit 9699e34
        Author: Continuous Integration <dev@code.org>
        Date:   Fri Oct 2 18:23:20 2015 +0000

            Update the level used for auto open function editor eyes test.

        commit 05877e4
        Merge: ae5b9bb 03e36de
        Author: Brendan Reville <breville@users.noreply.github.com>
        Date:   Fri Oct 2 11:21:15 2015 -0700

            Merge pull request #4313 from code-dot-org/levelbuilder

            levelbuilder -> staging (one change)

        commit d49c7b9
        Author: Brent Van Minnen <bjvanminnen@gmail.com>
        Date:   Fri Oct 2 11:20:34 2015 -0700

            lint all javascripts in dashboard/apps

        commit 03e36de
        Author: Continuous Integration <dev@code.org>
        Date:   Fri Oct 2 18:20:02 2015 +0000

            Add level that auto opens function editor to /s/allthethings

        commit 3db7565
        Author: Brent Van Minnen <bjvanminnen@gmail.com>
        Date:   Fri Oct 2 10:57:46 2015 -0700

            remove $ from global list at the top of a bunch of files

        commit ae5b9bb
        Author: Continuous Integration <dev@code.org>
        Date:   Fri Oct 2 17:01:53 2015 +0000

            content changes -trevor

        commit 4f4e310
        Merge: c459711 4ada13c
        Author: Trevor Berg <trevor@code.org>
        Date:   Fri Oct 2 09:55:08 2015 -0700

            Merge pull request #4307 from code-dot-org/levelbuilder

            Levelbuilder -> Staging

        commit 4ada13c
        Author: Continuous Integration <dev@code.org>
        Date:   Fri Oct 2 16:54:05 2015 +0000

            levelbuilder changes -trevor

        commit 5c01e57
        Merge: 3e96865 c459711
        Author: Trevor Berg <trevor@code.org>
        Date:   Fri Oct 2 09:48:52 2015 -0700

            Merge pull request #4306 from code-dot-org/staging

            Levelbuilder -> Staging

        commit 3e96865
        Author: Continuous Integration <dev@code.org>
        Date:   Fri Oct 2 16:48:00 2015 +0000

            levelbuilder changes -Trevor

    commit f948c38
    Merge: 7822c7f d815b63
    Author: Asher Kach <asher@code.org>
    Date:   Fri Oct 2 14:07:32 2015 -0500

        Merge branch 'staging' of https://github.com/code-dot-org/code-dot-org into fixPosteErrors

    commit d815b63
    Merge: 9699e34 d49c7b9
    Author: Bjvanminnen <Bjvanminnen@gmail.com>
    Date:   Fri Oct 2 12:07:04 2015 -0700

        Merge pull request #4288 from code-dot-org/eslint

        [Finishes #104348304] linting in dashboard

    commit 7822c7f
    Author: Asher Kach <asher@code.org>
    Date:   Fri Oct 2 13:54:14 2015 -0500

        Adds a TODO(andrew) to surface a signal how often we are not seeing a tracking ID.

    commit dd3472f
    Author: Asher Kach <asher@code.org>
    Date:   Thu Oct 1 20:36:17 2015 -0500

        Checks whether header is nil before looking up the litmus_tracking_id key. The intent is to eliminate the plethora of error messages being seen in the Staging Room.

    commit 9699e34
    Author: Continuous Integration <dev@code.org>
    Date:   Fri Oct 2 18:23:20 2015 +0000

        Update the level used for auto open function editor eyes test.

    commit 7cd8a05
    Author: caleybrock <caleybrock7@gmail.com>
    Date:   Fri Oct 2 11:23:11 2015 -0700

        change title

    commit 05877e4
    Merge: ae5b9bb 03e36de
    Author: Brendan Reville <breville@users.noreply.github.com>
    Date:   Fri Oct 2 11:21:15 2015 -0700

        Merge pull request #4313 from code-dot-org/levelbuilder

        levelbuilder -> staging (one change)

    commit d49c7b9
    Author: Brent Van Minnen <bjvanminnen@gmail.com>
    Date:   Fri Oct 2 11:20:34 2015 -0700

        lint all javascripts in dashboard/apps

    commit 03e36de
    Author: Continuous Integration <dev@code.org>
    Date:   Fri Oct 2 18:20:02 2015 +0000

        Add level that auto opens function editor to /s/allthethings

commit 85041b3
Merge: 7376e38 6d2c4c4
Author: Brad Buchanan <bradley.c.buchanan@gmail.com>
Date:   Fri Oct 2 13:39:28 2015 -0700

    Merge pull request #4184 from code-dot-org/applab-google-charts

    Applab: Google charts integration

commit 7376e38
Author: Continuous Integration <dev@code.org>
Date:   Fri Oct 2 20:38:32 2015 +0000

    dropbox and gsheet changes

commit f97e84c
Merge: 5da36f9 a2f7980
Author: Caley Brock <caleybrock7@gmail.com>
Date:   Fri Oct 2 13:32:11 2015 -0700

    Merge pull request #4315 from code-dot-org/revert-4309-companies

    Revert "Change orgs to companies"

commit a2f7980
Author: Caley Brock <caleybrock7@gmail.com>
Date:   Fri Oct 2 13:32:01 2015 -0700

    Revert "Change orgs to companies"

commit 5da36f9
Merge: d9f3f9b 7cd8a05
Author: Caley Brock <caleybrock7@gmail.com>
Date:   Fri Oct 2 13:29:16 2015 -0700

    Merge pull request #4309 from code-dot-org/companies

    Change orgs to companies

commit d9f3f9b
Merge: 06a424d 337c614
Author: Josh Lory <josh.lory@code.org>
Date:   Fri Oct 2 13:20:11 2015 -0700

    Merge pull request #4298 from code-dot-org/fix-rubocop-parser-warnings

    Fix rubocop parser warnings
deploy-code-org added a commit that referenced this pull request Oct 2, 2015
@deploy-code-org
Automatically built.
4c78f84 
commit 534bad3
Merge: b0cef5a e6e5220
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Fri Oct 2 14:31:28 2015 -0700

    Merge pull request #4278 from code-dot-org/abusedAssets

    [Finishes #103047632] Block assets in abusive projects

commit b0cef5a
Merge: 5d00c24 f26dd55
Author: Caley Brock <caleybrock7@gmail.com>
Date:   Fri Oct 2 14:06:56 2015 -0700

    Merge pull request #4312 from code-dot-org/permissions

    Add teacher permissions to special events

commit 5d00c24
Merge: 26ccaac 419c186
Author: Will Jordan <wjordan@users.noreply.github.com>
Date:   Fri Oct 2 14:04:55 2015 -0700

    Merge pull request #4301 from code-dot-org/varnish_hostname

    Match (dashboard|studio).code.org hostnames to dashboard in Varnish config

commit 26ccaac
Author: Continuous Integration <dev@code.org>
Date:   Fri Oct 2 20:54:05 2015 +0000

    Automatically built.

    commit d08b2ca
    Merge: 6a6abde 2ebef3a
    Author: Bjvanminnen <Bjvanminnen@gmail.com>
    Date:   Fri Oct 2 13:40:36 2015 -0700

        Merge pull request #4297 from code-dot-org/oneReact

        [Finishes #102389490] single react

    commit 6a6abde
    Author: Continuous Integration <dev@code.org>
    Date:   Fri Oct 2 20:40:07 2015 +0000

        Automatically built.

        commit 85041b3
        Merge: 7376e38 6d2c4c4
        Author: Brad Buchanan <bradley.c.buchanan@gmail.com>
        Date:   Fri Oct 2 13:39:28 2015 -0700

            Merge pull request #4184 from code-dot-org/applab-google-charts

            Applab: Google charts integration

        commit 7376e38
        Author: Continuous Integration <dev@code.org>
        Date:   Fri Oct 2 20:38:32 2015 +0000

            dropbox and gsheet changes

        commit f97e84c
        Merge: 5da36f9 a2f7980
        Author: Caley Brock <caleybrock7@gmail.com>
        Date:   Fri Oct 2 13:32:11 2015 -0700

            Merge pull request #4315 from code-dot-org/revert-4309-companies

            Revert "Change orgs to companies"

        commit a2f7980
        Author: Caley Brock <caleybrock7@gmail.com>
        Date:   Fri Oct 2 13:32:01 2015 -0700

            Revert "Change orgs to companies"

        commit 5da36f9
        Merge: d9f3f9b 7cd8a05
        Author: Caley Brock <caleybrock7@gmail.com>
        Date:   Fri Oct 2 13:29:16 2015 -0700

            Merge pull request #4309 from code-dot-org/companies

            Change orgs to companies

        commit d9f3f9b
        Merge: 06a424d 337c614
        Author: Josh Lory <josh.lory@code.org>
        Date:   Fri Oct 2 13:20:11 2015 -0700

            Merge pull request #4298 from code-dot-org/fix-rubocop-parser-warnings

            Fix rubocop parser warnings

        commit 06a424d
        Merge: 6cf948f ef90eed
        Author: Bjvanminnen <Bjvanminnen@gmail.com>
        Date:   Fri Oct 2 13:08:29 2015 -0700

            Merge pull request #4314 from code-dot-org/eslint

            get lint in dashboard passing again

        commit ef90eed
        Author: Brent Van Minnen <bjvanminnen@gmail.com>
        Date:   Fri Oct 2 12:52:16 2015 -0700

            get lint in dashboard passing again

        commit 6cf948f
        Merge: 077e25f 351d29b
        Author: ashercodeorg <asher@code.org>
        Date:   Fri Oct 2 14:35:29 2015 -0500

            Merge pull request #4303 from code-dot-org/fixPosteErrors

            Checks whether header is nil before looking up the litmus_tracking_id_key.

        commit 351d29b
        Author: Asher Kach <asher@code.org>
        Date:   Fri Oct 2 14:34:06 2015 -0500

            Adds the tracking bug URL to the TODO(andrew) in deliver_poste_messages.

        commit 077e25f
        Author: Brent Van Minnen <bjvanminnen@gmail.com>
        Date:   Fri Oct 2 12:27:14 2015 -0700

            disable dashboard linting until fixed

        commit 1061e95
        Author: Continuous Integration <dev@code.org>
        Date:   Fri Oct 2 19:12:10 2015 +0000

            Automatically built.

            commit d815b63
            Merge: 9699e34 d49c7b9
            Author: Bjvanminnen <Bjvanminnen@gmail.com>
            Date:   Fri Oct 2 12:07:04 2015 -0700

                Merge pull request #4288 from code-dot-org/eslint

                [Finishes #104348304] linting in dashboard

            commit 9699e34
            Author: Continuous Integration <dev@code.org>
            Date:   Fri Oct 2 18:23:20 2015 +0000

                Update the level used for auto open function editor eyes test.

            commit 05877e4
            Merge: ae5b9bb 03e36de
            Author: Brendan Reville <breville@users.noreply.github.com>
            Date:   Fri Oct 2 11:21:15 2015 -0700

                Merge pull request #4313 from code-dot-org/levelbuilder

                levelbuilder -> staging (one change)

            commit d49c7b9
            Author: Brent Van Minnen <bjvanminnen@gmail.com>
            Date:   Fri Oct 2 11:20:34 2015 -0700

                lint all javascripts in dashboard/apps

            commit 03e36de
            Author: Continuous Integration <dev@code.org>
            Date:   Fri Oct 2 18:20:02 2015 +0000

                Add level that auto opens function editor to /s/allthethings

            commit 3db7565
            Author: Brent Van Minnen <bjvanminnen@gmail.com>
            Date:   Fri Oct 2 10:57:46 2015 -0700

                remove $ from global list at the top of a bunch of files

            commit ae5b9bb
            Author: Continuous Integration <dev@code.org>
            Date:   Fri Oct 2 17:01:53 2015 +0000

                content changes -trevor

            commit 4f4e310
            Merge: c459711 4ada13c
            Author: Trevor Berg <trevor@code.org>
            Date:   Fri Oct 2 09:55:08 2015 -0700

                Merge pull request #4307 from code-dot-org/levelbuilder

                Levelbuilder -> Staging

            commit 4ada13c
            Author: Continuous Integration <dev@code.org>
            Date:   Fri Oct 2 16:54:05 2015 +0000

                levelbuilder changes -trevor

            commit 5c01e57
            Merge: 3e96865 c459711
            Author: Trevor Berg <trevor@code.org>
            Date:   Fri Oct 2 09:48:52 2015 -0700

                Merge pull request #4306 from code-dot-org/staging

                Levelbuilder -> Staging

            commit 3e96865
            Author: Continuous Integration <dev@code.org>
            Date:   Fri Oct 2 16:48:00 2015 +0000

                levelbuilder changes -Trevor

        commit 2db4d53
        Author: Continuous Integration <dev@code.org>
        Date:   Fri Oct 2 19:08:07 2015 +0000

            Automatically built.

            commit d815b63
            Merge: 9699e34 d49c7b9
            Author: Bjvanminnen <Bjvanminnen@gmail.com>
            Date:   Fri Oct 2 12:07:04 2015 -0700

                Merge pull request #4288 from code-dot-org/eslint

                [Finishes #104348304] linting in dashboard

            commit 9699e34
            Author: Continuous Integration <dev@code.org>
            Date:   Fri Oct 2 18:23:20 2015 +0000

                Update the level used for auto open function editor eyes test.

            commit 05877e4
            Merge: ae5b9bb 03e36de
            Author: Brendan Reville <breville@users.noreply.github.com>
            Date:   Fri Oct 2 11:21:15 2015 -0700

                Merge pull request #4313 from code-dot-org/levelbuilder

                levelbuilder -> staging (one change)

            commit d49c7b9
            Author: Brent Van Minnen <bjvanminnen@gmail.com>
            Date:   Fri Oct 2 11:20:34 2015 -0700

                lint all javascripts in dashboard/apps

            commit 03e36de
            Author: Continuous Integration <dev@code.org>
            Date:   Fri Oct 2 18:20:02 2015 +0000

                Add level that auto opens function editor to /s/allthethings

            commit 3db7565
            Author: Brent Van Minnen <bjvanminnen@gmail.com>
            Date:   Fri Oct 2 10:57:46 2015 -0700

                remove $ from global list at the top of a bunch of files

            commit ae5b9bb
            Author: Continuous Integration <dev@code.org>
            Date:   Fri Oct 2 17:01:53 2015 +0000

                content changes -trevor

            commit 4f4e310
            Merge: c459711 4ada13c
            Author: Trevor Berg <trevor@code.org>
            Date:   Fri Oct 2 09:55:08 2015 -0700

                Merge pull request #4307 from code-dot-org/levelbuilder

                Levelbuilder -> Staging

            commit 4ada13c
            Author: Continuous Integration <dev@code.org>
            Date:   Fri Oct 2 16:54:05 2015 +0000

                levelbuilder changes -trevor

            commit 5c01e57
            Merge: 3e96865 c459711
            Author: Trevor Berg <trevor@code.org>
            Date:   Fri Oct 2 09:48:52 2015 -0700

                Merge pull request #4306 from code-dot-org/staging

                Levelbuilder -> Staging

            commit 3e96865
            Author: Continuous Integration <dev@code.org>
            Date:   Fri Oct 2 16:48:00 2015 +0000

                levelbuilder changes -Trevor

        commit f948c38
        Merge: 7822c7f d815b63
        Author: Asher Kach <asher@code.org>
        Date:   Fri Oct 2 14:07:32 2015 -0500

            Merge branch 'staging' of https://github.com/code-dot-org/code-dot-org into fixPosteErrors

        commit d815b63
        Merge: 9699e34 d49c7b9
        Author: Bjvanminnen <Bjvanminnen@gmail.com>
        Date:   Fri Oct 2 12:07:04 2015 -0700

            Merge pull request #4288 from code-dot-org/eslint

            [Finishes #104348304] linting in dashboard

        commit 7822c7f
        Author: Asher Kach <asher@code.org>
        Date:   Fri Oct 2 13:54:14 2015 -0500

            Adds a TODO(andrew) to surface a signal how often we are not seeing a tracking ID.

        commit dd3472f
        Author: Asher Kach <asher@code.org>
        Date:   Thu Oct 1 20:36:17 2015 -0500

            Checks whether header is nil before looking up the litmus_tracking_id key. The intent is to eliminate the plethora of error messages being seen in the Staging Room.

        commit 9699e34
        Author: Continuous Integration <dev@code.org>
        Date:   Fri Oct 2 18:23:20 2015 +0000

            Update the level used for auto open function editor eyes test.

        commit 7cd8a05
        Author: caleybrock <caleybrock7@gmail.com>
        Date:   Fri Oct 2 11:23:11 2015 -0700

            change title

        commit 05877e4
        Merge: ae5b9bb 03e36de
        Author: Brendan Reville <breville@users.noreply.github.com>
        Date:   Fri Oct 2 11:21:15 2015 -0700

            Merge pull request #4313 from code-dot-org/levelbuilder

            levelbuilder -> staging (one change)

        commit d49c7b9
        Author: Brent Van Minnen <bjvanminnen@gmail.com>
        Date:   Fri Oct 2 11:20:34 2015 -0700

            lint all javascripts in dashboard/apps

        commit 03e36de
        Author: Continuous Integration <dev@code.org>
        Date:   Fri Oct 2 18:20:02 2015 +0000

            Add level that auto opens function editor to /s/allthethings

commit d08b2ca
Merge: 6a6abde 2ebef3a
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Fri Oct 2 13:40:36 2015 -0700

    Merge pull request #4297 from code-dot-org/oneReact

    [Finishes #102389490] single react

commit 6a6abde
Author: Continuous Integration <dev@code.org>
Date:   Fri Oct 2 20:40:07 2015 +0000

    Automatically built.

    commit 85041b3
    Merge: 7376e38 6d2c4c4
    Author: Brad Buchanan <bradley.c.buchanan@gmail.com>
    Date:   Fri Oct 2 13:39:28 2015 -0700

        Merge pull request #4184 from code-dot-org/applab-google-charts

        Applab: Google charts integration

    commit 7376e38
    Author: Continuous Integration <dev@code.org>
    Date:   Fri Oct 2 20:38:32 2015 +0000

        dropbox and gsheet changes

    commit f97e84c
    Merge: 5da36f9 a2f7980
    Author: Caley Brock <caleybrock7@gmail.com>
    Date:   Fri Oct 2 13:32:11 2015 -0700

        Merge pull request #4315 from code-dot-org/revert-4309-companies

        Revert "Change orgs to companies"

    commit a2f7980
    Author: Caley Brock <caleybrock7@gmail.com>
    Date:   Fri Oct 2 13:32:01 2015 -0700

        Revert "Change orgs to companies"

    commit 5da36f9
    Merge: d9f3f9b 7cd8a05
    Author: Caley Brock <caleybrock7@gmail.com>
    Date:   Fri Oct 2 13:29:16 2015 -0700

        Merge pull request #4309 from code-dot-org/companies

        Change orgs to companies

    commit d9f3f9b
    Merge: 06a424d 337c614
    Author: Josh Lory <josh.lory@code.org>
    Date:   Fri Oct 2 13:20:11 2015 -0700

        Merge pull request #4298 from code-dot-org/fix-rubocop-parser-warnings

        Fix rubocop parser warnings

    commit 06a424d
    Merge: 6cf948f ef90eed
    Author: Bjvanminnen <Bjvanminnen@gmail.com>
    Date:   Fri Oct 2 13:08:29 2015 -0700

        Merge pull request #4314 from code-dot-org/eslint

        get lint in dashboard passing again

    commit ef90eed
    Author: Brent Van Minnen <bjvanminnen@gmail.com>
    Date:   Fri Oct 2 12:52:16 2015 -0700

        get lint in dashboard passing again

    commit 6cf948f
    Merge: 077e25f 351d29b
    Author: ashercodeorg <asher@code.org>
    Date:   Fri Oct 2 14:35:29 2015 -0500

        Merge pull request #4303 from code-dot-org/fixPosteErrors

        Checks whether header is nil before looking up the litmus_tracking_id_key.

    commit 351d29b
    Author: Asher Kach <asher@code.org>
    Date:   Fri Oct 2 14:34:06 2015 -0500

        Adds the tracking bug URL to the TODO(andrew) in deliver_poste_messages.

    commit 077e25f
    Author: Brent Van Minnen <bjvanminnen@gmail.com>
    Date:   Fri Oct 2 12:27:14 2015 -0700

        disable dashboard linting until fixed

    commit 1061e95
    Author: Continuous Integration <dev@code.org>
    Date:   Fri Oct 2 19:12:10 2015 +0000

        Automatically built.

        commit d815b63
        Merge: 9699e34 d49c7b9
        Author: Bjvanminnen <Bjvanminnen@gmail.com>
        Date:   Fri Oct 2 12:07:04 2015 -0700

            Merge pull request #4288 from code-dot-org/eslint

            [Finishes #104348304] linting in dashboard

        commit 9699e34
        Author: Continuous Integration <dev@code.org>
        Date:   Fri Oct 2 18:23:20 2015 +0000

            Update the level used for auto open function editor eyes test.

        commit 05877e4
        Merge: ae5b9bb 03e36de
        Author: Brendan Reville <breville@users.noreply.github.com>
        Date:   Fri Oct 2 11:21:15 2015 -0700

            Merge pull request #4313 from code-dot-org/levelbuilder

            levelbuilder -> staging (one change)

        commit d49c7b9
        Author: Brent Van Minnen <bjvanminnen@gmail.com>
        Date:   Fri Oct 2 11:20:34 2015 -0700

            lint all javascripts in dashboard/apps

        commit 03e36de
        Author: Continuous Integration <dev@code.org>
        Date:   Fri Oct 2 18:20:02 2015 +0000

            Add level that auto opens function editor to /s/allthethings

        commit 3db7565
        Author: Brent Van Minnen <bjvanminnen@gmail.com>
        Date:   Fri Oct 2 10:57:46 2015 -0700

            remove $ from global list at the top of a bunch of files

        commit ae5b9bb
        Author: Continuous Integration <dev@code.org>
        Date:   Fri Oct 2 17:01:53 2015 +0000

            content changes -trevor

        commit 4f4e310
        Merge: c459711 4ada13c
        Author: Trevor Berg <trevor@code.org>
        Date:   Fri Oct 2 09:55:08 2015 -0700

            Merge pull request #4307 from code-dot-org/levelbuilder

            Levelbuilder -> Staging

        commit 4ada13c
        Author: Continuous Integration <dev@code.org>
        Date:   Fri Oct 2 16:54:05 2015 +0000

            levelbuilder changes -trevor

        commit 5c01e57
        Merge: 3e96865 c459711
        Author: Trevor Berg <trevor@code.org>
        Date:   Fri Oct 2 09:48:52 2015 -0700

            Merge pull request #4306 from code-dot-org/staging

            Levelbuilder -> Staging

        commit 3e96865
        Author: Continuous Integration <dev@code.org>
        Date:   Fri Oct 2 16:48:00 2015 +0000

            levelbuilder changes -Trevor

    commit 2db4d53
    Author: Continuous Integration <dev@code.org>
    Date:   Fri Oct 2 19:08:07 2015 +0000

        Automatically built.

        commit d815b63
        Merge: 9699e34 d49c7b9
        Author: Bjvanminnen <Bjvanminnen@gmail.com>
        Date:   Fri Oct 2 12:07:04 2015 -0700

            Merge pull request #4288 from code-dot-org/eslint

            [Finishes #104348304] linting in dashboard

        commit 9699e34
        Author: Continuous Integration <dev@code.org>
        Date:   Fri Oct 2 18:23:20 2015 +0000

            Update the level used for auto open function editor eyes test.

        commit 05877e4
        Merge: ae5b9bb 03e36de
        Author: Brendan Reville <breville@users.noreply.github.com>
        Date:   Fri Oct 2 11:21:15 2015 -0700

            Merge pull request #4313 from code-dot-org/levelbuilder

            levelbuilder -> staging (one change)

        commit d49c7b9
        Author: Brent Van Minnen <bjvanminnen@gmail.com>
        Date:   Fri Oct 2 11:20:34 2015 -0700

            lint all javascripts in dashboard/apps

        commit 03e36de
        Author: Continuous Integration <dev@code.org>
        Date:   Fri Oct 2 18:20:02 2015 +0000

            Add level that auto opens function editor to /s/allthethings

        commit 3db7565
        Author: Brent Van Minnen <bjvanminnen@gmail.com>
        Date:   Fri Oct 2 10:57:46 2015 -0700

            remove $ from global list at the top of a bunch of files

        commit ae5b9bb
        Author: Continuous Integration <dev@code.org>
        Date:   Fri Oct 2 17:01:53 2015 +0000

            content changes -trevor

        commit 4f4e310
        Merge: c459711 4ada13c
        Author: Trevor Berg <trevor@code.org>
        Date:   Fri Oct 2 09:55:08 2015 -0700

            Merge pull request #4307 from code-dot-org/levelbuilder

            Levelbuilder -> Staging

        commit 4ada13c
        Author: Continuous Integration <dev@code.org>
        Date:   Fri Oct 2 16:54:05 2015 +0000

            levelbuilder changes -trevor

        commit 5c01e57
        Merge: 3e96865 c459711
        Author: Trevor Berg <trevor@code.org>
        Date:   Fri Oct 2 09:48:52 2015 -0700

            Merge pull request #4306 from code-dot-org/staging

            Levelbuilder -> Staging

        commit 3e96865
        Author: Continuous Integration <dev@code.org>
        Date:   Fri Oct 2 16:48:00 2015 +0000

            levelbuilder changes -Trevor

    commit f948c38
    Merge: 7822c7f d815b63
    Author: Asher Kach <asher@code.org>
    Date:   Fri Oct 2 14:07:32 2015 -0500

        Merge branch 'staging' of https://github.com/code-dot-org/code-dot-org into fixPosteErrors

    commit d815b63
    Merge: 9699e34 d49c7b9
    Author: Bjvanminnen <Bjvanminnen@gmail.com>
    Date:   Fri Oct 2 12:07:04 2015 -0700

        Merge pull request #4288 from code-dot-org/eslint

        [Finishes #104348304] linting in dashboard

    commit 7822c7f
    Author: Asher Kach <asher@code.org>
    Date:   Fri Oct 2 13:54:14 2015 -0500

        Adds a TODO(andrew) to surface a signal how often we are not seeing a tracking ID.

    commit dd3472f
    Author: Asher Kach <asher@code.org>
    Date:   Thu Oct 1 20:36:17 2015 -0500

        Checks whether header is nil before looking up the litmus_tracking_id key. The intent is to eliminate the plethora of error messages being seen in the Staging Room.

    commit 9699e34
    Author: Continuous Integration <dev@code.org>
    Date:   Fri Oct 2 18:23:20 2015 +0000

        Update the level used for auto open function editor eyes test.

    commit 7cd8a05
    Author: caleybrock <caleybrock7@gmail.com>
    Date:   Fri Oct 2 11:23:11 2015 -0700

        change title

    commit 05877e4
    Merge: ae5b9bb 03e36de
    Author: Brendan Reville <breville@users.noreply.github.com>
    Date:   Fri Oct 2 11:21:15 2015 -0700

        Merge pull request #4313 from code-dot-org/levelbuilder

        levelbuilder -> staging (one change)

    commit d49c7b9
    Author: Brent Van Minnen <bjvanminnen@gmail.com>
    Date:   Fri Oct 2 11:20:34 2015 -0700

        lint all javascripts in dashboard/apps

    commit 03e36de
    Author: Continuous Integration <dev@code.org>
    Date:   Fri Oct 2 18:20:02 2015 +0000

        Add level that auto opens function editor to /s/allthethings

commit 85041b3
Merge: 7376e38 6d2c4c4
Author: Brad Buchanan <bradley.c.buchanan@gmail.com>
Date:   Fri Oct 2 13:39:28 2015 -0700

    Merge pull request #4184 from code-dot-org/applab-google-charts

    Applab: Google charts integration

commit 7376e38
Author: Continuous Integration <dev@code.org>
Date:   Fri Oct 2 20:38:32 2015 +0000

    dropbox and gsheet changes

commit f97e84c
Merge: 5da36f9 a2f7980
Author: Caley Brock <caleybrock7@gmail.com>
Date:   Fri Oct 2 13:32:11 2015 -0700

    Merge pull request #4315 from code-dot-org/revert-4309-companies

    Revert "Change orgs to companies"

commit a2f7980
Author: Caley Brock <caleybrock7@gmail.com>
Date:   Fri Oct 2 13:32:01 2015 -0700

    Revert "Change orgs to companies"

commit 5da36f9
Merge: d9f3f9b 7cd8a05
Author: Caley Brock <caleybrock7@gmail.com>
Date:   Fri Oct 2 13:29:16 2015 -0700

    Merge pull request #4309 from code-dot-org/companies

    Change orgs to companies

commit d9f3f9b
Merge: 06a424d 337c614
Author: Josh Lory <josh.lory@code.org>
Date:   Fri Oct 2 13:20:11 2015 -0700

    Merge pull request #4298 from code-dot-org/fix-rubocop-parser-warnings

    Fix rubocop parser warnings
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@tanyaparker tanyaparker

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@joshlory @tanyaparker