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
  • !680

Fix broken specs on `master`

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Administrator requested to merge jq-fix-master into master Oct 28, 2016
  • Overview 0
  • Commits 1
  • Pipelines 0
  • Changes 6

Created by: JoelQ

Tests were broken on the master branch due to issues in loading the administrate-field-image gem. The gem had some dependency ordering issues in its .gemspec so I made some quick fixes and pointed the administrate core to the branch with those fixes.

We also needed to update the version of Bundler used both locally and on CI.

Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: jq-fix-master