[DRE-commits] [ruby-rails-admin] 01/02: Merge tag 'upstream/0.7.0_dfsg'

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository ruby-rails-admin.

commit a30df9980cc85ef4500c1e292998abb8ff91ff76
Merge: 7db9594 c4f718d
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Sep 1 21:47:25 2015 +0530

    Merge tag 'upstream/0.7.0_dfsg'
    
    Upstream version 0.7.0~dfsg
    
    # gpg: Signature made Tuesday 01 September 2015 09:47:19 PM IST using RSA key ID 4512C22A
    # gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>"
    # gpg:                 aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>"
    # gpg:                 aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>"
    # gpg:                 aka "Pirate Praveen (PP) <praveen at privacyrequired.com>"
    # gpg:                 aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>"

 Gemfile                                            |  54 +-
 README.md                                          |   2 +-
 .../rails_admin/ra.filtering-multiselect.js        |  25 +-
 .../javascripts/rails_admin/ra.filtering-select.js |  23 +-
 app/assets/javascripts/rails_admin/ra.i18n.coffee  |   2 +-
 .../javascripts/rails_admin/ra.remote-form.js      |   4 +-
 .../javascripts/rails_admin/ra.widgets.coffee      |   2 +-
 app/assets/javascripts/rails_admin/ui.coffee       |   8 +
 .../stylesheets/rails_admin/base/theming.scss      |  44 +-
 app/assets/stylesheets/rails_admin/ra.widgets.scss |   5 +-
 .../rails_admin/themes/cerulean/theming.scss       | 154 ++--
 .../rails_admin/themes/cerulean/variables.scss     | 929 ++++++++++++++++++---
 app/helpers/rails_admin/application_helper.rb      |   9 +-
 app/helpers/rails_admin/main_helper.rb             |   6 +-
 .../layouts/rails_admin/_navigation.html.haml      |   7 +-
 .../rails_admin/_secondary_navigation.html.haml    |   4 +-
 .../rails_admin/main/_form_file_upload.html.haml   |   8 +-
 app/views/rails_admin/main/index.html.haml         |   2 +
 config/locales/rails_admin.en.yml                  |   3 +
 lib/rails_admin/config.rb                          |   4 +
 lib/rails_admin/config/fields/association.rb       |   2 +-
 lib/rails_admin/config/fields/base.rb              |   4 +-
 lib/rails_admin/config/fields/factories/enum.rb    |   4 +
 .../config/fields/types/active_record_enum.rb      |  41 +
 lib/rails_admin/config/fields/types/all.rb         |   1 +
 lib/rails_admin/config/fields/types/file_upload.rb |   9 +-
 lib/rails_admin/config/fields/types/serialized.rb  |   2 +-
 lib/rails_admin/config/fields/types/string.rb      |   7 +-
 lib/rails_admin/config/fields/types/text.rb        |   1 +
 lib/rails_admin/engine.rb                          |   5 +-
 lib/rails_admin/version.rb                         |   4 +-
 metadata.yml                                       |   7 +-
 32 files changed, 1113 insertions(+), 269 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-rails-admin.git