Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Production release 4.9.33 #1110

Merged
merged 66 commits into from
Jun 20, 2017
Merged

Production release 4.9.33 #1110

merged 66 commits into from
Jun 20, 2017

Commits on May 20, 2017

  1. Beginnings of EntityController

    @irees
    irees committed May 20, 2017
    Configuration menu
    Copy the full SHA
    4ac19ee View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2017

  1. Changelog / version [ci skip]

    @irees
    irees committed Jun 1, 2017
    Configuration menu
    Copy the full SHA
    f685815 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2017

  1. Remove

    @irees
    irees committed Jun 2, 2017
    Configuration menu
    Copy the full SHA
    4b36a19 View commit details
    Browse the repository at this point in the history

  2. Use super instead

    @irees
    irees committed Jun 2, 2017
    Configuration menu
    Copy the full SHA
    3344c3d View commit details
    Browse the repository at this point in the history

  3. Scope

    @irees
    irees committed Jun 2, 2017
    Configuration menu
    Copy the full SHA
    b56f3fa View commit details
    Browse the repository at this point in the history

  4. Typo

    @irees
    irees committed Jun 2, 2017
    Configuration menu
    Copy the full SHA
    abc3928 View commit details
    Browse the repository at this point in the history

  5. Convert Feeds controller

    @irees
    irees committed Jun 2, 2017
    Configuration menu
    Copy the full SHA
    3f72551 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2017

  1. EIFF

    @irees
    irees committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    70d47ff View commit details
    Browse the repository at this point in the history

  2. CSV pluralize model name

    @irees
    irees committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    785f090 View commit details
    Browse the repository at this point in the history

  3. Default includes

    @irees
    irees committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    7c0fcfa View commit details
    Browse the repository at this point in the history

  4. Fix includes

    @irees
    irees committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    2de851b View commit details
    Browse the repository at this point in the history

  5. Convert to EntityController

    @irees
    irees committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    551b60c View commit details
    Browse the repository at this point in the history

  6. Feed imported from Feed 

    For controller ease
    @irees
    irees committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    e1a4687 View commit details
    Browse the repository at this point in the history

  7. EntityController provides show method

    @irees
    irees committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    0e1ec48 View commit details
    Browse the repository at this point in the history

  8. Use EntityController show

    @irees
    irees committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    a604f58 View commit details
    Browse the repository at this point in the history

  9. RoutesController use EntityController

    @irees
    irees committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    28d15e7 View commit details
    Browse the repository at this point in the history

  10. StopsController use EntityController

    @irees
    irees committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    b14e799 View commit details
    Browse the repository at this point in the history

  11. RouteStopPatternController use EntityController

    @irees
    irees committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    05a7e69 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'master' into entity-controller-common 

    # Conflicts:
#	app/controllers/api/v1/route_stop_patterns_controller.rb
    @irees
    irees committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    5c3f51c View commit details
    Browse the repository at this point in the history

  13. Tidy

    @irees
    irees committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    0942f04 View commit details
    Browse the repository at this point in the history

  14. Tidy

    @irees
    irees committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    704e09d View commit details
    Browse the repository at this point in the history

  15. render_scope

    @irees
    irees committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    29e10a2 View commit details
    Browse the repository at this point in the history

  16. index_query_geometry

    @irees
    irees committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    948d15d View commit details
    Browse the repository at this point in the history

  17. Tidy

    @irees
    irees committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    3e9da6d View commit details
    Browse the repository at this point in the history

  18. RoutesController use render_scope, index_query_geometry

    @irees
    irees committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    faf5d71 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2017

  1. Start of self-documenting query params

    @irees
    irees committed Jun 6, 2017
    Configuration menu
    Copy the full SHA
    08ef13e View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2017

  1. EntityController render_serializer

    @irees
    irees committed Jun 7, 2017
    Configuration menu
    Copy the full SHA
    8835cb6 View commit details
    Browse the repository at this point in the history

  2. Method visibility

    @irees
    irees committed Jun 7, 2017
    Configuration menu
    Copy the full SHA
    537d616 View commit details
    Browse the repository at this point in the history

  3. StopStationsController use EntityController

    @irees
    irees committed Jun 7, 2017
    Configuration menu
    Copy the full SHA
    a6f7d14 View commit details
    Browse the repository at this point in the history

  4. EntityController include_geometry, exclude_geometry

    @irees
    irees committed Jun 7, 2017
    Configuration menu
    Copy the full SHA
    d69f78e View commit details
    Browse the repository at this point in the history

  5. EntitySerializer optional geometry, imported_from_feeds

    @irees
    irees committed Jun 7, 2017
    Configuration menu
    Copy the full SHA
    7c12363 View commit details
    Browse the repository at this point in the history

  6. Save this for a future branch, using apipie or similar

    @irees
    irees committed Jun 7, 2017
    Configuration menu
    Copy the full SHA
    983122c View commit details
    Browse the repository at this point in the history

  7. Move

    @irees
    irees committed Jun 7, 2017
    Configuration menu
    Copy the full SHA
    b2bb5db View commit details
    Browse the repository at this point in the history

  8. include_id

    @irees
    irees committed Jun 7, 2017
    Configuration menu
    Copy the full SHA
    7ae4003 View commit details
    Browse the repository at this point in the history

  9. Use serializer, disable EIFFs

    @irees
    irees committed Jun 7, 2017
    Configuration menu
    Copy the full SHA
    86a3476 View commit details
    Browse the repository at this point in the history

  10. Common attrs

    @irees
    irees committed Jun 7, 2017
    Configuration menu
    Copy the full SHA
    c911f0c View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2017

  1. Fix this...

    @irees
    irees committed Jun 8, 2017
    Configuration menu
    Copy the full SHA
    cf1a270 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2017

  1. updating mail gem 

    related to #1108
    @drewda
    drewda committed Jun 12, 2017
    Configuration menu
    Copy the full SHA
    e3e71e4 View commit details
    Browse the repository at this point in the history

  2. gem update

    @drewda
    drewda committed Jun 12, 2017
    Configuration menu
    Copy the full SHA
    5012134 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1111 from transitland/update-more-gems 

    updating mail gem
    @drewda
    drewda authored Jun 12, 2017
    Configuration menu
    Copy the full SHA
    62716b6 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2017

  1. Remove

    @irees
    irees committed Jun 13, 2017
    Configuration menu
    Copy the full SHA
    324fd34 View commit details
    Browse the repository at this point in the history

  2. New scope format

    @irees
    irees committed Jun 13, 2017
    Configuration menu
    Copy the full SHA
    c83f1da View commit details
    Browse the repository at this point in the history

  3. Get include/exclude from render_scope

    @irees
    irees committed Jun 13, 2017
    Configuration menu
    Copy the full SHA
    448ef73 View commit details
    Browse the repository at this point in the history

  4. New scope format

    @irees
    irees committed Jun 13, 2017
    Configuration menu
    Copy the full SHA
    5c2c4d9 View commit details
    Browse the repository at this point in the history

  5. Define model using class method

    @irees
    irees committed Jun 13, 2017
    Configuration menu
    Copy the full SHA
    0e941c4 View commit details
    Browse the repository at this point in the history

  6. Refine serializers

    @irees
    irees committed Jun 13, 2017
    Configuration menu
    Copy the full SHA
    95888b3 View commit details
    Browse the repository at this point in the history

  7. Move all common specs ot EntityController specs

    @irees
    irees committed Jun 13, 2017
    Configuration menu
    Copy the full SHA
    011cfdd View commit details
    Browse the repository at this point in the history

  8. imported_with_gtfs_id spec

    @irees
    irees committed Jun 13, 2017
    Configuration menu
    Copy the full SHA
    c9fb173 View commit details
    Browse the repository at this point in the history

  9. Tidy

    @irees
    irees committed Jun 13, 2017
    Configuration menu
    Copy the full SHA
    77198f6 View commit details
    Browse the repository at this point in the history

  10. These specs now covered in EntityController

    @irees
    irees committed Jun 13, 2017
    Configuration menu
    Copy the full SHA
    3e3cccd View commit details
    Browse the repository at this point in the history

  11. Revert "These specs now covered in EntityController" 

    This reverts commit 3e3cccd.
    @irees
    irees committed Jun 13, 2017
    Configuration menu
    Copy the full SHA
    ea03652 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2017

  1. Use more descriptive query_param method

    @irees
    irees committed Jun 14, 2017
    Configuration menu
    Copy the full SHA
    ed70cbf View commit details
    Browse the repository at this point in the history

  2. Use new simple query_param method

    @irees
    irees committed Jun 14, 2017
    Configuration menu
    Copy the full SHA
    1b94e5f View commit details
    Browse the repository at this point in the history

  3. Use verbose query_param method

    @irees
    irees committed Jun 14, 2017
    Configuration menu
    Copy the full SHA
    5eb5e07 View commit details
    Browse the repository at this point in the history

  4. Spec update

    @irees
    irees committed Jun 14, 2017
    Configuration menu
    Copy the full SHA
    3f6c1e1 View commit details
    Browse the repository at this point in the history

  5. query_params updates

    @irees
    irees committed Jun 14, 2017
    Configuration menu
    Copy the full SHA
    c39cdcf View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2017

  1. query_param updates

    @irees
    irees committed Jun 15, 2017
    Configuration menu
    Copy the full SHA
    9e8572b View commit details
    Browse the repository at this point in the history

  2. query_param updates

    @irees
    irees committed Jun 15, 2017
    Configuration menu
    Copy the full SHA
    c49f17a View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2017

  1. imported_from_feeds default true

    @irees
    irees committed Jun 16, 2017
    Configuration menu
    Copy the full SHA
    da32c15 View commit details
    Browse the repository at this point in the history

  2. find_by_onestop_id!

    @irees
    irees committed Jun 16, 2017
    Configuration menu
    Copy the full SHA
    7936a9d View commit details
    Browse the repository at this point in the history

  3. StopStationsController index_query

    @irees
    irees committed Jun 16, 2017
    Configuration menu
    Copy the full SHA
    0515765 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2017

  1. rename to CurrentEntityController to match CurrentEntitySerializer

    @irees
    irees committed Jun 17, 2017
    Configuration menu
    Copy the full SHA
    5360883 View commit details
    Browse the repository at this point in the history

  2. Set default false

    @irees
    irees committed Jun 17, 2017
    Configuration menu
    Copy the full SHA
    f0b15bb View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1096 from transitland/entity-controller-common 

    CurrentEntityController
    @irees
    irees authored Jun 17, 2017
    Configuration menu
    Copy the full SHA
    8eefdac View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2017

  1. Don't use before_action to set_model

    @irees
    irees committed Jun 19, 2017
    Configuration menu
    Copy the full SHA
    c957fd7 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1112 from transitland/before-action-fixes 

    CurrentEntityController before_action fixes
    @irees
    irees authored Jun 19, 2017
    Configuration menu
    Copy the full SHA
    8372616 View commit details
    Browse the repository at this point in the history