lalala 4.0.0.dev.351 → 4.0.0.dev.354

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f485b8bc76aba0c246453f9c104a5fcebde8d8ee
4
- data.tar.gz: 1cd83e67c38afc1e775674cd9ea2f6dd5fe63160
3
+ metadata.gz: ad3fc53aaf27720e4e3c78c9c72c1f65995d1280
4
+ data.tar.gz: 59e0b2c01679d873ec6649926537a701361394d6
5
5
  SHA512:
6
- metadata.gz: ff0b9aeb380ffca9c2ded15b5afc46725c8ed4c9bd39f3359b657a32140ea116d68373db07da01e50b3855a0e9e914d7628487f35c6eff80054e3c456777d61e
7
- data.tar.gz: 452a94d08c3fc616a6d939dc719d96fd88413923c829b4e4e93f71ca7b50a39bfaa2467476e7553fb92889bf84e0be77d958b153d85a05368999423d4d891de3
6
+ metadata.gz: e7110b864f5c0ad7c33a78bc728c0565ade325a36937db8e0465dadcd6b64d73f922521804f82c74367cb9e240ce223b3d227a1d08babb6846a416641fd58239
7
+ data.tar.gz: 2a8ea060e39b3431e69c09f8ee3278fe927bc1fd2978ef00bd063bcc6816cfa1345562df1fa024d74e19c21584e4fa01c2f01d8e8458e09c0c687d8ea02dc995
@@ -1,6 +1,6 @@
1
1
  module Lalala
2
2
  VERSION = "4.0.0"
3
- BUILD = "351"
3
+ BUILD = "354"
4
4
 
5
5
  if BUILD != ("{{BUILD_NUMBER" + "}}") # prevent sed replacement (see script/ci)
6
6
  BUILD_VERSION = "#{VERSION}.dev.#{BUILD}"
@@ -11,6 +11,8 @@ ActiveAdmin.register Article do
11
11
  f.input :body
12
12
  f.input :tags
13
13
  f.input :category, as: :select, collection: %w(A B C)
14
+ f.input :url, input_html: { placeholder: 'http://', class: 'js-prepend-placeholder' }
15
+ f.input :price, input_html: { placeholder: '€', class: 'js-append-placeholder' }
14
16
  f.input :image, as: :single_file
15
17
  end
16
18
  f.actions
@@ -1,5 +1,5 @@
1
1
  class Article < ActiveRecord::Base
2
- attr_accessible :body, :title, :category, :tag_ids
2
+ attr_accessible :body, :title, :category, :tag_ids, :url, :price
3
3
 
4
4
  has_one_asset :image
5
5
 
@@ -0,0 +1,6 @@
1
+ class AddPreAndPostpendTestColumnsToArticles < ActiveRecord::Migration
2
+ def change
3
+ add_column :articles, :url, :string
4
+ add_column :articles, :price, :string
5
+ end
6
+ end
@@ -11,7 +11,7 @@
11
11
  #
12
12
  # It's strongly recommended to check this file into your version control system.
13
13
 
14
- ActiveRecord::Schema.define(:version => 20131122170308) do
14
+ ActiveRecord::Schema.define(:version => 20140926152646) do
15
15
 
16
16
  create_table "active_admin_comments", :force => true do |t|
17
17
  t.string "resource_id", :null => false
@@ -63,6 +63,8 @@ ActiveRecord::Schema.define(:version => 20131122170308) do
63
63
  t.datetime "created_at", :null => false
64
64
  t.datetime "updated_at", :null => false
65
65
  t.string "category"
66
+ t.string "url"
67
+ t.string "price"
66
68
  end
67
69
 
68
70
  create_table "articles_tags", :id => false, :force => true do |t|
@@ -106,6 +108,7 @@ ActiveRecord::Schema.define(:version => 20131122170308) do
106
108
  t.string "title"
107
109
  t.string "path_component"
108
110
  t.text "body"
111
+ t.boolean "activated"
109
112
  end
110
113
 
111
114
  add_index "page_translations", ["locale"], :name => "index_page_translations_on_locale"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: lalala
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.0.0.dev.351
4
+ version: 4.0.0.dev.354
5
5
  platform: ruby
6
6
  authors:
7
7
  - Simon Menke
@@ -1547,6 +1547,7 @@ files:
1547
1547
  - test/dummy/db/migrate/20131121092946_make_articles_translatable.rb
1548
1548
  - test/dummy/db/migrate/20131122165715_create_tags.rb
1549
1549
  - test/dummy/db/migrate/20131122170308_add_articles_tags_binding.rb
1550
+ - test/dummy/db/migrate/20140926152646_add_pre_and_postpend_test_columns_to_articles.rb
1550
1551
  - test/dummy/db/schema.rb
1551
1552
  - test/dummy/lib/assets/.gitkeep
1552
1553
  - test/dummy/log/.gitkeep
@@ -1647,6 +1648,7 @@ test_files:
1647
1648
  - test/dummy/db/migrate/20131121092946_make_articles_translatable.rb
1648
1649
  - test/dummy/db/migrate/20131122165715_create_tags.rb
1649
1650
  - test/dummy/db/migrate/20131122170308_add_articles_tags_binding.rb
1651
+ - test/dummy/db/migrate/20140926152646_add_pre_and_postpend_test_columns_to_articles.rb
1650
1652
  - test/dummy/db/schema.rb
1651
1653
  - test/dummy/lib/assets/.gitkeep
1652
1654
  - test/dummy/log/.gitkeep