Skip to content

Commit

Permalink
Merge pull request #160 from jhedstrom/simplify-travis
Browse files Browse the repository at this point in the history
Remove custom php package installation

Signed-off-by: Jonathan Hedstrom <jhedstrom@gmail.com>
  • Loading branch information
jhedstrom committed Apr 1, 2015
1 parent d07f484 commit 1dbe656
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 11 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ env:
install:
- composer self-update
- composer install
- sudo apt-get update > /dev/null
- sudo apt-get --quiet=2 install php5-cli php5-cgi php5-curl php5-gd php5-mysql > /dev/null
- composer global require drush/drush:dev-master --prefer-source

before_script:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ dependencies:
- field.storage.user.field_user_tags
module:
- taxonomy
- entity_reference
id: user.user.field_user_tags
field_name: field_user_tags
entity_type: user
Expand All @@ -17,4 +18,10 @@ default_value: { }
default_value_callback: ''
settings:
handler: default
field_type: taxonomy_term_reference
handler_settings:
target_bundles:
tags: tags
sort:
field: _none
auto_create: true
field_type: entity_reference
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,13 @@ dependencies:
id: user.field_user_tags
field_name: field_user_tags
entity_type: user
type: taxonomy_term_reference
type: entity_reference
settings:
allowed_values:
-
vocabulary: tags
parent: 0
target_type: taxonomy_term
options_list_callback: null
target_bundle: null
module: taxonomy
locked: false
cardinality: -1
translatable: true
indexes: { }
persist_with_no_fields: false
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,10 @@ content:
settings: { }
third_party_settings: { }
field_user_tags:
type: taxonomy_term_reference_link
type: entity_reference_label
weight: 2
settings: { }
settings:
link: true
third_party_settings: { }
label: above
field_user_reference:
Expand Down

0 comments on commit 1dbe656

Please sign in to comment.