Commit Graph

349 Commits

Author SHA1 Message Date
Brian Palmer fac3b1019a spec: update test_after_commit
My fix was merged upstream.

Change-Id: I43f7b807f65cc738f930616f2a2ee685e78d0981
Reviewed-on: https://gerrit.instructure.com/43502
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: Brian Palmer <brianp@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
2014-10-29 23:14:05 +00:00
Jon Jensen 5a040333cd i18nliner(.rb)
this swaps out (most of) our ruby haax with i18nliner

test plan:
1. verify string extraction:
   1. `rake i18n:generate` before and after this commit
   2. confirm `config/locales/generated/en.yml` is identical
2. verify english defaults:
   1. use canvas in english
   2. confirm everything looks correct
3. verify translation keys/scopes:
   1. run canvas w/ RAILS_LOAD_ALL_LOCALES=true and optimized js
   2. use canvas in spanish
   3. confirm that todo está bien
4. confirm you can now use i18nliner-y features:
   1. call `t` without a key
   2. use the fancy erb block syntax

Change-Id: I979479c0889fe7e31ee0c962a4bd1998ab54d711
Reviewed-on: https://gerrit.instructure.com/42785
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jennifer Stern <jstern@instructure.com>
Product-Review: Jennifer Stern <jstern@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
2014-10-29 21:59:39 +00:00
Mysti Sadler d663303c38 Fix Diigo API Calls
fixes CNVS-2467

test plan
 - verify you can set up the diigo plugin with the information in gollum https://gollum.instructure.com/OtherServiceTestAccounts
 - on the user settings page, verify you can use your diigo username and password to register the service

Change-Id: I8d33a8c1c29a013c681488fcc38bbfe7b83cd398
Reviewed-on: https://gerrit.instructure.com/39942
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2014-10-28 17:00:50 +00:00
Brian Palmer 33e4fd6bed bump canvas-jobs to 0.9.6
Test plan: Failed jobs should retry and fail permanently as expected,
rather than getting stuck in the locked state until the worker restarts.
You can test this from the console with:

    Object.send_later(:class_variable_get, :@@blah)

And then run jobs.

Change-Id: Ic31cfe604686e6f15d95e75f3eb0e8a04f16cec1
Reviewed-on: https://gerrit.instructure.com/43396
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Nick Cloward <ncloward@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
2014-10-28 16:09:02 +00:00
Zach Wily 5e65151ea1 pandapub: add plugin settings, a simple client, and add to INST
Adds a PandaPub client and settings UI. This commit doesn't add any new
functionality or feature that use PandaPub - just the plumbing.

running and configuring PandaPub:
 * Start up a local PandaPub instance. Easiest way is with Docker:
     docker run --rm -ti -p 49000:3000  -e ADMIN_USERNAME=admin \
                -e ADMIN_PASSWORD=password zwily/pandapub:latest
 * Log into PandaPub at:
     http://$(boot2docker ip 2>/dev/null):49000/admin
   with admin/password.
 * Create a new application named "canvas"
 * Create a new key with an expiration date in the future. Record
   the key_id and secret.
 * Log into Canvas and go to PandaPub plugin settings:
     base_url: http://{DOCKER IP}:49000/
     application_id: <id from created application>
     key_id: <id from created key>
     key_secret: <secret from created key>
 * In your PandaPub admin section, open the "Console" tab for your
   created application. In the "Subscribe" section, enter "**" in the
   input box, and hit "Subscribe". This will show you the first 50
   events that arrive for the canvas application you just created.

test plan for settings:
 * Verify that the /plugins/pandapub settings page works, saving,
   disabling, etc.

test plan for client via console:
 * Set up and configure PandaPub in Canvas
 * Open a Rails console
 * Run this command to post a pandapub message:
     CanvasPandaPub.post_update("/public/foo", {"a" => 1})
 * Verify that the message showed up in your PandaPub console.

Change-Id: Ifddcbd335293c2a29f532b1e5fd44c23c8b910c4
Reviewed-on: https://gerrit.instructure.com/40311
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
QA-Review: Sean Lewis <slewis@instructure.com>
Product-Review: Zach Wily <zach@instructure.com>
2014-10-25 04:26:30 +00:00
Brian Palmer f6900880bf extract delayed_job plugin into separate gem
closes CNVS-15881

This mostly involved adding hooks to the gem for things that we were
directly modifying in Canvas, then hooking into those points in the
canvas config/initializers/delayed_job.rb file.

Periodic jobs scheduling changed a bit as well -- there's no longer
support in the extracted gem for reading a special file under config/,
so I moved our periodic_jobs.rb file to a normal initializer.

test plan: delayed jobs should still work as before, including queuing
jobs, running the worker pool, and in tests.

Change-Id: I9ce57091d18f21f4355011fcb75230193d53facb
Reviewed-on: https://gerrit.instructure.com/42027
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
2014-10-24 20:46:00 +00:00
Brian Palmer 5f80487ad9 after_transaction_commit gem extraction
refs CNVS-15881

our delayed_job depends on this, so I'm pulling it out into a gem first,
so that we can fully gemify our fork of delayed_job and use it in other
apps.

I modified the code to be built on top of the after_commit callback
functionality added in rails3, and I pulled in the test_after_commit gem
(after making a fix to it), which emulates transaction callbacks in test
mode. This makes it easier to write tests that interacts with these
callbacks, and cleans up some code in the app that was checking for test
mode and changing behavior. Fortunately, it behaves well with once-ler.

Side note: now that we are on rails3, we could replace some, but not
all, of our usage of after_transaction_commit with after_commit AR
callbacks. I didn't do that in this commit, to minimize churn.

test plan: things that happen in commit callbacks should still happen as
expected. for instance, with caching enabled, changing a /plugins
setting should still take effect immediately, because the cache is
cleared in a commit callback.

Change-Id: I66af5f66bf9fa9354352ed37edec8bd92d8e39c8
Reviewed-on: https://gerrit.instructure.com/41819
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
2014-10-24 20:45:49 +00:00
Ahmad Amireh e026c7ad4d CQS: Feature Flag & Ember quizzes purging
- The "New Quiz Statistics" feature flag now converts the regular
  statistics page into the new one that uses the React/CQS client app
- All Ember quizzes code gone
- canvas_ember_urls gem gone
- quiz_moderate feature flag gone
- quiz_stats feature flag is now allowed in prod
- statistics_cqs explicit/hidden route gone, but the statistics_cqs ERB
  and coffee bundle are still there to help ease the transition later

Closes CNVS-16330

TEST PLAN
---- ----

  - go to /courses/:course_id/quizzes/:quiz_id/statistics
    + verify you get the old/regular stats page
  - enable the "New Quiz Statistics" feature flag
    + refresh that page, verify you see the new app

Now turn the flag on and off and play around the quizzes pages, verify
everything looks OK.

Change-Id: I01fc5da80fd206df08338823ffb446a1e3a06ed0
Reviewed-on: https://gerrit.instructure.com/42965
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ryan Taylor <rtaylor@instructure.com>
Reviewed-by: Derek DeVries <ddevries@instructure.com>
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Product-Review: Ahmad Amireh <ahmad@instructure.com>
2014-10-24 08:47:55 +00:00
Cody Cutrer 0b015901fb bump authlogic for official rails4 support
Change-Id: I41bb4316c2336496194a994cc1cc62b2a5c94787
Reviewed-on: https://gerrit.instructure.com/42325
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Paul Hinze <paulh@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-10-23 21:24:26 +00:00
Cody Cutrer a190fe6786 bump switchman
also change not_ended_enrollments to be a multishard association,
since the preloader now respects the shard of the owner

test plan:
 * enroll an out-of-shard user in a course
 * do GET /api/v1/courses/:course_id/users?include[]=enrollments
 * it should include the enrollment for the out-of-shard user

Change-Id: If45f047fd12c15364076cfa7a1d3780e795e996f
Reviewed-on: https://gerrit.instructure.com/43167
Reviewed-by: Rob Orton <rob@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2014-10-23 20:41:35 +00:00
Simon Williams 77b0ad574c bump switchman to 1.2.20
fixes CNVS-14894

this fixes a problem finding shadow objects through has_through associations,
and also makes a tweak for matching global ids to try to better support 32 bit
architectures.

test plan:
- set up a course on a sharded account
- create one student in the site admin account and one in the new shard account
- enroll them both in the course
- create a Peer Review Assignment in the courses
- assign them to each peer review the other
- it should work

Change-Id: I8614791d145d11ef8ab5666234e2e7443f71f065
Reviewed-on: https://gerrit.instructure.com/42975
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2014-10-22 22:56:39 +00:00
Jon Jensen 50960779fd spec: fix once-ler/sharding issues
while recording, we weren't wrapping the default shard in a transaction,
so side effects could carry over to other groups/examples.

additionally, the previous version of once-ler added recording hooks to
any sharding group, whether or not it actually had any recordings. this
was sub-optimal, and also problematic for non-transactional tests.

this fixes a slew of the rerun failures.

also get rid of the ConnectionEnumerator, since an array suffices and is
easier to reason about (it was just like an array, except #each yielded
connections)

Change-Id: I8cf4d6fb74f2b048017a33c4fc50313cc8e5c19c
Reviewed-on: https://gerrit.instructure.com/38713
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
2014-10-21 21:19:59 +00:00
Cody Cutrer be44418405 upgrade to rspec 3
fix a blocking thing, and add a compatibility gem

and a few final missed things

fixes CNVS-16239

Change-Id: I6ffa4569f936173393eaf7225f7463a4ccba1c7c
Reviewed-on: https://gerrit.instructure.com/42715
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Braden Anderson <braden@instructure.com>
Product-Review: Braden Anderson <braden@instructure.com>
QA-Review: Braden Anderson <braden@instructure.com>
2014-10-17 18:39:43 +00:00
Braden Anderson 312e013300 xapi: create page view and asset user access
test plan:
  * play Minecraft
  * look at your user's most recent page view and asset access
  * verify that entries were added for the LTI tool

Change-Id: I422a188ed80cbedbaa8b4ecafcb3262c6f2d1e14
Reviewed-on: https://gerrit.instructure.com/42783
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brad Humphrey <brad@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
QA-Review: Braden Anderson <braden@instructure.com>
2014-10-16 17:50:40 +00:00
Shawn Meredith 71b5d1f2a1 spec: selenium driver clean up and chrome handling
Change-Id: I6f4664c819122b4a3661ecdbf077587b3c26f1a4
Reviewed-on: https://gerrit.instructure.com/42210
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Hannah Bottalla <hannah@instructure.com>
Product-Review: Shawn Meredith <shawn@instructure.com>
QA-Review: Shawn Meredith <shawn@instructure.com>
2014-10-15 16:25:14 +00:00
Nathan Mills 68756d03cc update ims-lti gem to fix specs
fixes PLAT-676

test-plan:
specs should pass

Change-Id: I39118e706ab6b6b8ed83f4914407ac2388cfb886
Reviewed-on: https://gerrit.instructure.com/42521
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brad Humphrey <brad@instructure.com>
Product-Review: Nathan Mills <nathanm@instructure.com>
QA-Review: Nathan Mills <nathanm@instructure.com>
2014-10-10 18:25:58 +00:00
Cody Cutrer eace592bf1 bump pg gem
Change-Id: I00d26eba514f8ced09cc0bfa42e8754e74e4ef69
Reviewed-on: https://gerrit.instructure.com/42284
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Bryan Madsen <bryan@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
QA-Review: Bryan Madsen <bryan@instructure.com>
2014-10-06 20:16:24 +00:00
Cody Cutrer c165e89482 allow bundler 1.7.3
Change-Id: Icb252a2937ed1a55897afc0bbb9121749745dbe5
Reviewed-on: https://gerrit.instructure.com/42092
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-10-01 16:53:35 +00:00
Cody Cutrer 9157d52bc5 bump encrypted_cookie_store
it has a rails 4 fix

Change-Id: I059d0d59ceb9db3e1ce6fe03c992d26470858d43
Reviewed-on: https://gerrit.instructure.com/42077
Reviewed-by: James Williams  <jamesw@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-10-01 15:03:20 +00:00
Cody Cutrer a5e8c6e352 bump switchman
rails 4 compatibility issue

Change-Id: Ib663144fa32ae33df93e8159a6959f07e1889248
Reviewed-on: https://gerrit.instructure.com/41781
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: James Williams  <jamesw@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-09-30 14:40:33 +00:00
Cody Cutrer cab6f70fb2 fix rails 4 Gemfile.lock under bundler 1.7
bundler 1.7 @sources no longer responds to include?. Conveniently,
the method we're overriding no longer calls include?

Change-Id: I5362b28a6819a4de9bc1e5de25b4753a8d77d9e1
Reviewed-on: https://gerrit.instructure.com/41510
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-09-25 18:01:03 +00:00
Cody Cutrer 04e8808339 bump encrypted_cookie_store
now allows booting with rails 4

Change-Id: Ieb006a5fc5e005ce8fadc7fd777fc73db927164e
Reviewed-on: https://gerrit.instructure.com/41512
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: James Williams  <jamesw@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-09-24 20:05:02 +00:00
Ethan Vizitei c4765bc2a0 gemify broadcast policy
fixes #CNVS-14270

move broadcast policy into a gem of its own
to remove plugin deprecation warnings.

TEST PLAN:
 -no behavior changes
 -regression test notifications
   (no need to hit them all, confirm that 3 or
   4 separate notifications flow and
    that will prove the pipeline)

Change-Id: If8445653ec09ab4d221124d85f9674d1cedd3751
Reviewed-on: https://gerrit.instructure.com/40899
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Matthew Wheeler <mwheeler@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
QA-Review: August Thornton <august@instructure.com>
2014-09-24 11:35:33 +00:00
Shawn Meredith 934209a6f3 spec: testbot rspec tagging
Change-Id: I20a5069fee3a5b75cc0208f312ea4135fd525bc4
Reviewed-on: https://gerrit.instructure.com/41519
Reviewed-by: Kyle Rosenbaum <kyler@instructure.com>
Product-Review: Shawn Meredith <shawn@instructure.com>
QA-Review: Shawn Meredith <shawn@instructure.com>
Tested-by: Shawn Meredith <shawn@instructure.com>
2014-09-22 20:30:38 +00:00
Nick Cloward 47803cad63 bump ruby-saml-mod version
fixes: CNVS-14531

ruby-saml-mod 0.1.30 fixes a bug with enforcing ISO-8859-1 encoding when
verifying the signature on the XML.  This will fix issues with saml
assertions containing non ASCII characters.

Test Plan:

  - Setup a SAML provider
  - Setup a user in the provider that has a non ASCII/UTF-8 character in the
    attributes passed back with the SAML response.
  - Create a user to match from the provider in Canvas.
  - The user should be able to log in throught the SAML provider.

Change-Id: Ib95c8d87acfad94c0d96957d3c2f0713738854f4
Reviewed-on: https://gerrit.instructure.com/41367
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Reviewed-by: Paul Hinze <paulh@instructure.com>
Product-Review: Nick Cloward <ncloward@instructure.com>
2014-09-19 19:34:34 +00:00
Brian Palmer c5abe5a455 avoid using a relative path for gem plugin loading
Change-Id: I33108ffccaa26a5995543e740f2696d4829254c4
Reviewed-on: https://gerrit.instructure.com/41358
Reviewed-by: Dave Donahue <ddonahue@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
2014-09-18 22:29:07 +00:00
Brian Palmer 2eb1b4db7c rails4: gemify attachment_fu
closes CNVS-14268

Since this is very clearly our own fork of the gem at this point, I've
removed a lot of unused code, rather than fixing it up to work as a gem.
This includes:

* all the other processors besides mini_magick
  * red_artisan, it was only used by the core_image processor
  * geometry and the Array monkey patch, it was only used by image science
* the db_file_backend
* the Tempfile monkey patch, I fixed the AttachmentFu code to properly
  create tempfiles with the desired extension
* removed the Technoweenie outer namespace, to match normal gem practices

test plan:

Attachments should still work as before, including viewing, uploading,
downloading, and thumbnail generation.

Change-Id: I94ff63182af839ec54b64714defd6912b0d91f65
Reviewed-on: https://gerrit.instructure.com/41281
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
2014-09-18 22:28:54 +00:00
Brian Palmer 8b8f3188ed rails4: use jammit HEAD from github
There's a rails4 fix that isn't available in a published gem version,
yet.

test plan: compile assets, and verify that still works properly in rails3

Change-Id: I24e7815f8325d52764813eab353ae226dcec0d12
Reviewed-on: https://gerrit.instructure.com/41060
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
QA-Review: August Thornton <august@instructure.com>
2014-09-16 22:14:25 +00:00
Brian Palmer 99de86e787 rails 4.0.10
Some of these tweaks to bin and config were made just to match what a
newly-generated rails4 project looks like.

Change-Id: I57a7c71e2ddd7f3295ffadf30cb0976c4d15db6a
Reviewed-on: https://gerrit.instructure.com/41186
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
QA-Review: Brian Palmer <brianp@instructure.com>
2014-09-16 22:07:39 +00:00
James Williams 064d3f198e bump selenium-webdriver gem
Change-Id: Ibe4b77daac743f545112985e4afb26cc443f6170
Reviewed-on: https://gerrit.instructure.com/41104
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Shawn Meredith <shawn@instructure.com>
Reviewed-by: Bryan Madsen <bryan@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
2014-09-15 17:34:25 +00:00
Simon Williams 2fbebd88eb upgrade aws-sdk gem to 1.52.0
we are seeing errors stream data from aws, when passing a block to read, which
appears tomatches this bug: https://github.com/aws/aws-sdk-ruby/issues/557. at
the time of this commit, it appears that upgrading the gem increases stability,
although it sounds like it is not a total solution yet, especially for ruby 2.

closes CNVS-15441

test plan:
- make sure file uploads to s3 still work

Change-Id: Ib2e84bc4697583337c1ad03da4677913a2a78aad
Reviewed-on: https://gerrit.instructure.com/40937
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2014-09-12 18:32:30 +00:00
Cameron Matheson a1f400e754 remove scribd
closes CNVS-13380
closes CNVS-8057
closes CNVS-5156

Test plan:
  * scribd should no longer exist
  * document previews should work in canvadocs

Change-Id: I5ac60c3e986f030c3aea88e32d2992ec7b1c7a08
Reviewed-on: https://gerrit.instructure.com/37895
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Anna Koalenz <akoalenz@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2014-09-11 18:42:15 +00:00
Brian Palmer 6666663076 rails4: upgrade redis-store and friends
fixes CNVS-15414

This applies to rails3 as well, we just use the appropriate version of
redis-rails for each.

test plan: redis should work as before, for both cache and data.

Change-Id: Ic34729190936a133b908e31ff186934fa435c1b6
Reviewed-on: https://gerrit.instructure.com/40898
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
2014-09-11 16:31:52 +00:00
Cody Cutrer 7f013973c3 reconnect redis on forking for switchman
fixes CNVS-15308

test plan:
 * have multiple shards
 * in console:
   Rails.cache.write('a', 'b')
   Shard.with_each_shard(parallel: 2) { Shard.default.activate { puts Rails.cache.fetch('a') } }
 * you should see a bunch of b's (one per shard), and no errors

Change-Id: I5ad7b3ae7d6c03005d229f04cf5bc2ee1e51b948
Reviewed-on: https://gerrit.instructure.com/40832
QA-Review: August Thornton <august@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2014-09-10 18:17:02 +00:00
Cody Cutrer ece4d0067a require bundler 1.6, and rip out github https monkey patch
Change-Id: I57f23949cfd0e7b8032e5a3a6113e75eb416da31
Reviewed-on: https://gerrit.instructure.com/40820
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-09-10 15:40:45 +00:00
Cody Cutrer c46c2de281 monkey patch bundler to package for all platforms
to allow a smooth transition from 1.9 to 2.1

Change-Id: I20eca8aaf824f1ea4289a3eef5fb31920ac888bb
Reviewed-on: https://gerrit.instructure.com/40771
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-09-09 17:29:48 +00:00
Cody Cutrer c689ac0add use ruby 2.1 compatible mocha with all versions of ruby
makes the lockfile the same between 1.9 and 2.1

Change-Id: I3ab1c3c7a7fcb8e6a5aba0170744d04739029209
Reviewed-on: https://gerrit.instructure.com/40753
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-09-09 00:42:00 +00:00
Nathan Mills 63945c4d35 add tool setting service
fixes PLAT-608 PLAT-613 PLAT-615 PLAT-616 PLAT-620

test-plan
*spec should pass

Change-Id: Idf2a7d89973231a070a8d368bd60554e3501cdf6
Reviewed-on: https://gerrit.instructure.com/40227
Reviewed-by: Brad Humphrey <brad@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Nathan Mills <nathanm@instructure.com>
QA-Review: Nathan Mills <nathanm@instructure.com>
2014-09-08 16:58:00 +00:00
Cody Cutrer 69522761f1 allow latest bundler
Change-Id: I5a4faf0147442714c4684b259b0ef8241df00155
Reviewed-on: https://gerrit.instructure.com/40631
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Nick Cloward <ncloward@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-09-05 16:47:49 +00:00
Brian Palmer 570ed3633d bump switchman version
fixes CNVS-13611

Change-Id: Icc9a8851c1fea98abfb5949f5093084577abaf0b
Reviewed-on: https://gerrit.instructure.com/40591
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Brian Palmer <brianp@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
2014-09-04 22:35:40 +00:00
Shawn Meredith 3088d92cd9 spec: tesbot fragile specs and testbot fork
Change-Id: I088dee811f1f27cff6488fa32eac3efa08bffd85
Reviewed-on: https://gerrit.instructure.com/40349
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Kyle Rosenbaum <kyler@instructure.com>
Reviewed-by: Shawn Meredith <shawn@instructure.com>
Product-Review: Shawn Meredith <shawn@instructure.com>
QA-Review: Shawn Meredith <shawn@instructure.com>
Tested-by: Shawn Meredith <shawn@instructure.com>
2014-09-04 17:37:57 +00:00
Brian Palmer 28d7c936c4 bump switchman version
fixes CNVS-13611

test plan: run with_each_shard tasks, such as
Reporting::CountsReport.process. It should complete without error. To
fully test the fix, you'd need to do this in an environment that has
many shards.

Change-Id: I425e8c8fb352aba15d0e9bc87b74984d4b7b8900
Reviewed-on: https://gerrit.instructure.com/40487
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-09-03 21:05:34 +00:00
Cody Cutrer cf127c3273 use github helper for dress_code gem in gemfile
Change-Id: I36af600183c33c47aac4547651db49362c52a91d
Reviewed-on: https://gerrit.instructure.com/40183
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Colleen Palmer <colleen@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-09-02 17:21:02 +00:00
Cody Cutrer 52850b6359 bump switchman
Change-Id: Id2c4e1b83e448ac519e93ed53032bc2b262412c9
Reviewed-on: https://gerrit.instructure.com/40120
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Nick Cloward <ncloward@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-08-27 23:12:54 +00:00
Cody Cutrer 48864de3f6 begin rails 4
enough for bundle install to work with 4.1.5

Change-Id: I277df9e4315fa250b6028139113c74721148e2f0
Reviewed-on: https://gerrit.instructure.com/39656
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-08-27 23:09:17 +00:00
Colleen Palmer 837e130778 Initial new_styles styleguide
fixes CNVS-14529

What it does:

- Adds feature flags for new styleguide styles
- Strips out un-needed variable highcontrast (these will need to
be set per element, not on the main color variables)
- Changes gemfile to point to temporary dress_code repo: we need this
so the dress_code generator strips out the parent tag

Test plan:

- get new gem: bundle install
- get new styles: npm run compile-sass
- regenerate styleguide: rake css:styleguide
- Make sure new_styles is disabled. You can do this in rails console:
Account.find(1).disable_feature!(:new_styles)
- Go to /styleguide and it should look the same as it does now
- Now turn on the feature flag. In rails console:
Account.find(1).enable_feature!(:new_styles)
- Refresh /styleguide and you should see are base starter styles for
the new look and feel!

Note: The new styleguide components are a wip and this request just
adds in the layout and styles specifically for the /styleguide page
to use while we work through all the components. You will notice
some funky looking ui - that's normal. We will be attacking these
components piece by piece.

Change-Id: I952b36346df77f98ddb7bbc5e27ab9b45ab4d8ca
Reviewed-on: https://gerrit.instructure.com/39600
Reviewed-by: Chris Hart <chart@instructure.com>
Reviewed-by: Derek DeVries <ddevries@instructure.com>
Product-Review: Colleen Palmer <colleen@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
2014-08-27 17:43:50 +00:00
Brian Palmer eea80f15f1 fix marginalia for postgres update/delete statements
temporarily uses our own gem again, until this gets merged upstream.

test plan: enable it in marginalia.yml , then verify that updates and
deletes get logged with the expected comment. i used the console:

Setting.create!(name: 'x', value: 'x').tap { |s| s.touch }.destroy

Change-Id: I5319551ffc4ac1444de3c78d094342cc79c6340c
Reviewed-on: https://gerrit.instructure.com/39982
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
2014-08-26 20:32:21 +00:00
Cody Cutrer 7ef41ca038 allow sharing cache_store configs between database servers
(switchman handles the details)

test plan:
 * in cache_store.yml, have something like:

oneoff:
  cache_store: redis_store

development: oneoff

 * launch rails console in development mode; Rails.cache should be a redis store

Change-Id: Ie12e655264b1f8c4a5df6ef31cf84d12cc913eb6
Reviewed-on: https://gerrit.instructure.com/39923
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2014-08-26 20:09:38 +00:00
Shawn Meredith 7031a47387 spec: testbot gems
Change-Id: I6277b485f40dc584a1157952b2e3f305dfa6a462
Reviewed-on: https://gerrit.instructure.com/38216
Reviewed-by: Kyle Rosenbaum <kyler@instructure.com>
Product-Review: Kyle Rosenbaum <kyler@instructure.com>
QA-Review: Kyle Rosenbaum <kyler@instructure.com>
Tested-by: Kyle Rosenbaum <kyler@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2014-08-22 17:19:05 +00:00
Brian Palmer b55992e8ac gemify respondus_soap_endpoint
This turns the vendor/plugin into a rails engine, and establishes the
convention of canvas-dependent rails engines/gems going into
gems/plugins, and everything in that dir being auto-required and added
to canvas spec runs.

closes CNVS-14286

test plan: regression test on the respondus quiz builder client. no
behavior should change.

Change-Id: I51b548418bcb70af77e87c2c2d62cac27ed4ab44
Reviewed-on: https://gerrit.instructure.com/38394
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
2014-08-21 16:49:54 +00:00
Nathan Mills f8e1321ec4 add fixed and variable parameters for lti2
fixes: PLAT-593 PLAT-594

test-plan:

specs should pass

Change-Id: I05e9b408655779f1c53ef17d5c98aeaf2a8e3a87
Reviewed-on: https://gerrit.instructure.com/39409
Reviewed-by: Brad Humphrey <brad@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Nathan Mills <nathanm@instructure.com>
QA-Review: Nathan Mills <nathanm@instructure.com>
2014-08-19 18:50:58 +00:00
Cody Cutrer 32ce63d3a6 bump switchman
Change-Id: I874986eb46f017b287465cdacb41657ffb8fe4c1
Reviewed-on: https://gerrit.instructure.com/39532
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-08-19 17:36:43 +00:00
Nathan Mills 542f4af201 pin the ims-lti gem
Change-Id: Ice371b54b6aa4781af2d7ef77201dfb201987cd2
Reviewed-on: https://gerrit.instructure.com/39421
Reviewed-by: Bryan Madsen <bryan@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
QA-Review: Bryan Madsen <bryan@instructure.com>
Tested-by: Bryan Madsen <bryan@instructure.com>
2014-08-15 22:37:51 +00:00
James Williams 3a2a2f579d log unmarshalling errors in encrypted_cookie_store
Change-Id: Idf8de2200b3f399f7e0dec7b5262678bd63248be
Reviewed-on: https://gerrit.instructure.com/39298
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2014-08-14 15:24:10 +00:00
Paul Hinze 14eac676d7 bump pg to v0.15.1 to silence warnings
changelog available here: http://git.io/wyHj1A

Change-Id: Ie904c2dbd8bc38934af60ed30760714ed84d2d31
Reviewed-on: https://gerrit.instructure.com/39258
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Paul Hinze <paulh@instructure.com>
QA-Review: Paul Hinze <paulh@instructure.com>
2014-08-14 14:52:29 +00:00
James Williams 05c4701ca9 update multi_json to 1.10.1
fixes #CNVS-14723

Change-Id: I2d02c692a0ef7429b1fdc55ace887ed3998a9a97
Reviewed-on: https://gerrit.instructure.com/39160
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
2014-08-12 21:41:31 +00:00
Nathan Mills 78091e43ca add lti2 launch endpoint
fixes: PLAT-578

test-plan
*install the example lti2 tool provider
*launch the message

Change-Id: Id6def4acfb972c5488fdf8190999b41fb3ebcbf5
Reviewed-on: https://gerrit.instructure.com/38752
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brad Humphrey <brad@instructure.com>
Product-Review: Nathan Mills <nathanm@instructure.com>
QA-Review: Nathan Mills <nathanm@instructure.com>
2014-08-08 19:45:17 +00:00
Brad Humphrey 817f5429b4 change tool proxy root_account to context
also, clean up ims-lti usage with pluralized lti methods

test plan:
  - registrations should still work
  - registrations without resource handlers
    and using a default message handler should still work

fixes PLAT-566 PLAT-567

Change-Id: Icd9feca44ba9f5600d89a4943b0b93b34aeb78a5
Reviewed-on: https://gerrit.instructure.com/38182
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Nathan Mills <nathanm@instructure.com>
Product-Review: Brad Humphrey <brad@instructure.com>
QA-Review: Brad Humphrey <brad@instructure.com>
2014-08-07 19:57:40 -06:00
James Williams 81558f728c remove rails 2 support
closes #CNVS-14261

Change-Id: I1b0e8a4438ab659ecd1ac8462bc3559d810989b3
Reviewed-on: https://gerrit.instructure.com/38744
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2014-08-06 18:16:19 +00:00
Hannah Bottalla 23a1ee79f8 add bullet_instructure gem and config
Change-Id: I044b10725d73cabccdee07403b4fa269c1d10944
Reviewed-on: https://gerrit.instructure.com/38279
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Bryan Madsen <bryan@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
QA-Review: Bryan Madsen <bryan@instructure.com>
Reviewed-by: Adam Ard <aard@instructure.com>
2014-08-04 16:17:09 +00:00
Ryan Shaw 485b90a6f7 replace compass with node-sass
after many steps towards this moment, we're finally here

This yanks sass and compass out of canvas-lms
completely and instead uses the libsass based
node-sass to compile our SASS files.

wins:

It is WAYYY faster!
as in, < 10 seconds to recompile all css in canvas
(compared to the 5+ minutes it used to take)

It is all in JS, helping use move to a completely
nodeJS based fronted tooling workflow.

next steps:

remove jammit: we don't need an assets.yml file
since node-sass can output compressed css for us
and we use sass to do all of our @import'ing of other
files (@colleen calls those "compiler" sheets), this
would simplify and speed up fronted asset building
even more

use gulp/broccoli/whatev to do cached, incremental builds

test plan:

all outputted css should look exactly the
same as it used to.

run `npm run compile-sass`, make sure it works
and is way faster than `rake css:generate` used to be

Change-Id: I7d865ea6b3e374cdc27a883d2019a4c15746c0e2
Reviewed-on: https://gerrit.instructure.com/38416
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
2014-08-04 15:28:29 +00:00
Cody Cutrer cbebeddac5 ruby 2.1 is tested automatically now
even if it hasn't had a full manual regression check on it

Change-Id: Ia9275c1fe95236b750b602e34727d7cd2caf2936
Reviewed-on: https://gerrit.instructure.com/38603
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-08-01 16:57:22 +00:00
Cody Cutrer 98c2fc3867 bump switchman
Change-Id: I0f245e102c2ec77bf09866245211c52d215d5447
Reviewed-on: https://gerrit.instructure.com/38327
Reviewed-by: Jon Jensen <jon@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2014-07-28 23:20:02 +00:00
Cody Cutrer 47e3d130e8 bump rails 3 for security fix
Change-Id: Ic5cb76169c56680546cafe3b3e2d3ca22165104c
Reviewed-on: https://gerrit.instructure.com/38257
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: James Williams  <jamesw@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-07-28 14:25:39 +00:00
Jeremy Stanley 6b7f0b3dc4 ignore zip entries containing '..' elements or symlinks
extract core unzip functionality into canvas_unzip gem, and put
security logic there. use this gem instead of shelling out to
`unzip` (which does not have the option to skip symlinks).

test plan:
 1. import 'evil_course_2.imscc' from CNVS-14338
    * there should be an import warning
    * you should get a blank syllabus body and
      definitely not see sensitive system data
 2. import 'evil_sis_import.zip' from CNVS-14346
    * a file called '/tmp/pwn3d' should not have been
      created on your app server
 3. sanity check the parts of canvas that unzip things:
    * course copy
    * course import
    * zip content imports via the API
    * zip file uploads from files page
    * assignment submission comments download/upload
    * sis imports

fixes CNVS-14338
fixes CNVS-14346

Change-Id: I38fa141653eb7bc483e99a28a135831b8cb3b2a6
Reviewed-on: https://gerrit.instructure.com/37959
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
2014-07-24 15:41:21 +00:00
Cody Cutrer b75e7c4708 bump switchman
Change-Id: Ia595fec5560931fd7ea89a193bde6c92206b7a17
Reviewed-on: https://gerrit.instructure.com/38027
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-07-23 21:45:08 +00:00
Cody Cutrer 2148803b55 don't use a rake_tasks bundler group
it's nonstandard, and messes with spring

Change-Id: I6e9d4a663d5bfb94f58028613f70176eec23a637
Reviewed-on: https://gerrit.instructure.com/37827
Reviewed-by: Cameron Sutter <csutter@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-07-21 19:36:07 +00:00
Ryan Shaw da900438bb fix "your browser not supported" messages on android webviews
fixes: CNVS-14316

test plan:
* in the android native app, open anything that
 loads in a webview
* you should not see a message of "Your browser
  does not meet the minimum requirements for Canvas..."

Change-Id: Ic2dda05b54155e03923afaabcbe9ebd1066949f3
Reviewed-on: https://gerrit.instructure.com/37826
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
2014-07-21 16:07:01 +00:00
Cody Cutrer 51e987de62 add springified binstubs
also switch rails3 lockfile to the default, so the spring binstub can
use the default lockfile and see itself

Change-Id: Id10cbc3df010671a59c73137a77583e2c2e0e5a8
Reviewed-on: https://gerrit.instructure.com/37802
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cameron Sutter <csutter@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-07-21 15:45:13 +00:00
Nathan Mills a91d9c09d0 add lti2 models and registration endpoints
fixes PLAT-522 PLAT-429 PLAT-545 PLAT-540 PLAT-498

test-plan
you can register an lti2 tool

Change-Id: If045b694213e1019f8a595b63a7e33ea4ac28e64
Reviewed-on: https://gerrit.instructure.com/37095
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Reviewed-by: Brad Humphrey <brad@instructure.com>
2014-07-18 16:42:10 +00:00
Colleen Palmer 0212b59646 Support for fontcustom for canvas icons
This uses the fontcustom gem to compile our icons from svgs in the
public/fonts/ folder. No more complicated workflow for adding/editing
icons!

Way to test:
  * Add your new svg to public/font/icons/
  * Important!! Edit template file to update
    stylesheet in public/font/_canvas-icons.scss
  * Run the rake task to compile: bundle exec rake icons:compile
  * Check the styleguide to make sure they're pulling in
  * Done!

Update
fixes DES-101
-takes our core_en.js file (unneeded)

fixes DES-101
- Changes font directories
- Tweaked documentation

fixes DES-101
- Tweaked documentation
- Changed directories for font icon
- Added unique hash to font name

fixes DES-101
- Changed rake task to perform bundle exec
- Updated documentation
- Added missing config file

fixes DES-101
Takes out the default [date-icon] css fontcustom puts in

fixes DES-101

Take out all the icomoon comments in the svgs

fixes DES-101

Added missing icons to font

fixes DES-101

Adds the fontcustom gem to a different gemfile

Change-Id: I9860cb074baaf4518548c9d87c1177a14d96a44c
Reviewed-on: https://gerrit.instructure.com/36974
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Product-Review: Colleen Palmer <colleen@instructure.com>
2014-07-18 15:47:45 +00:00
Cody Cutrer 45bf5773f3 fix migrations for mysql
fixes CNVS-13306
fixes gh-453

MySQL refuses to change columns that have a foreign key on them

Test plan
- Run the polling migrations on MySQL
- They should migrate the database correctly.

Change-Id: Ib781c5237c0973b254043096e536ac094dd809cf
Reviewed-on: https://gerrit.instructure.com/35511
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-07-17 20:38:10 +00:00
Cody Cutrer 480c67b46c spring!
Change-Id: I47a9776ab20c3ca26d56a898c524f7140e7374a5
Reviewed-on: https://gerrit.instructure.com/37022
Reviewed-by: Cameron Sutter <csutter@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-07-16 22:39:56 +00:00
Cody Cutrer 2f16bf5e01 bump encrypted_cookie_store
Change-Id: I03efa7b22cd2ba2f7661d1ba8e5087fa67075177
Reviewed-on: https://gerrit.instructure.com/37665
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: James Williams  <jamesw@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-07-15 14:53:08 +00:00
Cody Cutrer 0cfc4c263a bump switchman
Change-Id: I868db086df5b4e50efc936f26ce07bb4591420eb
Reviewed-on: https://gerrit.instructure.com/37620
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Reviewed-by: James Williams  <jamesw@instructure.com>
2014-07-15 12:53:57 +00:00
Cody Cutrer dce1d4bb4f move bundler version check before ruby version check
really old bundler versions don't support the ruby directive,
so give an obtuse error

Change-Id: I7ef5cd3c48b628751f2c540ef42df3d557417f95
Reviewed-on: https://gerrit.instructure.com/37556
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-07-14 18:37:13 +00:00
Jacob Fugal d9c6e2a0cd clarify Slug vs. UUID and fix event stream
refs CNVS-13987

what was called CanvasUuid was *not* generating UUIDs. it was generating
slugs. by default, its generate method only creates 4 character slugs.
these should obviously not be used as UUIDs. the misnomer already caused
a bug in EventStream where it used these slugs as UUIDs, causing
collisions. to fix:

 (1) rename canvas_uuid gem to canvas_slug, and rename it's primary
     class CanvasUuid to CanvasSlug
 (2) create new canvas_uuid gem, with class CanvasUUID, extracted from
     lib/uuid_singleton for actual UUID generation
 (3) fix event stream use CanvasUUID, rather than following the rename
     of CanvasUuid to CanvasSlug

test-plan:
 - have cassandra set up for audit logs
 - create an audit log entry (e.g. change a grade)
 - look at the generated audit log entry's id field; it should be a UUID
   value, not a 4 character slug

Change-Id: I19758fff4433cd6cb2e21219217dced19ee05c5a
Reviewed-on: https://gerrit.instructure.com/37506
Reviewed-by: Rob Orton <rob@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
2014-07-11 16:58:42 +00:00
Jon Jensen 4ce900eb07 spec: bump once-ler
Change-Id: I19c034e891b777e3d54539ca1ca563db56ee0e94
Reviewed-on: https://gerrit.instructure.com/37392
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-07-09 14:38:09 +00:00
Cody Cutrer afccc7b1ec remove comment about rails 3 not being ready for production
it kinda is now

Change-Id: Ia21a1bcd8ea321c22eb8334c18638b7bae88e9c5
Reviewed-on: https://gerrit.instructure.com/37434
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: James Williams  <jamesw@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-07-09 14:32:45 +00:00
Cody Cutrer 42433fd79f bump switchman
Change-Id: I95163638f9db1fc3ec9447d94f2f86c1ed24468d
Reviewed-on: https://gerrit.instructure.com/37319
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: James Williams  <jamesw@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-07-08 15:20:25 +00:00
Cody Cutrer e793f03740 spec: bump rspec
closer to 3.0, which we probably don't want to go to until
we can drop rspec 1 (rails 2)

Change-Id: I8affc4882bfc927a6d3b9bcc9c43fe5ab92cd3b7
Reviewed-on: https://gerrit.instructure.com/37326
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-07-07 23:16:53 +00:00
Cody Cutrer d00a9473f7 bump rails3 for security fix
Change-Id: Iaa403bbcea1aeb453bded5c068c0eb3b15bfcae0
Reviewed-on: https://gerrit.instructure.com/37320
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-07-07 16:55:55 +00:00
Jon Jensen c82a9bf2e0 spec: update once-ler
fix a couple issues so we don't have to do weird workarounds when
once-ler'ing certain specs. see:

https://github.com/instructure/once-ler/commit/2259e27
https://github.com/instructure/once-ler/commit/4f21997
https://github.com/instructure/once-ler/commit/8ec55d2

Change-Id: I516e9d2c4c66cabcd3b48460e65878e27bc2d379
Reviewed-on: https://gerrit.instructure.com/37167
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Dave Donahue <ddonahue@instructure.com>
Product-Review: Dave Donahue <ddonahue@instructure.com>
QA-Review: Dave Donahue <ddonahue@instructure.com>
2014-07-02 15:57:28 +00:00
Cody Cutrer c55c29371e allow ruby master to run with scary warning
sometimes it's needed to debug stuff in 2.1, cause it
fixes SystemStackError

bundler doesn't support it yet, so we have to use conditionals
instead of platform options

Change-Id: I88614634d24f36d7c18c999c1dc65eb91df65a32
Reviewed-on: https://gerrit.instructure.com/37010
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-07-02 02:45:59 +00:00
Jon Jensen f42af73427 spec: basic once-ler integration, speed up some specs
see https://github.com/instructure/once-ler

in rails3, reduce spec/models/a* runtime by ~45% (15min -> 8.5min locally)

Change-Id: Ia7bbc36c3602c3c3742c1b894e539584323f3e14
Reviewed-on: https://gerrit.instructure.com/37043
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Dave Donahue <ddonahue@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
2014-07-01 02:59:23 +00:00
Cody Cutrer f425cf21ea shardify db tasks in rails 3
refs CNVS-13741

Change-Id: I36a3f6d2995681d72940fbc15d2548f548611a60
Reviewed-on: https://gerrit.instructure.com/36896
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: James Williams  <jamesw@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-06-27 19:53:15 +00:00
Shawn Meredith 5f75e6486e spec: remove bullet-instructure gem
Change-Id: I0881a9f5329b5c594fe55127548d4a54ba45ad60
Reviewed-on: https://gerrit.instructure.com/36964
Reviewed-by: Hannah Bottalla <hannah@instructure.com>
Product-Review: Hannah Bottalla <hannah@instructure.com>
QA-Review: Hannah Bottalla <hannah@instructure.com>
Tested-by: Hannah Bottalla <hannah@instructure.com>
2014-06-26 22:43:41 +00:00
Cody Cutrer 4741d5623c update icalendar for ruby 2 support
Change-Id: I3249cc0516c83e22b94c9f25c3ae86b5468ee23e
Reviewed-on: https://gerrit.instructure.com/36744
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Nick Cloward <ncloward@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-06-25 14:56:53 +00:00
Cody Cutrer f46375e654 bump encrypted_cookie_store
Change-Id: I88fd54dcce77992525c86028dc663b7828094a36
Reviewed-on: https://gerrit.instructure.com/36803
Reviewed-by: Rob Orton <rob@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-06-24 20:47:35 +00:00
Cody Cutrer 53160dfd4d use an unreleased mocha on ruby 2.1
Change-Id: I3bb3a6e51fc5f76d5fc31a1c894e83ea5d5b22ec
Reviewed-on: https://gerrit.instructure.com/36737
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Rob Orton <rob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-06-24 19:39:23 +00:00
Cody Cutrer f7b58c6c87 use github directive for letter_opener gem
so that it will use https

Change-Id: I6414d8ee064a98d6726ce5633ec1a960c3804b2e
Reviewed-on: https://gerrit.instructure.com/36722
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Rob Orton <rob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-06-24 19:37:14 +00:00
Shawn Meredith 2e870768f6 spec: byebug columize gem depedency test
Change-Id: I0c1b025e5a56041accdbdbdb7e3f0240f7977f0d
Reviewed-on: https://gerrit.instructure.com/36796
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
QA-Review: Bryan Madsen <bryan@instructure.com>
Tested-by: Shawn Meredith <shawn@instructure.com>
2014-06-24 18:46:25 +00:00
Cody Cutrer 3ab3603c0f update byebug
Change-Id: I556531bc8a959586161768a1fa8723b171bbedce
Reviewed-on: https://gerrit.instructure.com/36753
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Nick Cloward <ncloward@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-06-24 15:24:49 +00:00
Hannah Bottalla 55292628a2 add bullet_instructure gem to RAILS3
Change-Id: I3d0ae2c2d7ed9665f920d4aab79ae6837c67d32d
Reviewed-on: https://gerrit.instructure.com/36694
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Kyle Rosenbaum <kyler@instructure.com>
Product-Review: Hannah Bottalla <hannah@instructure.com>
QA-Review: Hannah Bottalla <hannah@instructure.com>
Tested-by: Hannah Bottalla <hannah@instructure.com>
2014-06-23 20:28:51 +00:00
Cody Cutrer 5e7d9a7f1f update hairtrigger
so it doesn't puke on newer rubies

Change-Id: I10524adc76478e7908d843c2936b91b795b9ab71
Reviewed-on: https://gerrit.instructure.com/36721
Reviewed-by: Rob Orton <rob@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-06-23 20:06:08 +00:00
Cody Cutrer 36de3c91e4 remove deprecation warning in ruby 2.1
Change-Id: I458ba8a1dc0d399d4a127712addf7f310994d098
Reviewed-on: https://gerrit.instructure.com/36726
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Rob Orton <rob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-06-23 19:33:08 +00:00
Cody Cutrer 24b8e76a22 allow ruby 2.1.2 and bundler 1.6.3
Change-Id: I1ee8bf656f1ec78c1a2c754dc1fec857a2ab79bf
Reviewed-on: https://gerrit.instructure.com/36710
Reviewed-by: Rob Orton <rob@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-06-23 17:52:39 +00:00
Paul Hinze 7f3df8adfb bump ruby-saml-mod to 0.1.29
refs OPS-170

Change-Id: Iec3f9064b40b12fbf801cc80e5052efa1a018f6f
Reviewed-on: https://gerrit.instructure.com/36602
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Paul Hinze <paulh@instructure.com>
QA-Review: Paul Hinze <paulh@instructure.com>
2014-06-18 22:20:35 +00:00
Cody Cutrer 3d6ee525d7 bump switchman
Change-Id: I329259d419fe20deb1c46ff2048bdf46bf980845
Reviewed-on: https://gerrit.instructure.com/36356
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-06-16 18:08:46 +00:00
Cody Cutrer 94ff219c98 bump rake version
for the OCD in all of us (and those that like to avoid
`bundle exec`)

Change-Id: Id4850f22a40b5a52b9a4ae89bccc3e774e17c834
Reviewed-on: https://gerrit.instructure.com/36313
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Nick Cloward <ncloward@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-06-13 15:56:42 +00:00
Cody Cutrer e4b98d012d bump switchman
Change-Id: Ida6ece6f8b226153a68cd30b0a86b52ac2d78ac8
Reviewed-on: https://gerrit.instructure.com/36325
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Rob Orton <rob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-06-12 19:36:38 +00:00
Shawn Meredith 73c81c56a8 spec: selenium upgrade 2.42
Change-Id: I470f89d9cc9c73046dca54e451d0ee234f60d0a0
Reviewed-on: https://gerrit.instructure.com/36098
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Kyle Rosenbaum <kyler@instructure.com>
Product-Review: Kyle Rosenbaum <kyler@instructure.com>
QA-Review: Kyle Rosenbaum <kyler@instructure.com>
2014-06-11 15:20:35 +00:00
Cody Cutrer a3ef2c03b3 bundler 1.6 support
native bundler api for changing github sources to https

Change-Id: Ie6cc75b7279bf7bdb7bbb0e3f7423206ae5a05c7
Reviewed-on: https://gerrit.instructure.com/35834
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Rob Orton <rob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-06-05 02:19:46 +00:00
Ethan Vizitei 39a35ab09e Use source user as "FROM" for emails
This gives certain user-triggered events
a "look" as though they came directly from
that user (the FROM and REPLY-TO headers
have the name of the source user).

This also introduces "letter_opener" into the
dev environment.  If you use "letter_opener"
as your send method for dev emails, it will
open all emails in a browser tab. Very useful.

closes: CNVS-11837

TEST PLAN:

Validate each of the following notifications
looks like it's "from" the source user:

- Submitting an assignment
- Resubmitting an assignment
- Posting to a discussion
- sending a conversation message
- posting a comment on a submission

Change-Id: I0e04aa9aa5bf31a590e69507e04b86b637247acf
Conflicts:
	app/models/message.rb
Reviewed-on: https://gerrit.instructure.com/35362
Reviewed-by: Drew Bowman <dbowman@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Drew Bowman <dbowman@instructure.com>
2014-05-31 01:02:14 +00:00
Cody Cutrer 0708f5bbb7 bump switchman version
Change-Id: I917579dfaf73f869b032aa9a5377129726095931
Reviewed-on: https://gerrit.instructure.com/35653
Reviewed-by: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2014-05-30 21:08:05 +00:00
Brian Palmer 6f7e610124 support cassandra 1.2+ consistency level usage
This changed from a part of the query string in cassandra 1.1 to a
separate parameter passed to execute in cassandra 1.2 and above.
Unfortunately we need to jump through some hoops to support both, until
we've fully upgraded to 1.2.

This commit adds a placeholder to the query string %CONSISTENCY% that
will be replaced with the chosen level in 1.1, and replaced with the
empty string in 1.2. Once we've upgraded to 1.2, we can remove all this
as it'll just be another option to the method.

closes CNVS-9273

test plan:

Using each of cassandra 1.1, 1.2, and 2.0:

* Clear out the consistency level Settings
  * Setting.connection.delete("DELETE FROM settings WHERE name LIKE 'event_stream.%_consistency%'")
  * Verify that page views and audit logs can be fetched, verify in the
    rails logs that no consistency level is given in the CQL query
    lines
* Set the consistency level
  * Setting.set('event_stream.read_consistency', 'ONE')
  * Verify that page views and audit logs can be fetched, verify in the
    rails logs that consistency level "ONE" is given in the CQL query
    lines. In 1.1, this will be in the query string, in 1.2 and 2.0 it
    will follow the query in an options hash

Change-Id: I3d007376d096e6ed31a40e699e77dca4cdd065a2
Reviewed-on: https://gerrit.instructure.com/35171
Tested-by: Brian Palmer <brianp@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
2014-05-23 18:53:25 +00:00
Rob Orton 296af05c8b add a service parameter to our CAS logout
fixes CNVS-12161

test plan
 - regression test CAS login and logout
 - logout should now include service parameter

Change-Id: Ieab7d53021eaf8697bf1636a438a6da4556df905
Reviewed-on: https://gerrit.instructure.com/33498
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
2014-05-21 21:02:50 +00:00
Ryan Shaw f901f2754a use autoprefixer to +,- css rules to match the browsers we support
AKA: run all of our compiled sass through autoprefixer
so we don't serve css designed for browsers we
don't support and so that we do output css for the
browsers we do support.

This will result in us sending the browser A LOT less
css. see this patch for how much it will remove from
our current css:
https://gist.github.com/ryankshaw/fd0ea0a8af4596569dcb

The idea going forward would be to write your css
prefix-free and just let autoprefixer handle the
rest for you.

Also, now that this exists, we could (and should)
retroactively go through the code base and remove
some of these places where we have these prefixes
to keep our css more maintainable.

test plan:
open /styleguide (or any canvas page) in ie10 (or any browser)
it should look exactly the same as it did before

Change-Id: I7e55518d69580af692a8f04ac6fe2b491f7678af
Reviewed-on: https://gerrit.instructure.com/34940
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Colleen Palmer <cpalmer@instructure.com>
Reviewed-by: Tyler Pickett <tpickett+gerrit@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
2014-05-20 16:35:45 +00:00
Anthus Williams 62ec134c92 active_polymorph
fixes CNVS-12143

allow polymorphic names in ActiveRecord has_many
associations; when retrieving association, use these
names to retrieve records with different (but synonymous)
foreign_types

currently this gem only addresses has_many relationships
to achieve feature-parity with the existing Quizzes
monkeypatching. A future commit will address adding
similar functionality to other types of associations

test plan:
1) Create a quiz with id Q
2) Attempt the quiz twice, so you can see
both attempts on submission_history/ gradebook
3) In the rails console, get the set of attempts:

versions = Quizzes::QuizSubmission.where(quiz_id: Q).first.versions

4) Change the versionable_type of one of the attempts, but not the other:  

versions.where(id: versions.first.id).update_all(versionable_type: 
"Quiz")

5) Check the submission_history/gradebook to verify
that you still see both attempts

Change-Id: Ia9611a35705ba2929a92757f586a916dce90a4ee
Reviewed-on: https://gerrit.instructure.com/33505
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Anthus Williams <awilliams@instructure.com>
2014-05-19 22:05:09 +00:00
Cody Cutrer cdac660ffe upgrade debugger gem to work with 1.9.3p545
Change-Id: I0d49d7af9a6a688e6ef04c1ee6ed1e9a86102ff3
Reviewed-on: https://gerrit.instructure.com/34808
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-05-15 04:16:06 +00:00
Nick Cloward 19ea2789dd canvas event stream
fixes: CNVS-10477

Test Plan:

Make sure auditing still works.

Change-Id: I021c0772ad0cf337d452b55bf690d15ce1a61a09
Reviewed-on: https://gerrit.instructure.com/31494
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Product-Review: Nick Cloward <ncloward@instructure.com>
2014-05-14 19:09:24 +00:00
Ahmad Amireh 555e7b0e18 Quiz Stats [Backend] - Gem & Essays
Refactoring the generation of quiz question statistics into its own gem.
This patch adds support for Essay question statistics.

Closes CNVS-12725

TEST PLAN
---- ----

  - create a quiz with an essay question
  - perform an API request to retrieve the quiz statistics
  - ensure that the following metrics are generated and correct:
    - "graded": number of students whose answers have been graded by the
      teacher
    - "full_credit": number of students who received a full score
    - "point_distribution": a list of scores and the number of students
      who received them (so if 2 students got graded for 3 points, it
      should have a key of 2 and a value of 3), un-graded submissions
      should be keyed under null
    - "responses": number of students who answered the question
      (wrote anything)
    - "user_ids": IDs of those students
  - documentation for QuizStatistics -> Essay should be updated with the
    new stats

> Other things to test

  - verify that the old statistics page still renders:
    /courses/:course_id/quizzes/:quiz_id/statistics
  - verify that you can still generate both student and item analysis
    CSV reports

API endpoint for quiz stats:

  /api/v1/courses/:courseid/quizzes/:quiz_id/statistics [GET]

Change-Id: Ib15434ff4cef89ac211c1f4602d1ee609ef48ec4
Reviewed-on: https://gerrit.instructure.com/33990
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Reviewed-by: Derek DeVries <ddevries@instructure.com>
Product-Review: Ahmad Amireh <ahmad@instructure.com>
2014-05-12 15:02:45 +00:00
Joseph Rodriguez 2d9cfc5ac4 moved Facebook code into gem
fixes: CNVS-12120

test plan:
- regression test facebook functionality

Change-Id: I041e726ee12f9eca8fc27ccdd049422073d1af15
Reviewed-on: https://gerrit.instructure.com/33595
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2014-05-05 22:32:15 +00:00
Brian Palmer 0fda289ad3 bump ruby-saml-mod version
fixes CNVS-12871

test plan:

* regression test on saml logins
* the saml login redirect should not contain newlines encoded in the
  base64 (%0A characters)

Change-Id: I28470ce165ec1f8a90cfb22983d49d017bb72b80
Reviewed-on: https://gerrit.instructure.com/34311
Reviewed-by: Rob Orton <rob@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
2014-05-05 22:24:01 +00:00
Raphael Weiner a13f85e0ed move twitter to gem
fixes: CNVS-12492

test-plan:
* Test that all things Twitter related still work

Change-Id: Ib656c5bfcb2dc8490a6fa6f214b0f6dce25ad181
Reviewed-on: https://gerrit.instructure.com/33193
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Reviewed-by: Mike Nomitch <mnomitch@instructure.com>
Reviewed-by: Liz Abinante <labinante@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2014-05-05 20:08:27 +00:00
Derek DeVries 1168ed5ab4 make show/moderate/statistics actions redirect to fabulous quizzes when enabled
fixes CNVS-12752, CNVS-12753, CNVS-12754

test plan:
  - turn fabulous quizzes off
  - visit an individual quiz with fabulous quizzes turned off
  - switch fabulous quizzes on
  - refresh the page
  - it should redirect to the overview tab on fabulous quizzes
  - the url should be something like: /courses/1/quizzes/fabulous_quizzes#/437

  - turn fabulous quizzes off
  - visit the quiz moderate page for a quiz with fabulous quizzes turned off
  - switch fabulous quizzes on
  - refresh the page
  - it should redirect to the moderate tab on fabulous quizzes
  - the url should be something like: /courses/1/quizzes/fabulous_quizzes#/437/moderate

  - turn fabulous quizzes off
  - visit the quiz statistics page for a quiz with fabulous quizzes turned off
  - switch fabulous quizzes on
  - refresh the page
  - it should redirect to the statistics tab on fabulous quizzes (which is
    currently an empty page)
  - the url should be something like: /courses/1/quizzes/fabulous_quizzes#/437/statistics

  - turn fabulous quizzes on
  - edit a quiz
  - when you save the quiz, it should redirect to the overview tab

  - try other variations which should bring you back to the show/moderate/stats
    pages. They should all bring you to the correct tabs on fabulous now

Change-Id: I85e8b628c0562d72c72a30e4e8340dd2cc0adcac
Reviewed-on: https://gerrit.instructure.com/34112
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Reviewed-by: Jason Madsen <jmadsen@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Derek DeVries <ddevries@instructure.com>
2014-05-03 18:18:56 +00:00
dave e983aa90ce bug fix adobe connect conferences were not able to initialize
refs PS-1426

Change-Id: Iaa3b8c53de76472f27886757da5d56a6adf3e00f
Reviewed-on: https://gerrit.instructure.com/34154
Reviewed-by: Jake Sorce <jake@instructure.com>
Product-Review: Jake Sorce <jake@instructure.com>
QA-Review: Jake Sorce <jake@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2014-05-02 17:42:40 +00:00
dave 32f92b6f40 bump canvas_connect gem version
***test plan
  1.  have a user make an adobe connect recording
  2.  try to view the recording with a user that has
      never made a recording
      *user should also be enrolled in the course
  3.  verify that the user is taken to the recording
      and not required to login

Change-Id: I1712c2745261860e2e0e06ecb288c6b0b344f786
closes:  PS-1426
Reviewed-on: https://gerrit.instructure.com/33791
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jake Sorce <jake@instructure.com>
Product-Review: Adam Phillipps <adam@instructure.com>
QA-Review: Adam Phillipps <adam@instructure.com>
2014-04-30 15:31:12 +00:00
Kenneth Romney 31361b5255 extract lib/text_helper to gems/canvas_text_helper
fixes: CNVS-12305

test plan:
summaries email should be formatted correctly with indentations.
twitter messages should not be longer than 140 characters.

Change-Id: I912a63b03c6c14de0c1d678063bb8fa33504d843
Reviewed-on: https://gerrit.instructure.com/33171
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2014-04-30 15:18:40 +00:00
Raphael Weiner 5553f62357 extract incoming mail into gem
fixes CNVS-12182

test plan
- regression test on incoming mail
- use script/process_incoming_emails to manually trigger the processing
  of incoming mail

Change-Id: Iccd74d8fe2b5af3d5eefe25a2736273e3bf559b0
Reviewed-on: https://gerrit.instructure.com/32794
Reviewed-by: Simon Williams <simon@instructure.com>
Reviewed-by: Braden Anderson <banderson@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Product-Review: Joel Hough <joel@instructure.com>
2014-04-25 23:06:02 +00:00
Cody Cutrer 1f7bf77f27 bump switchman and shackles
Change-Id: I0377060ca611840cce34c6dc03b4c2c7d631d952
Reviewed-on: https://gerrit.instructure.com/33877
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-04-25 21:54:04 +00:00
Raphael Weiner 8be0ae37d7 Move google_docs code into a gem
fixes: CNVS-12329

Change-Id: I044725c93582cbca39a61e036bb5f0385e069c1e
Reviewed-on: https://gerrit.instructure.com/32990
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2014-04-25 21:50:43 +00:00
Brian Palmer 1a214eb430 integrate rack-mini-profiler for in-app perf measurements
Only site admins with the "Application Profiling" permission will see
this UI or be able to trigger profilings. The little UI that shows up in
the top left corner contains information on request timings, renderings,
AR queries and timings, and other information about the request.

When Redis is configured, you can share this information with others
(until it drops out of Redis) using a special link given in the UI.

closes CNVS-12563

test plan:

As a full site admin
  * enable the profiling UI by appending ?pp=enable to a request
  * visit canvas pages and verify you can see the new profiling UI

Verify that for all non site admins, the UI doesn't show up and cannot
be enabled with ?pp=enable. It also can't be enabled by other site admin
roles unless permission is given in the site admin permissions UI.

You don't need to do in-depth testing of the UI itself, though do a
quick smoke test to make sure it doesn't interfere with canvas at all or
modify the HTML returned for non-site-admins.

Change-Id: I4e71389af6b56bdff3617170c16b2ee70cea5c6f
Reviewed-on: https://gerrit.instructure.com/33541
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
2014-04-25 15:40:44 +00:00
Joseph Rodriguez baeeb6efc3 refactor and make gem rake task inclusion explicit
fixes: CNVS-12513

test plan:
- run rake tasks for i18n and jst

Change-Id: Ied2b1d67979e55356adfef1cc7aaed42aa0c4b5a
Reviewed-on: https://gerrit.instructure.com/33501
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
QA-Review: Simon Williams <simon@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2014-04-24 15:50:31 +00:00
Raphael Weiner 732d4991e5 extract linkedin into a gem and add tests
fixes: CNVS-12119

test plan:
regression test linkedin functionality

Change-Id: I9cec121d641db37d4c8f6a04966e766e9f8b293e
Reviewed-on: https://gerrit.instructure.com/33473
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Product-Review: Jason Madsen <jmadsen@instructure.com>
2014-04-23 20:23:55 +00:00
Raphael Weiner 71d9f96279 extract canvas_ext gem
fixes: CNVS-11902

Test Plan:

Make sure Canvas is not broken.  This will break a lot of things if it
does not work correctly.

Change-Id: I8701ff8c271a162a712fe3be05a4fd361430b26e
Reviewed-on: https://gerrit.instructure.com/32113
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Jason Madsen <jmadsen@instructure.com>
2014-04-23 17:39:32 +00:00
Jon Willesen 1f4737ed05 add migration_selection lti extension
this commit lets canvas remember that an LTI has this extension.
launching and using LTI for content migrations will happen
separately.

refs LOR-20

test plan:
 - configure an LTI tool with XML that includes the
   migration_selection extension
 - the tool should show up in the tool list with the "Migration
   Selection" tag.

Change-Id: I880125515a32af1b9a39fbd1787617bceae74f50
Reviewed-on: https://gerrit.instructure.com/21442
Reviewed-by: Jake Trent <jaketrent@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Reviewed-by: Brad Humphrey <brad@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Jon Willesen <jonw@instructure.com>
2014-04-23 17:05:41 +00:00
Cody Cutrer f0b2306cc9 bump rake gem
Change-Id: I751f667195264b4066ed852767c2240b4ef0db6f
Reviewed-on: https://gerrit.instructure.com/33642
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-04-23 14:22:19 +00:00
Mark Severson a1dde79530 extract handlebars_tasks gem
fixes CNVS-11180

test plan:
 * ensure the jst rake commands operate correctly
	 * jst:compile
	 * jst:ember

Change-Id: Ibe3109cf2708abf08783e06b180eba9299472ccb
Reviewed-on: https://gerrit.instructure.com/29920
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2014-04-21 19:48:22 +00:00
Mark Severson a1fac754d2 extract i18n_tasks gem
fixes CNVS-11181

test plan:
 * i18n rake tasks still operate correctly

Change-Id: I261973a947ce28840d6817f5a931f5221192e8db
Reviewed-on: https://gerrit.instructure.com/31441
Reviewed-by: Jon Jensen <jon@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2014-04-21 03:19:47 +00:00
Mark Severson 4fbe46509c extract i18n_extraction gem
fixes CNVS-11182

test plan:
 * rake i18n tasks work correctly
 * rake jst tasks work correctly

Change-Id: I9777649e338d81cd7129c887acc18d9ef6722a92
Reviewed-on: https://gerrit.instructure.com/31440
Reviewed-by: Jon Jensen <jon@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2014-04-21 03:19:30 +00:00
Ryan Shaw ca503542e2 a way for accounts to opt-in to new styles and users to high-contrast
fixes CNVS-11426

The UI/UX team *really* wants to start doing some major style changes
to the canvas interface. Because it is a very visual change and especially
because we've let people hack the crap out of canvas styles with
their own css override file, any changes we do need to be behind a
feature flag so an institution can opt-in when they are ready.

This commit does some trickery so we actually create 4 different versions
of every stylesheet. one for each variant in:
legacy_normal_contrast legacy_high_contrast
new_styles_normal_contrast new_styles_high_contrast
and then sets the $use_new_styles and $use_high_contrast sass variables
accordingly in each.

now, in any sass file, you can do things like:
  @if $use_new_styles {
    background-color: red;
  } @else {
    background-color: blue;
  }

  @if not $use_high_contrast{
    font-size: 12px;
  }

test plan:

* in a production (minified assets) environment, ensure you see:
  <link href="/assets/common_legacy_normal_contrast.css... in the <head> of the page
* go to the account settings page for the domain_root_account you are on
* turn on the "Use New Styles" feature
* now verify that <link href="/assets/common_new_styles_normal_contrast.css...
  is in the <head>. There should not be any visible differences because we do
  not have any styles that target specifically $use_new_styles yet.
* now, go to /settings and turn on the user feature for "Use High Contrast Styles"
* verify that <link href="/assets/common_new_styles_high_contrast.css..
  is in the <head>
* again, turning that on will not actually change the way anything looks,
  the next commit (g/32863) will take care of that

Change-Id: I45ba4ddfe780c5c819fb995b61ebfc0a5325d418
Reviewed-on: https://gerrit.instructure.com/31881
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2014-04-17 19:47:05 +00:00
Joseph Rodriguez c6fce9e781 extract bookmarked_collection gem
fixes: CNVS-11645

Test Plan:

Test the groups api endpoint at

api/v1/users/self/groups?context_type=Account

Make sure its not broken.

Change-Id: I2a17672f0e81530aa8623c5ed16b9cb0bb6b3ce5
Reviewed-on: https://gerrit.instructure.com/31417
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Product-Review: Jacob Fugal <jacob@instructure.com>
2014-04-17 18:16:13 +00:00
Nick Cloward f1009a38fe canvas kaltura gem
fixes CNVS-10479

test plan:
  - in a course with kaltura enabled
    - go to a discussion and add media
    - upload a video (use right tab, not the webcam)
    - save the video/discussion post
    - the video should be saved properly and viewable
      (this sometimes takes a minute of two)

Change-Id: I40b9174807707dd1fb41125e04705422a8711d5d
Reviewed-on: https://gerrit.instructure.com/32024
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2014-04-16 19:39:45 +00:00
Raphael Weiner 9a08d9d934 Move time related code into canvas_time gem
fixes CNVS-10748

Change-Id: If9015c54bf54969d8c47e5e39a372e1c5bfe158b
Reviewed-on: https://gerrit.instructure.com/32532
Reviewed-by: Raphael Weiner <instructure@pivotallabs.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
QA-Review: August Thornton <august@instructure.com>
2014-04-14 20:47:01 +00:00
Joseph Rodriguez 86c8d2a7ed Extract paginated collection gem
refs: CNVS-11648

Test Plan:

Test the sub_accounts api endpoint and make sure the pagination
is not broken.

Change-Id: Ie59674a7a834698ac432307940305d6958cb73f1
Reviewed-on: https://gerrit.instructure.com/31413
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2014-04-10 20:14:13 +00:00
James Williams bdbf0ccbd7 bump canvas_connect to version 0.3.3
test plan:
* using rails 3, plugin settings should render for adobe connect

fixes #CNVS-12185

Change-Id: Ie220862400eac8b9a6f7200d611eeec8a632a1c3
Reviewed-on: https://gerrit.instructure.com/33053
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Nathan Rogowski <nathan@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
2014-04-09 19:08:48 +00:00
Joseph Rodriguez bfbaf63de6 move acts_as_list to gems (empty vendor/plugins)
fixes CNVS-12056

test plan:
  * ordering/reordering of modules/module items should still work
  * ordering/reordering of discussion topics should still work

Change-Id: I599b559933a4a89c9329d631d71f83343c6f24da
Reviewed-on: https://gerrit.instructure.com/32516
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
Reviewed-by: Cameron Sutter <csutter@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
2014-04-07 22:37:09 +00:00
Nick Cloward 44bd4b6f61 update ruby-saml-mod for canvas
fixes: CNVS-11530

See PR: https://github.com/bracken/ruby-saml/pull/20

Test Plan:

Make sure SAML is not broken.
Make sure Signature element is not included in logout requests.

Change-Id: I9d17378136eb2cce4353731c90ab909bad0a54ca
Reviewed-on: https://gerrit.instructure.com/32558
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Product-Review: Nick Cloward <ncloward@instructure.com>
2014-04-07 14:15:51 +00:00
Nick Cloward 4748aba483 extract canvas sort gem
fixes: CNVS-11890

Test Plan:

Canvas Should not be broken, test requests that use the SortLast and SortFirst
class.  One is account settings.  Make sure its sorted correctly.  Another is
submissions_controller show method and make sure the visible rubric assesments
are sorted correctly.

Change-Id: I75a61475a928e069d6566fcc51305a6c442ec5a0
Reviewed-on: https://gerrit.instructure.com/32014
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
QA-Review: Simon Williams <simon@instructure.com>
2014-04-04 14:53:09 +00:00
dave f63795a836 update webex to 0.14
refs PS-1325

Change-Id: I31faaff52c2cd549c7a0a493fd7f35ba081c4230
Reviewed-on: https://gerrit.instructure.com/32806
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jake Sorce <jake@instructure.com>
Product-Review: Adam Phillipps <adam@instructure.com>
QA-Review: Adam Phillipps <adam@instructure.com>
2014-04-03 21:24:05 +00:00
Joseph Rodriguez ccd8b38d6a Extract canvas_http into seperate gem.
Change-Id: Ib90c12b99d30853a0a1a0235c9aa1b5dd645f614
fixes: CNVS-11949
Reviewed-on: https://gerrit.instructure.com/32176
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
Reviewed-by: Stanley Stuart <stanley@instructure.com>
QA-Review: August Thornton <august@instructure.com>
2014-04-02 17:22:38 +00:00
Anthus Williams bd2eefce9a re-add indentation semantics to Gemfile
during a previous commit
(SHA 10e7b5b003bea9aea3286b9170f5e04b8a9e3735)
we removed indentation of gems, but this indentation
had semantic significance for us: any gem which was
not required by canvas but was required by another
gem required by canvas was indented. This allowed us
to clarify that canvas didn't actually use the gems
while still locking into specific versions of each

Also added a comment explaining this to Gemfile

Change-Id: I0f476e1bed6156f2f5969e54d56d44ded5442a0f
Reviewed-on: https://gerrit.instructure.com/32588
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Anthus Williams <awilliams@instructure.com>
QA-Review: Anthus Williams <awilliams@instructure.com>
2014-04-01 20:06:50 +00:00
Shawn Meredith 5e8cbc8d39 Revert "Revert "spec: selenium 2.40 firefox 2.70 upgrades""
This reverts commit 4498b890bd.

Change-Id: I73865e62e6953f78fa583427a99855719e300880
Reviewed-on: https://gerrit.instructure.com/32578
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Shawn Meredith <shawn@instructure.com>
Product-Review: Shawn Meredith <shawn@instructure.com>
QA-Review: Shawn Meredith <shawn@instructure.com>
Tested-by: Shawn Meredith <shawn@instructure.com>
2014-04-01 07:44:48 +00:00
Joseph Rodriguez 24680d9925 extract JSONToken gem
fixes: CNVS-11785

Test Plan:
Automated tests will check most of it.  Make sure Canvas is not broken.

Change-Id: I797a71b492a043fc7d14b88457842bbde4295bb2
Reviewed-on: https://gerrit.instructure.com/31719
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
2014-03-31 19:55:29 +00:00
Simon Williams 68ab2e79d0 fix path to RAILS_LTS file in Gemfile
fixes CNVS-12130

test plan:
- have a RAILS_LTS file in a vendor/plugin folder
- it should be found by bundler

Change-Id: I9edeb6b24246b7bf5373367c168db77a14a35453
Reviewed-on: https://gerrit.instructure.com/32596
Reviewed-by: Anthus Williams <awilliams@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
QA-Review: Simon Williams <simon@instructure.com>
2014-03-31 18:09:02 +00:00
Shawn Meredith 4498b890bd Revert "spec: selenium 2.40 firefox 2.70 upgrades"
This reverts commit de462a82d2.

Change-Id: I70f6ae29a4e8955b84d2be03672b3a7c9c1a6bd3
Reviewed-on: https://gerrit.instructure.com/32575
Reviewed-by: Shawn Meredith <shawn@instructure.com>
Product-Review: Shawn Meredith <shawn@instructure.com>
QA-Review: Shawn Meredith <shawn@instructure.com>
Tested-by: Shawn Meredith <shawn@instructure.com>
2014-03-31 08:38:50 +00:00
Shawn Meredith de462a82d2 spec: selenium 2.40 firefox 2.70 upgrades
Change-Id: I1b07116abbc86fe72cc2bda571fc07c71c016d0c
Reviewed-on: https://gerrit.instructure.com/32573
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Shawn Meredith <shawn@instructure.com>
Product-Review: Shawn Meredith <shawn@instructure.com>
QA-Review: Shawn Meredith <shawn@instructure.com>
Tested-by: Shawn Meredith <shawn@instructure.com>
2014-03-31 07:20:33 +00:00
Anthus Williams 5ed608bb72 partition Gemfile
this is a proof-of-concept to see if partitioning
our Gemfile helps more than it hurts. It's modeled
after the way the Squash team handles its dependencies

this doesn't implement any of the particularly nice
things that can be found in the Squash set up, such
as conditionally loading gems based on the contents
of our configuration files (we can already sort of
do this with groups in bundler), but it's a start.

In particular, it allows us to add non-OSS gems to
Gemfile.d without necessarily having to release it
as part of our open-source packaging

Change-Id: If7ff1fe97409de4cd09867ad5be1c4134c5d0117
Reviewed-on: https://gerrit.instructure.com/32442
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Nick Cloward <ncloward@instructure.com>
Product-Review: Anthus Williams <awilliams@instructure.com>
QA-Review: Anthus Williams <awilliams@instructure.com>
2014-03-28 16:44:56 +00:00