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

Allow `belongs_to` with `primary_key` option

  • Review changes

  • Download
  • Email patches
  • Plain diff
Closed Administrator requested to merge jm-mmr-fix-belongs-to-primary-key into master Mar 30, 2017
  • Overview 9
  • Commits 4
  • Pipelines 0
  • Changes 13

Created by: jcmorrow

Resolves #777 (closed).

Changes:

  • Allow permitted_attribute to receive options, which can include primary_key. Use primary_key if specified, otherwise use id.
  • Change orders primary key to code and payments foreign key to order_code.
  • Remove created_at and updated_at from Payment's ATTRIBUTE_TYPES because the payments table doesn't actually have those columns.
  • Add edit route for payments.
Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: jm-mmr-fix-belongs-to-primary-key