diff options
| author | Teddy Wing | 2017-12-05 18:26:57 +0100 |
|---|---|---|
| committer | Teddy Wing | 2017-12-05 18:26:57 +0100 |
| commit | 47181fd81105396b2db394958c39a6e40bc6f0f0 (patch) | |
| tree | e95e67d8479f348453e3e494b5991053b15ba3de /app/controllers/lines_controller.rb | |
| parent | 1098e24f15b235dce127f0398adac4bbf7cfe463 (diff) | |
| parent | 9f1aa4d40d7d968963dae5799e15ad5da4cbcbc5 (diff) | |
| download | chouette-core-47181fd81105396b2db394958c39a6e40bc6f0f0.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into 5024-prevent-duplicate-referentials-from-being-created-during-parallel-db-transactions--rb201711271659
Conflicts:
app/models/referential.rb
A whitespace conflict in a place I don't even remember editing? Okaay.
Diffstat (limited to 'app/controllers/lines_controller.rb')
| -rw-r--r-- | app/controllers/lines_controller.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/lines_controller.rb b/app/controllers/lines_controller.rb index cf2908500..2f0ef1542 100644 --- a/app/controllers/lines_controller.rb +++ b/app/controllers/lines_controller.rb @@ -1,4 +1,4 @@ -class LinesController < InheritedResources::Base +class LinesController < ChouetteController include ApplicationHelper include PolicyChecker defaults :resource_class => Chouette::Line @@ -119,7 +119,6 @@ class LinesController < InheritedResources::Base :company_id, :objectid, :object_version, - :creator_id, :name, :number, :published_name, |