gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix conflicts

Browse source
This commit is contained in:
Stella Rouzi 2014-08-12 15:48:29 +03:00
parent e2fb434dc7
commit 71dfb3b7e4
34 changed files with 160 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/campaign.rb
View file

@ -1,6 +1,6 @@
class Campaign < ActiveRecord::Base
attr_accessible :name, :target_ids, :conference_id,
:utm_source, :utm_medium, :utm_term, :utm_content, :utm_campaign
attr_accessible :name, :utm_source, :utm_medium, :utm_term,
:utm_content, :utm_campaign, :target_ids, :conference_id
validates :name, :utm_campaign, presence: true

1
app/models/event_attachment.rb
View file

@ -6,7 +6,6 @@ class EventAttachment < ActiveRecord::Base
has_attached_file :attachment, path: ":rails_root/storage/:rails_env/attachments/:id/:style/:basename.:extension"
include Rails.application.routes.url_helpers
do_not_validate_attachment_file_type :attachment
def to_jq_upload
{