Skip to content
GitLab
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • A administrate
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 96
    • Issues 96
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 32
    • Merge requests 32
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Package Registry
    • Infrastructure Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • thoughtbot, inc.
  • administrate
  • Merge requests
  • !759

Update instances of bourbon to 5.0.0.beta.7; sass to ~>3.4

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Administrator requested to merge github/fork/vcavallo/bourbon-5-beta-7 into master Mar 03, 2017
  • Overview 1
  • Commits 1
  • Pipelines 0
  • Changes 7

Created by: vcavallo

As requested in this issue comment This updates administrate to use bourbon 5 properly, I hope. Along the way it seemed the sass gem dependency needed to be updated as well.

I have to admit these layered dependencies and Appraisal tests are slightly out of my depth, but as far as I can tell all tests pass and a skeleton sample app I set up using Rails 5.0.2 and Ruby 2.3.1 and including these two gems, verbatim:

gem 'bourbon'
gem "administrate", :git => 'https://github.com/vcavallo/administrate.git', :branch => 'bourbon-5-beta-7'

does work just fine, whereas when trying to use administrate on its own I got bundler errors like so:

screen shot 2017-03-03 at 11 53 55 am

Also, I'm not sure of the larger implications of requiring all Administrate users to upgrade to bourbon 5, especially since it seems there may be other issues with bourbon 5 dependencies?

Let me know if anything needs to change or be updated. Thanks!

Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: github/fork/vcavallo/bourbon-5-beta-7