gistfile1.diff

diff --git a/Gemfile b/Gemfile
index f66e17d..f1aced8 100755
--- a/Gemfile
+++ b/Gemfile
@@ -1,8 +1,8 @@
 source 'http://rubygems.org'
 
 
-gem 'bundler'
-gem 'rails', '3.2.13'
+gem 'bundler', '~> 1.2.0'
+gem 'rails', '3.2.12'
 gem 'json'
 gem 'pg'
 gem 'jquery-rails', '2.1.3'
diff --git a/Gemfile.lock b/Gemfile.lock
index c174c78..79f3aca 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -63,12 +63,12 @@ GIT
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.13)
-      actionpack (= 3.2.13)
-      mail (~> 2.5.3)
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
+    actionmailer (3.2.12)
+      actionpack (= 3.2.12)
+      mail (~> 2.4.4)
+    actionpack (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -78,19 +78,19 @@ GEM
       sprockets (~> 2.2.1)
     active_admin-awesome_nested_set (0.0.3)
       rails (~> 3.2.5)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
+    activemodel (3.2.12)
+      activesupport (= 3.2.12)
       builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
+    activerecord (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
+    activeresource (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
+    activesupport (3.2.12)
+      i18n (~> 0.6)
       multi_json (~> 1.0)
     acts-as-taggable-on (2.3.3)
       rails (~> 3.0)
@@ -233,7 +233,7 @@ GEM
       multi_json (~> 1.0)
       multi_xml (>= 0.5.2)
     httpauth (0.2.0)
-    i18n (0.6.1)
+    i18n (0.6.4)
     inherited_resources (1.3.1)
       has_scope (~> 0.5.0)
       responders (~> 0.6)
@@ -257,7 +257,7 @@ GEM
     libxml-ruby (2.6.0)
     listen (0.7.3)
     lumberjack (1.0.2)
-    mail (2.5.3)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
@@ -331,17 +331,17 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.13)
-      actionmailer (= 3.2.13)
-      actionpack (= 3.2.13)
-      activerecord (= 3.2.13)
-      activeresource (= 3.2.13)
-      activesupport (= 3.2.13)
+    rails (3.2.12)
+      actionmailer (= 3.2.12)
+      actionpack (= 3.2.12)
+      activerecord (= 3.2.12)
+      activeresource (= 3.2.12)
+      activesupport (= 3.2.12)
       bundler (~> 1.0)
-      railties (= 3.2.13)
-    railties (3.2.13)
-      actionpack (= 3.2.13)
-      activesupport (= 3.2.13)
+      railties (= 3.2.12)
+    railties (3.2.12)
+      actionpack (= 3.2.12)
+      activesupport (= 3.2.12)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -432,12 +432,12 @@ GEM
       builder (>= 2.1.2)
       riddle (>= 1.5.0)
     thor (0.17.0)
-    tilt (1.3.6)
+    tilt (1.3.4)
     timecop (0.5.9.2)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
+    tzinfo (0.3.36)
     uglifier (1.3.0)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
@@ -466,7 +466,7 @@ DEPENDENCIES
   ancestry
   awesome_nested_set
   aws-sdk (~> 1.5.6)
-  bundler
+  bundler (~> 1.2.0)
   cancan
   carrierwave
   carrierwave_backgrounder
@@ -514,7 +514,7 @@ DEPENDENCIES
   progress_bar
   pry-rails
   quiet_assets
-  rails (= 3.2.13)
+  rails (= 3.2.12)
   remotipart (~> 1.0)
   retriable
   rich!
diff --git a/app/assets/javascripts/pages/new-listing.coffee b/app/assets/javascripts/pages/new-listing.coffee
index 46726d0..420c58a 100644
--- a/app/assets/javascripts/pages/new-listing.coffee
+++ b/app/assets/javascripts/pages/new-listing.coffee
@@ -293,14 +293,9 @@ evil.on '.listings-add-page', ($, $$, form) ->
   # Меняем измерение площади для коммерческих земельных участков
   $(form).on 'change', '[name=advert\\[commercial_type\\]]', ->
     if $(this).val() == 'земельный участок' # TODO: >__<
-      $('.area-metric').siblings('input').attr('placeholder', 'В сотках')
-      $('.area-metric').hide()
-
-      $('option[value=perm]').text('за сотку').trigger('liszt:updated')
+      $('.area-metric').text('га')
       $('.additional-property-options input').attr('checked', false)
       $('.additional-property-options').hide()
     else
-      $('option[value=perm]').text('за кв.м.').trigger('liszt:updated')
-      $('.area-metric').siblings('input').attr('placeholder', 'Например, 50.5')
-      $('.area-metric').show()
+      $('.area-metric').html('м<sup>2</sup>')
       $('.additional-property-options').show()