Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge remote branch 'upstream/master'

  • Loading branch information...
commit 430c70ebe0b49d3af5db58eb1de71d7cf7233821 2 parents bad5d43 + 4cf27d4
@dmorley dmorley authored
Showing with 24 additions and 20 deletions.
  1. +2 −2 Gemfile
  2. +21 −16 Gemfile.lock
  3. +1 −2  app/views/people/index.mobile.haml
View
4 Gemfile
@@ -38,7 +38,7 @@ gem 'newrelic_rpm'
gem "rpm_contrib", "~> 2.1.7"
group :production do # we don't install these on travis to speed up test runs
- gem 'rails_admin', '~> 0.0.3'
+ gem 'rails_admin', :git => 'git://github.com/halida/rails_admin.git'
gem 'fastercsv', '1.5.5', :require => false
gem 'rack-ssl', :require => 'rack/ssl'
gem 'rack-rewrite', '~> 1.2.1', :require => false
@@ -101,7 +101,7 @@ gem 'acts-as-taggable-on', :git => "https://github.com/mbleigh/acts-as-taggable-
gem 'addressable', '~> 2.2', :require => 'addressable/uri'
gem 'http_accept_language', '~> 1.0.2'
-gem 'typhoeus', '~> 0.4.2'
+gem 'typhoeus', '~> 0.3.3'
# views
View
37 Gemfile.lock
@@ -1,4 +1,22 @@
GIT
+ remote: git://github.com/halida/rails_admin.git
+ revision: 590dceb10812a9207e42dbccecd5d1031715ae80
+ specs:
+ rails_admin (0.0.3)
+ bbenezech-nested_form (~> 0.0.6)
+ bootstrap-sass (~> 2.0, >= 2.0.3)
+ builder (~> 3.0)
+ coffee-rails (~> 3.1)
+ haml (~> 3.1)
+ jquery-rails (>= 1.0.17)
+ jquery-ui-rails (~> 0.2.2)
+ kaminari (~> 0.12)
+ rack-pjax (~> 0.5)
+ rails (~> 3.1)
+ remotipart (~> 1.0)
+ sass-rails (~> 3.1)
+
+GIT
remote: https://github.com/Empact/roxml.git
revision: 7ea9a9ffd2338aaef5b04cb792060ae8c98f346a
ref: 7ea9a9ffd2338aaef5b0
@@ -331,19 +349,6 @@ GEM
railties (= 3.2.6)
rails-i18n (0.6.5)
i18n (~> 0.5)
- rails_admin (0.0.3)
- bbenezech-nested_form (~> 0.0.6)
- bootstrap-sass (~> 2.0)
- builder (~> 3.0)
- coffee-rails (~> 3.1)
- haml (~> 3.1)
- jquery-rails (>= 1.0.17)
- jquery-ui-rails (~> 0.2.2)
- kaminari (~> 0.12)
- rack-pjax (~> 0.5)
- rails (~> 3.1)
- remotipart (~> 1.0)
- sass-rails (~> 3.1)
rails_autolink (1.0.9)
rails (~> 3.1)
railties (3.2.6)
@@ -442,7 +447,7 @@ GEM
faraday (~> 0.7)
multi_json (~> 1.0)
simple_oauth (~> 0.1)
- typhoeus (0.4.2)
+ typhoeus (0.3.3)
mime-types
tzinfo (0.3.33)
uglifier (1.2.4)
@@ -530,7 +535,7 @@ DEPENDENCIES
rack-ssl
rails (= 3.2.6)
rails-i18n
- rails_admin (~> 0.0.3)
+ rails_admin!
rails_autolink
redcarpet (= 2.1.1)
remotipart (~> 1.0)
@@ -550,7 +555,7 @@ DEPENDENCIES
thin (~> 1.3.1)
timecop
twitter (= 2.0.2)
- typhoeus (~> 0.4.2)
+ typhoeus (~> 0.3.3)
uglifier
unicorn (~> 4.3.0)
webmock (~> 1.7)
View
3  app/views/people/index.mobile.haml
@@ -5,11 +5,10 @@
- content_for :page_title do
= t('search')
-
%div{:style => 'text-align:center;'}
= form_tag(people_path, :method => 'get') do
%div{:data => {:role => 'fieldcontain', :inline => 'true'}}
- = search_field_tag :q
+ = search_field_tag :q, nil, :placeholder => t('find_people')
= submit_tag t('search'), 'data-inline' => 'true'
Please sign in to comment.
Something went wrong with that request. Please try again.