Sutty/sutty
5
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

Merge branch 'rails' into autenticacion

Browse source
This commit is contained in:
f 2019-07-10 17:05:41 -03:00
commit bcf445d7f2
No known key found for this signature in database
GPG key ID: 2AE5A13E321F953D
4 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -34,7 +34,7 @@ gem 'bcrypt', '~> 3.1.7'
# Use Capistrano for deployment # Use Capistrano for deployment
# gem 'capistrano-rails', group: :development # gem 'capistrano-rails', group: :development
gem 'bootstrap', '~> 4.0.0' gem 'bootstrap', '~> 4'
gem 'carrierwave' gem 'carrierwave'
gem 'carrierwave-bombshelter' gem 'carrierwave-bombshelter'
gem 'carrierwave-i18n' gem 'carrierwave-i18n'

27
Gemfile.lock
View file

@ -48,15 +48,15 @@ GEM
sshkit (>= 1.6.1, != 1.7.0) sshkit (>= 1.6.1, != 1.7.0)
arel (9.0.0) arel (9.0.0)
ast (2.4.0) ast (2.4.0)
autoprefixer-rails (9.5.0) autoprefixer-rails (9.6.1)
execjs execjs
bcrypt (3.1.12) bcrypt (3.1.12)
bcrypt_pbkdf (1.0.0) bcrypt_pbkdf (1.0.0)
bindex (0.5.0) bindex (0.5.0)
bootstrap (4.0.0) bootstrap (4.3.1)
autoprefixer-rails (>= 6.0.3) autoprefixer-rails (>= 9.1.0)
popper_js (>= 1.12.9, < 2) popper_js (>= 1.14.3, < 2)
sass (>= 3.5.2) sassc-rails (>= 2.0.0)
builder (3.2.3) builder (3.2.3)
capistrano (3.11.0) capistrano (3.11.0)
airbrussh (>= 1.0.0) airbrussh (>= 1.0.0)
@ -128,7 +128,7 @@ GEM
activesupport (>= 4.0, < 6) activesupport (>= 4.0, < 6)
execjs (2.7.0) execjs (2.7.0)
fastimage (2.1.5) fastimage (2.1.5)
ffi (1.10.0) ffi (1.11.1)
font-awesome-rails (4.7.0.4) font-awesome-rails (4.7.0.4)
railties (>= 3.2, < 6.0) railties (>= 3.2, < 6.0)
forwardable-extended (2.6.0) forwardable-extended (2.6.0)
@ -211,7 +211,7 @@ GEM
net-ssh (5.2.0) net-ssh (5.2.0)
netaddr (2.0.3) netaddr (2.0.3)
nio4r (2.3.1) nio4r (2.3.1)
nokogiri (1.10.2) nokogiri (1.10.3)
mini_portile2 (~> 2.4.0) mini_portile2 (~> 2.4.0)
orm_adapter (0.5.0) orm_adapter (0.5.0)
parallel (1.16.0) parallel (1.16.0)
@ -287,7 +287,7 @@ GEM
sexp_processor (~> 4.9) sexp_processor (~> 4.9)
rubyzip (1.2.2) rubyzip (1.2.2)
safe_yaml (1.0.5) safe_yaml (1.0.5)
sass (3.7.3) sass (3.7.4)
sass-listen (~> 4.0.0) sass-listen (~> 4.0.0)
sass-listen (4.0.0) sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4) rb-fsevent (~> 0.9, >= 0.9.4)
@ -298,6 +298,15 @@ GEM
sprockets (>= 2.8, < 4.0) sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0) sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3) tilt (>= 1.1, < 3)
sassc (2.0.1)
ffi (~> 1.9)
rake
sassc-rails (2.1.2)
railties (>= 4.0.0)
sassc (>= 2.0)
sprockets (> 3.0)
sprockets-rails
tilt
selenium-webdriver (3.141.0) selenium-webdriver (3.141.0)
childprocess (~> 0.5) childprocess (~> 0.5)
rubyzip (~> 1.2, >= 1.2.2) rubyzip (~> 1.2, >= 1.2.2)
@ -356,7 +365,7 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
bcrypt (~> 3.1.7) bcrypt (~> 3.1.7)
bcrypt_pbkdf bcrypt_pbkdf
bootstrap (~> 4.0.0) bootstrap (~> 4)
capistrano capistrano
capistrano-bundler capistrano-bundler
capistrano-passenger capistrano-passenger

2
app/assets/javascripts/validation.js
View file

@ -1,5 +1,5 @@
$(document).on('turbolinks:load', function() { $(document).on('turbolinks:load', function() {
$(document).on('keypress', ':input:not(textarea):not([type=submit])', function(e) { $(document).on('keypress', '.post :input:not(textarea):not([type=submit])', function(e) {
if (e.keyCode == 13) { if (e.keyCode == 13) {
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();

2
app/views/posts/_form.haml
View file

@ -21,7 +21,7 @@
= render 'layouts/help', help: CommonMarker.render_doc(pre).to_html = render 'layouts/help', help: CommonMarker.render_doc(pre).to_html
= form_tag url, = form_tag url,
method: method, method: method,
class: "form #{@invalid ? 'was-validated' : ''}", class: "form post #{@invalid ? 'was-validated' : ''}",
novalidate: true, novalidate: true,
multipart: true do multipart: true do