Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Bootstrap #3

Merged
merged 196 commits into from

3 participants

@scotdalton
Owner

First cut of the bootstrap refactor.

scotdalton added some commits
@scotdalton scotdalton Initial refactor HTML and stylesheets to use Twitter bootstrap. 3d22a1d
@scotdalton scotdalton Comment out search types for now. df65acb
@scotdalton scotdalton Look at layout. e488259
@scotdalton scotdalton Update to use twitter bootstrap through bootstrap-sass gem. Still a w…
…ork in progress.
548eda5
@scotdalton scotdalton Add search prefix to configuration lookup. c99aba4
@scotdalton scotdalton Add travis ci yml. 7b94e46
@scotdalton scotdalton Add build status. db870be
@scotdalton scotdalton Add date helper functions for generating date dropdowns. 584c5cc
@scotdalton scotdalton Update form to use Twitter Bootstraps built in form classes. 2a8ad86
@scotdalton scotdalton Update referent values for mass assignment issue/requirement in recen…
…t rails 3 versions.
25bd779
@scotdalton scotdalton Update layout for export email controller to use umlaut_config layout. 794ef03
@scotdalton scotdalton Refactor CSS, HTML and views for Twitter bootstrap. 14c6ddd
@scotdalton scotdalton Name change for location method which appears to conflict with and in…
…ternal rails method name. Refactor email JS into CoffeeScript and moved the error display into a helper.
cbe1897
@scotdalton scotdalton Refactor for Twitter Bootstrap and clean up code a bit. 542a35b
@scotdalton scotdalton Update Primo Source to check for configured method's existence before…
… calling.
15092e2
@scotdalton scotdalton Update holdings display to use Twitter Bootstrap styles. e0f01f8
@scotdalton scotdalton Don't always show the request button. 0308029
@scotdalton scotdalton Trying to make travis work. 6e97aed
@scotdalton scotdalton Still trying. 24f2038
@scotdalton scotdalton Update gemspec and Gemfile for JRuby. cb5cf68
@scotdalton scotdalton Update gemspec and Gemfile for JRuby. d3a8939
@scotdalton scotdalton Still trying to get jruby to work. 2c4ae78
@scotdalton scotdalton Add SFX solr functionality and tests. Include SFX db fixtures for use…
… later.
b29a080
@scotdalton scotdalton Update db schema so that the migration takes. 37f2e32
@scotdalton scotdalton Update db schema so that the migration takes, but hopeful for reals t…
…his time.
72a5bb8
@scotdalton scotdalton Still trying to get the schema working. 3c6904d
@scotdalton scotdalton Add sunspot solr development dependency in case others want to use it…
… as a test.
25ccfab
@scotdalton scotdalton Update GBS test to use VCR, refactor to use TestWithCassette from @jr…
…ochkind's bento_search and move sunspot_rails require statement to Umlaut::Engine.
f808584
@scotdalton scotdalton Skip establish connection if the Configuration isn't there. 4eae7a9
@scotdalton scotdalton Include bootstrap-sass require statement in Umlaut::Engine 51340fa
@scotdalton scotdalton Updated padding for umlaut sections. 25b2732
@scotdalton scotdalton Update resolve styles and include bootstrap-sass in Umlaut::Engine. e18f8cc
@scotdalton scotdalton Add sass-rails dependency along with bootstrap-sass. 064cc28
@scotdalton scotdalton Add/update tests for sfx4 searching and sfx4solr searching. Add instr…
…uctions for creating SearchMethods in README. Configured sfx_db to point to test SFX4.
10f0582
@scotdalton scotdalton Update to remove sunspot_rails gem dependency and only include Sfx4So…
…lr functionality if the application has explicitly added it.
9a9d9aa
@scotdalton scotdalton Update SearchMethods documentation. aeb6559
@scotdalton scotdalton Initial refactor HTML and stylesheets to use Twitter bootstrap. 761ef21
@scotdalton scotdalton Comment out search types for now. aae3b3b
@scotdalton scotdalton Look at layout. 62e6e35
@scotdalton scotdalton Update to use twitter bootstrap through bootstrap-sass gem. Still a w…
…ork in progress.
d7d6c26
@scotdalton scotdalton Add date helper functions for generating date dropdowns. 6f47df6
@scotdalton scotdalton Update form to use Twitter Bootstraps built in form classes. ab8d0d8
@scotdalton scotdalton Refactor CSS, HTML and views for Twitter bootstrap. 7ff991a
@scotdalton scotdalton Refactor for Twitter Bootstrap and clean up code a bit. 485ee90
@scotdalton scotdalton Update holdings display to use Twitter Bootstrap styles. fd7e160
@scotdalton scotdalton Don't always show the request button. 0da947d
@scotdalton scotdalton Include bootstrap-sass require statement in Umlaut::Engine 3422a6e
@scotdalton scotdalton Updated padding for umlaut sections. 1e85b93
@scotdalton scotdalton Update resolve styles and include bootstrap-sass in Umlaut::Engine. 1ffccb6
@scotdalton scotdalton Add sass-rails dependency along with bootstrap-sass. de233da
@scotdalton scotdalton Merge sfx4solr changes. 50e4e26
@scotdalton scotdalton Extend testing coverage. c54da66
@scotdalton scotdalton Update with compass-rails and sprites. a0fb8ee
@scotdalton scotdalton Coffee scripted autocomplete. 630bf98
@scotdalton scotdalton Change name of umlaut_icons folder to avoid namespace clashes. Update…
… resolve controller test to look at holdings. Use famfamfam instead of glyphicons for icons.
4d72089
@scotdalton scotdalton Add search controller functional tests. 3230116
@scotdalton scotdalton Merge branch 'sfx4solr' into bootstrap c64c5a6
@scotdalton scotdalton Merge remote-tracking branch 'origin/sfx4solr' into bootstrap 9d36f62
@scotdalton scotdalton Merge branch 'sfx4solr' into bootstrap 6fb0026
@scotdalton scotdalton Reverted to regular-ass javascript. fa35337
@scotdalton scotdalton Merge from sfx4solr 9bd17b0
@scotdalton scotdalton Merge remote-tracking branch 'origin/sfx4solr' into bootstrap 2bf2865
@scotdalton scotdalton Add test README file. 8b30239
@scotdalton scotdalton Remove NYU only tests as they are no longer necessary. d2c5126
@scotdalton scotdalton Update test/README ae24596
@scotdalton scotdalton Merge sfx4solr 47a1ff1
@scotdalton scotdalton Update styles. 02e0e7e
@scotdalton scotdalton Add information icon to umlaut. a312de1
@scotdalton scotdalton Merge with sfx4solr 308b8d4
@scotdalton scotdalton Removed placeholder dispatched services. eff547a
@scotdalton scotdalton Merge branch 'sfx4solr' into bootstrap 17a4e0b
@scotdalton scotdalton Merge remote-tracking branch 'origin/sfx4solr' into bootstrap b04a044
@scotdalton scotdalton Update html lang and close charset and viewport tags. cdab86b
@scotdalton scotdalton Merge remote-tracking branch 'origin/sfx4solr' into bootstrap 91bbd52
@scotdalton scotdalton Merge remote-tracking branch 'origin/sfx4solr' into bootstrap 88b381a
@jrochkind
Owner

this is super awesome, thanks for doing all this work, incredible.

I think it still needs some tweaks -- most of which I will plan to do (cause it's fun, and cause I still get to use my authority for final calls on Umlaut UI things).

I think there are still some things in there over-riding bootstrap that shouldn't be, and would look better if they weren't. I also think there are a few places that the UI could use some general sprucing up along wtih the bootstrap migration, which I'll take care of. And a few custom tweaks to the responsive CSS to do some things slightly different/extra from default at smaller screen sizes.

Also at least a little bit of the JS isn't using -- in general, is this still using JQuery-UI, you didn't change out any of the JS that used jquery-ui? (Or did you? I haven't yet checked the email/sms functionality that uses JS, which I haven't used yet. I might try to switch out the jquery-ui modal for a bootstrap modal (or rather someone elses improved fork of bootstrap's own modal). Are you using the email/sms func yourself? )

@jrochkind
Owner

huh, not sure why travis is failing on this one right now though, if you wanted to take care of that part, would be much appreciated.

In general, Umlaut could probably use a less ugly default color scheme, I might try to find one.

@scotdalton
Owner

Yeah, definitely change whatever you like. This was just my first cut and anyway, you're the boss when it comes to Umlaut UI.

Re: the JS stuff, I didn't change any of that, but would be happy to see it switched out for bootstrap flavored modal.

I'll work on getting travis to pass.

Thanks,
Scot

@jrochkind
Owner

Cool. i think we can make this look really pretty. thanks for doing the overall refactor for bootstrap, so much appreciated!

Trying to get a feel for what's going on in the new CSS. You refactored the single giant umlaut.css to a bunch of SCSS partials, great. But first question: What's the point of the _reset.scss in there? I'd think bootstrap itself is doing all the resetting needed, what did you put in the reset partial for what reason?

@jrochkind
Owner

Also, and this is my lack of knowledge of the ins-and-outs of sprockets/sass/compass here .... but why do you need the import compass, what parts of compass (as opposed to just sass) are we using? Is it required by bootstrap-sass, or by extra umlaut stuff? And if it's required, is it included in default Rails apps these days, or do we need special install instructions/installer to make sure the app's got it?

@jrochkind
Owner

okay, maybe you're using compass only for the sprite generation?

I think I'd like to not do this -- my experience with rails and asset pipeline -- especially when done in an engine gem like umlaut (my experience with blacklight) is that there are already so many moving parts that it increases complexity and chances of dependency problems (oops, we need version X of compass gem, but you're using version Y). I don't think using sprites for images is enough benefit for adding compass and more things that can go wrong into the mix -- Umlaut's overall performance bottlenecks are not going to be fetching the few images.

(Also, when I try demo'ing the bootstrap branch, some of the images don't seem to be working -- this may be a problem with my setup, or it may be a problem with the spriting stuff, which in any rate gives you one more confusing thing to have to look at debugging)

What do you think about getting rid of the spriting and going back to ordinary one-at-a-time images? Especially if that would let us get rid of compass, I'm leaning towards it.

@scotdalton
Owner

Sorry for the delayed response (20 days, ouch, my bad!). So I'll just start addressing these in reverse order. I think I got the travis stuff worked out. It was a VCR cassette/ruby version thing. Maybe ordered hashes vs. unordered hashes, but the VCR cassette was not matching the URL in some versions of ruby. I hope it's working now. I probably could have set up VCR to ignore query string, but that didn't seem appropriate.

For the sprites, I am using Compass for sprite generation, but was thinking to decrease complexity, I could just commit the sprite to the repo and hard code the classes and remove the Compass dependency. That's what bootstrap-sass does (includes the sprites in the repo, and i guess, bootstrap as well.)

The _reset.scss was giving some base Umlautifcation to tags. I can easily rename to _base.scss which is probably better semantically.

I'm going to reread some of the emails now, and just respond to them here, so we have it documented informally.

Thanks!

@scotdalton
Owner

hey scot, what was the motivation in umlaut in replacing the _citation partial with the helper methods? I'm not a big fan of it, thinking of putting it back (and making the citation area somewhat more similar to how it was before with publication details on one line again), but want to make sure I know why you did it before I undo it!

Seemed DRYer at the time. And I think it could be easily extended to read in a config of citation element to display, but I didn't document it so I must not have felt that strongly :)

Thanks for checking! Feel free to revert.

UPDATE: I'll go ahead and revert.

@scotdalton
Owner

I spent all day trying to take it to the next level, and got nowhere! Turns out design is hard, and retrofitting new design into an existing app is even harder! Phew, it's a mess! (Not what you did, what was there already).

There are a few thigns I know I want to change (like getting rid of the compass sprites stuff and putting it back to ordinary icons, to keep what's already complicated simpler -- and the icons aren't in fact working right for me at present how they are),

I'll pull out the compass stuff, but I'd like to keep the sprites. I can just commit the sprite to the repo and put in the appropriate styles.

but mostly it just doesn't look good enough yet. I think overall it looks messier than the previous non-boostrap, although by the end iwth bootstrap;s better typography we should be able to make it look better instead. The vertical rhythm is still just odd, for instance. I think the CSS can also be further simplified, more pre-existing umlaut stuff that can be removed for bootstrap defaults or simplified (and you already did a lot).

I also think you have some row-fluid stuff in there that just isn't working.

Yeah. I'll take a look and let you know if I have any ideas.

But mainly, after getting nowhere all day, I just want to get it looking better! I'm nto sure if i'll throw away what I did before and start over, with more modest goals approached incrementally.

So, anyhow, feel free to keep working on that branch if you want, although we'll have to try and not step on each other's toes.

Sounds good.

@scotdalton
Owner

I looked at the citation stuff again, and I'm not sure I understand the concern. I just moved a lot of the code into a helper and structured it as a description list because it seems to make a bit of semantic sense. I'm still thinking about it and definitely am open to suggestions, but didn't want to revert it just yet.

@scotdalton
Owner

Also, I'll look into why it broke and fix that.

@jrochkind
Owner

Re citation stuff. This jsut happened to come up today. rsinger brought up the idea of submitting a patch that added html5 html5 microdata itemprop attributes to the citation template.

If the citation template is a TEMPLATE, it's pretty straightforward how to do that, you just go add it to the template. If the citation template is produced by indirect abstraction like you've done... how would you do that? You'd have to go refactor your indirect abstract logic to be even MORE abstract and parameterized. For what end? What is it you're getting out of that indirect abstraction?

I did not know of rsinger's use case until today. But in general, view templates should be view templates unless there's a really good reason for them not to be. Becuase then if you want to change or override the view template, it's easy to do so. Seperation of concerns between templating and logic. Etc. I know I don't always follow this myself, but unless there's a good reason not to, it's how it should be. I don't see any reason for the custom indirect abstraction you have added.

I want citation to be an ordinary template, like it was before. I'm not talking about whether you change it to definition lists, or change the markup. Change the markup. But put the markup in an ordinary template, without indirection/abstraction logic to generate it in two lines from a hash or whatever. Just a straight template

<dl>
   <dt>Author</dt><dd><%= citation.author %>
   whatever
@jrochkind
Owner

i'm also kind of despairing about how the bootstrap version just doesn't look right to me. It does NOT look neater and cleaner, which is what you hope to get from bootstrap, it looks messier and weirder to me. if all we needed was mobile, we could do that ourselves without boostrap. i'm not willing to sacrice cleanness.

I'm afraid I'm REALLY overwhelmed at my job right now, I'm not sure when I'll be able to get this again, but I think it needs quite a bit of cleanup and fixing.

@scotdalton
Owner

Right, so regarding the view, I will definitely remove the abstraction. My one thought for the abstraction, that I'll document and articulate here (I really need to start documenting/articulating before I write the code, not before I revert the code... sorry) is that different Umlaut instances could have different citation display needs and these could be configurable. Obviously, it's not there yet and I shouldn't be designing for non-existent use cases anyway. So, yeah, I'll revert.

I'll mess around with the styles a bit more. You have my sympathies re: overwhelming job responsibilities. I'm just getting back to this now, after 3 weeks.

I don't want to give up on Bootstrap just yet. I think it can be really nice, but wrangling HTML, even with help, is a pain (at least for me).

@jrochkind
Owner
scotdalton added some commits
@scotdalton scotdalton Update styles and add Bootstrap typeahead and modal. 4ac2fbb
@scotdalton scotdalton Clean up styles. 3abcd18
@scotdalton scotdalton Specify version of therubyracer since it's having problems compiling.…
… Update styles.
4160cc8
@scotdalton scotdalton Prevent default action on toggles. e25880c
@scotdalton scotdalton Rename expand contract toggle. d713d52
@scotdalton scotdalton Fix expand contract bug. 9d6ed3c
@scotdalton scotdalton Update to handle modal window submits. e825b02
@scotdalton scotdalton Update to handle modal window submits. e78a942
@scotdalton scotdalton Primo service refactor for issue 4. 4a4dfb8
@scotdalton scotdalton Develop against development version of exlibris-primo gem. a110eab
@scotdalton scotdalton Continue to refactor and clean up code for Primo. 361a351
@scotdalton scotdalton Bump version of Nokogiri ~> 1.5.3. Minor semantic change to primo ser…
…vice. Update JDBC mysql adaptor for JRUBY.
8f9d420
@scotdalton scotdalton Update primo tests and use rubygems version of Primo gem. 7ef66f6
@scotdalton scotdalton Merge remote-tracking branch 'origin/issue-4-primo-refactor' into boo…
…tstrap
ef020e5
@scotdalton scotdalton Fix bug when primo file is missing. efffcb4
@scotdalton scotdalton Merge remote-tracking branch 'origin/issue-4-primo-refactor' into boo…
…tstrap
0d938be
@scotdalton scotdalton Add test for missing primo config. c8f534e
@scotdalton scotdalton Merge remote-tracking branch 'origin/issue-4-primo-refactor' into boo…
…tstrap
1b8adb4
@scotdalton scotdalton Bump version of exlibris-primo gem. f5d716d
@scotdalton scotdalton Merge branch 'issue-4-primo-refactor' into bootstrap 1ac3552
@scotdalton scotdalton Bump exlibris-primo version. 42add52
@scotdalton scotdalton Merge remote-tracking branch 'origin/issue-4-primo-refactor' into boo…
…tstrap
4e935a0
@scotdalton scotdalton Bump version of exlibris-primo 2fa4ab3
@scotdalton scotdalton Add primo source tests. 379b46b
@scotdalton scotdalton Update Primo Service and Source data. 22bc253
@scotdalton scotdalton Merged issue4 refactor. 5791a3b
@scotdalton scotdalton Update whitespace on dummy services. fd9fb01
@scotdalton scotdalton Fix bugs in Primo service. 87b5964
@scotdalton scotdalton Merge remote-tracking branch 'origin/issue-4-primo-refactor' into boo…
…tstrap
cf7c21e
@scotdalton scotdalton Add tests for expanded primo sources for issn search. 507915e
@scotdalton scotdalton Merge issue-4-primo-refactor. 1b964af
@scotdalton scotdalton Replace expand_contract functionality with Bootstrap collapsible. a528592
@scotdalton scotdalton Update simple toggle to use collapse. d4a7946
@scotdalton scotdalton Trigger style, verbiage change on shown and hidden since they seem to…
… be more reliable in practice.
c51df70
@scotdalton scotdalton Add Ulrich's cover service so Ptest can pass. Not sure how it got out…
… of sync.
16b6251
@scotdalton scotdalton Add JS hack cuz Bootstrap don't work right with collapsible. e324b67
@scotdalton scotdalton Update padding. 9c45f98
@scotdalton scotdalton Update holdings padding. 6fc4beb
@scotdalton scotdalton Update umlaut padding. 2b8e76a
@scotdalton scotdalton Update umlaut padding. 237ca53
@scotdalton scotdalton Update bootstrap styles. a6dca0a
@scotdalton scotdalton Update icons sprite and classes with 'book go' image for doc delivery. ad71be2
@scotdalton scotdalton Remove container padding for resolve screen. 75f3731
@scotdalton scotdalton Clean up some overzealous sass-ing. f96acff
@scotdalton
Owner

This is getting there, I think. I cleaned up the SASS. Last thing on my list is to look at the citation sections in both search and resolve and make sure they clean and correct.

I put a sample app on Heroku with the latest from the bootstrap branch:

Thanks,
Scot

scotdalton added some commits
@scotdalton scotdalton Align search inside submit. 385d61a
@scotdalton scotdalton Update citation partials. 8f28cfa
@scotdalton scotdalton Update result citation styles. 1437069
@scotdalton scotdalton Update search result citation padding. 71edb5e
@scotdalton scotdalton Fix missing source data bug in Primo Service. 3305659
@scotdalton scotdalton Merge remote-tracking branch 'origin/issue-4-primo-refactor' into boo…
…tstrap
92ec8b4
@scotdalton scotdalton Update spacing on response elements. 8986bb9
@scotdalton scotdalton Specify search layout for export email controller, provide a DRY meth…
…od for getting search layout except on XHR and include test case for export email controller.
dfd40f1
@scotdalton scotdalton Update response element styles. 960f249
@scotdalton scotdalton Update response element styles. 3460095
@scotdalton scotdalton Make modal lists unstyled. e13aa44
@scotdalton scotdalton Add improved-modal ala blacklight. e085152
@scotdalton scotdalton Let SFX handle Primo articles from the remote tab. ae1a45b
@scotdalton scotdalton Merge remote-tracking branch 'origin/issue-4-primo-refactor' into boo…
…tstrap
385e6ce
@scotdalton scotdalton Only do it if it's a Primo identifier. 80db7a4
@scotdalton scotdalton Merge remote-tracking branch 'origin/issue-4-primo-refactor' into boo…
…tstrap
26583dd
@scotdalton scotdalton Add resolve layouts to resolve-y controllers for error rendering and …
…clean up white space.
2cc6285
@scotdalton scotdalton Merge remote-tracking branch 'origin/master' into bootstrap ee8c06c
@scotdalton scotdalton Only render error if we haven't performed something elsewhere. 7b00354
@scotdalton scotdalton Bump version of exlibris-primo gem and add institution to Primo links. 035c10f
@scotdalton scotdalton Add group to service. cebcc27
@scotdalton scotdalton Service definitions are a Hash, not an Array. Loop through them as such. 4801b75
@scotdalton scotdalton Merge remote-tracking branch 'origin/master' into bootstrap 5eb6d88
@scotdalton scotdalton Merged from master branch with new SFX target roll-up feature. 1d71721
@scotdalton scotdalton Updated expand/contract helper test for bootstrap collapsible css. 5def591
@scotdalton scotdalton Add black coverage style for roll up links. 6c831ca
@scotdalton scotdalton Fix bug in edition warning. Add tests for edition warning and request…
…s with no holding responses.
16cca47
@scotdalton scotdalton Use passed in local 'holding' for service responses. 32805f7
@scotdalton scotdalton Change italic/alternate voice tag (<i>) to emphasis tag (<em>) since …
…Twitter Bootstrap uses the alternate voice tag for icons, unfortunately.
f3f1fa8
@scotdalton scotdalton Add proxy flag to gathered SFX metadata. b1f87de
@scotdalton scotdalton Merge master changes. ca11f60
@scotdalton scotdalton Merge in changes to separate out primo gem. 50c5cfb
@scotdalton scotdalton Remove primo source test. a1992ef
@scotdalton scotdalton Remove Primo fixtures, etc. 5f6862a
@scotdalton scotdalton Specify versions and update primo source adapter. 70416e7
@scotdalton scotdalton Remove improved modal, since it was causing problems and wasn't even …
…that improved for our purposes. Remove jquery-ui dependency, since we're using Twitter bootstrap. Update modal with progress bar.
ccc210c
@scotdalton scotdalton Update rendering of validation error in export functionality. 428a9e3
@scotdalton scotdalton Merged changes from bootstrap. a9e87c8
@scotdalton scotdalton Merge remote-tracking branch 'origin/separate_primo_gem' into bootstr…
…ap-separate-primo
a33148f
@scotdalton scotdalton Don't indent response links. 8a89070
@scotdalton scotdalton Merge remote-tracking branch 'origin/bootstrap' into bootstrap-separa…
…te-primo
c828f27
@scotdalton scotdalton Merge remote-tracking branch 'origin/separate_primo_gem' into bootstr…
…ap-separate-primo
50d37ae
@scotdalton scotdalton Merge back from separate_primo_gem. 92bb24e
@scotdalton scotdalton Merge back from separate_primo_gem. Remove VCR cassette Primo call. 5e09454
@scotdalton scotdalton Add back SFX service configs. Remove Primo references from service re…
…sponse.
1edc8c6
@scotdalton scotdalton Merge pull request #14 from team-umlaut/bootstrap-separate-primo
Bootstrap separate primo
26966ba
@scotdalton scotdalton Remove change in Gemfile for JRuby. 23f37b3
@scotdalton scotdalton Remove primo config file. 45f37cb
@scotdalton scotdalton Remove unused layout name method. 8f224c0
@scotdalton scotdalton Clean up whitespace in store controller and controller_behavior module. 4becb41
@scotdalton scotdalton Cleanup whitespace in error_handling gem. 52ea982
@scotdalton scotdalton Add comment to explain why we only want to render 500 error if we hav…
…en't performed any render/redirect.
562eb20
@scotdalton scotdalton Clean up whitespace in emailer helper. 6affb9d
@scotdalton scotdalton Clean up whitespace in helpers. cd83df8
@scotdalton scotdalton Clean up whitespace in helpers. b6d2e21
@scotdalton scotdalton Cleanup fixtures. b6a0844
@scotdalton scotdalton Cleanup whitespace in gemspec. 404c6ee
@scotdalton scotdalton Merge back from cleanup branch 065ba32
@scotdalton scotdalton Merge remote-tracking branch 'origin/master' into bootstrap 8ba5430
@scotdalton scotdalton Merge remote-tracking branch 'origin/master' into bootstrap 7e49d3b
@scotdalton scotdalton Merge remote-tracking branch 'origin/master' into bootstrap 7ecb6b2
@scotdalton scotdalton Merge in cleanup branch changes. 990187e
@scotdalton scotdalton Merge back changes from cleanup branch. bf834ad
@scotdalton scotdalton Merge remote-tracking branch 'origin/cleanup' into bootstrap 5c6951f
@scotdalton scotdalton Add coveralls support 6382377
@scotdalton scotdalton Add coveralls badge. 1f8ec35
@scotdalton scotdalton Merge remote-tracking branch 'origin/cleanup' into bootstrap b366dc5
@coveralls

Changes Unknown when pulling b366dc5 on bootstrap into ** on master**.

View Details

@coveralls

Changes Unknown when pulling b366dc5 on bootstrap into ** on master**.

View Details

@coveralls

Changes Unknown when pulling bd3d7d9 on bootstrap into ** on master**.

View Details

@coveralls

Coverage remained the same when pulling a2aaeea on bootstrap into 764e971 on master.

View Details

@coveralls

Coverage increased (+0.12%) when pulling a2aaeea on bootstrap into 764e971 on master.

View Details

@coveralls

Coverage increased (+0.12%) when pulling a2aaeea on bootstrap into 764e971 on master.

View Details

@jrochkind jrochkind merged commit a2aaeea into from
@jrochkind
Owner

merged bootstrap-continued branch into master!

tagged "pre-bootstrap" first, just in case it ends up being helpful. I get so nervous with giant merges!

@scotdalton
Owner

:clap: AWESOME!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.