Skip to content
Extraits de code Groupes Projets
Valider e6bcc4e5 rédigé par echarp's avatar echarp
Parcourir les fichiers

Bundle update

parent e0d64158
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Masquer les modifications d'espaces
En ligne Côte à côte
Gemfile
+ 1
− 1
Voir le fichier @ e6bcc4e5
...@@ -26,7 +26,7 @@ gem 'jquery-turbolinks' ...@@ -26,7 +26,7 @@ gem 'jquery-turbolinks'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder' gem 'jbuilder'
# bundle exec rake doc:rails generates the API under doc/api. # bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', '~> 0.4.0', group: :doc gem 'sdoc', '~> 0.4.0', group: :doc
# Use ActiveModel has_secure_password # Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7' # gem 'bcrypt', '~> 3.1.7'
......
Gemfile.lock
+ 26
− 28
Voir le fichier @ e6bcc4e5
...@@ -8,7 +8,7 @@ GIT ...@@ -8,7 +8,7 @@ GIT
GIT GIT
remote: git://github.com/svenfuchs/i18n-active_record.git remote: git://github.com/svenfuchs/i18n-active_record.git
revision: 8a38eeb8e2cf6be53ecc1240da6f11c8b24945cb revision: b26c2e62e32df2f3b9ae42083647725b7ecfdff0
specs: specs:
i18n-active_record (0.0.2) i18n-active_record (0.0.2)
i18n (>= 0.5.0) i18n (>= 0.5.0)
...@@ -35,7 +35,7 @@ GEM ...@@ -35,7 +35,7 @@ GEM
erubis (~> 2.7.0) erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5) rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2) rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview-encoded_mail_to (1.0.6) actionview-encoded_mail_to (1.0.7)
rails rails
activeadmin (1.0.0.pre1) activeadmin (1.0.0.pre1)
arbre (~> 1.0, >= 1.0.2) arbre (~> 1.0, >= 1.0.2)
...@@ -71,8 +71,8 @@ GEM ...@@ -71,8 +71,8 @@ GEM
addressable (2.3.8) addressable (2.3.8)
arbre (1.0.3) arbre (1.0.3)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
arel (6.0.2) arel (6.0.3)
ast (2.0.0) ast (2.1.0)
astrolabe (1.3.1) astrolabe (1.3.1)
parser (~> 2.2) parser (~> 2.2)
bcrypt (3.1.10) bcrypt (3.1.10)
...@@ -93,8 +93,7 @@ GEM ...@@ -93,8 +93,7 @@ GEM
terminal-table (~> 1.4) terminal-table (~> 1.4)
buftok (0.2.0) buftok (0.2.0)
builder (3.2.2) builder (3.2.2)
byebug (5.0.0) byebug (6.0.0)
columnize (= 0.9.0)
chunky_png (1.3.4) chunky_png (1.3.4)
coderay (1.1.0) coderay (1.1.0)
coffee-rails (4.1.0) coffee-rails (4.1.0)
...@@ -104,7 +103,6 @@ GEM ...@@ -104,7 +103,6 @@ GEM
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.9.1.1) coffee-script-source (1.9.1.1)
columnize (0.9.0)
compass (1.0.3) compass (1.0.3)
chunky_png (~> 1.2) chunky_png (~> 1.2)
compass-core (~> 1.0.2) compass-core (~> 1.0.2)
...@@ -117,12 +115,12 @@ GEM ...@@ -117,12 +115,12 @@ GEM
sass (>= 3.3.0, < 3.5) sass (>= 3.3.0, < 3.5)
compass-import-once (1.0.5) compass-import-once (1.0.5)
sass (>= 3.2, < 3.5) sass (>= 3.2, < 3.5)
compass-rails (2.0.4) compass-rails (2.0.5)
compass (~> 1.0.0) compass (~> 1.0.0)
sass-rails (<= 5.0.1) sass-rails (< 5.1)
sprockets (< 2.13) sprockets (< 2.13)
debug_inspector (0.0.2) debug_inspector (0.0.2)
devise (3.5.1) devise (3.5.2)
bcrypt (~> 3.0) bcrypt (~> 3.0)
orm_adapter (~> 0.1) orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5) railties (>= 3.2.6, < 5)
...@@ -139,22 +137,22 @@ GEM ...@@ -139,22 +137,22 @@ GEM
activemodel activemodel
equalizer (0.0.11) equalizer (0.0.11)
erubis (2.7.0) erubis (2.7.0)
eventmachine (1.0.7) eventmachine (1.0.8)
execjs (2.5.2) execjs (2.6.0)
faraday (0.9.1) faraday (0.9.1)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
fastercsv (1.5.5) fastercsv (1.5.5)
ffi (1.9.10) ffi (1.9.10)
font-awesome-sass (4.3.2.1) font-awesome-sass (4.4.0)
sass (~> 3.2) sass (>= 3.2)
formatador (0.2.5) formatador (0.2.5)
formtastic (3.1.3) formtastic (3.1.3)
actionpack (>= 3.2.13) actionpack (>= 3.2.13)
formtastic_i18n (0.4.1) formtastic_i18n (0.4.1)
geocoder (1.2.9) geocoder (1.2.9)
globalid (0.3.5) globalid (0.3.6)
activesupport (>= 4.1.0) activesupport (>= 4.1.0)
guard (2.12.9) guard (2.13.0)
formatador (>= 0.2.4) formatador (>= 0.2.4)
listen (>= 2.7, <= 4.0) listen (>= 2.7, <= 4.0)
lumberjack (~> 1.0) lumberjack (~> 1.0)
...@@ -185,7 +183,7 @@ GEM ...@@ -185,7 +183,7 @@ GEM
guard-rubocop (1.2.0) guard-rubocop (1.2.0)
guard (~> 2.0) guard (~> 2.0)
rubocop (~> 0.20) rubocop (~> 0.20)
haml (4.0.6) haml (4.0.7)
tilt tilt
haml-lint (0.13.0) haml-lint (0.13.0)
haml (~> 4.0) haml (~> 4.0)
...@@ -240,7 +238,7 @@ GEM ...@@ -240,7 +238,7 @@ GEM
listen (3.0.3) listen (3.0.3)
rb-fsevent (>= 0.9.3) rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9) rb-inotify (>= 0.9)
loofah (2.0.2) loofah (2.0.3)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
lumberjack (1.0.9) lumberjack (1.0.9)
mail (2.6.3) mail (2.6.3)
...@@ -252,20 +250,20 @@ GEM ...@@ -252,20 +250,20 @@ GEM
method_source (0.8.2) method_source (0.8.2)
mime-types (2.6.1) mime-types (2.6.1)
mini_portile (0.6.2) mini_portile (0.6.2)
minitest (5.7.0) minitest (5.8.0)
modernizr-rails (2.7.1) modernizr-rails (2.7.1)
multi_json (1.11.2) multi_json (1.11.2)
multipart-post (2.0.0) multipart-post (2.0.0)
mysql2 (0.3.18) mysql2 (0.3.19)
naught (1.0.0) naught (1.0.0)
nenv (0.2.0) nenv (0.2.0)
nokogiri (1.6.6.2) nokogiri (1.6.6.2)
mini_portile (~> 0.6.0) mini_portile (~> 0.6.0)
notiffany (0.0.6) notiffany (0.0.7)
nenv (~> 0.1) nenv (~> 0.1)
shellany (~> 0.0) shellany (~> 0.0)
orm_adapter (0.5.0) orm_adapter (0.5.0)
paper_trail (4.0.0.rc2) paper_trail (4.0.0)
activerecord (>= 3.0, < 6.0) activerecord (>= 3.0, < 6.0)
activesupport (>= 3.0, < 6.0) activesupport (>= 3.0, < 6.0)
request_store (~> 1.1) request_store (~> 1.1)
...@@ -296,7 +294,7 @@ GEM ...@@ -296,7 +294,7 @@ GEM
sprockets-rails sprockets-rails
rails-deprecated_sanitizer (1.0.3) rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha) activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.6) rails-dom-testing (1.0.7)
activesupport (>= 4.2.0.beta, < 5.0) activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0) nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1) rails-deprecated_sanitizer (>= 1.0.1)
...@@ -328,7 +326,7 @@ GEM ...@@ -328,7 +326,7 @@ GEM
request_store (1.2.0) request_store (1.2.0)
responders (2.1.0) responders (2.1.0)
railties (>= 4.2.0, < 5) railties (>= 4.2.0, < 5)
rubocop (0.32.1) rubocop (0.33.0)
astrolabe (~> 1.3) astrolabe (~> 1.3)
parser (>= 2.2.2.5, < 3.0) parser (>= 2.2.2.5, < 3.0)
powerpack (~> 0.1) powerpack (~> 0.1)
...@@ -338,10 +336,10 @@ GEM ...@@ -338,10 +336,10 @@ GEM
ruby2ruby (2.1.4) ruby2ruby (2.1.4)
ruby_parser (~> 3.1) ruby_parser (~> 3.1)
sexp_processor (~> 4.0) sexp_processor (~> 4.0)
ruby_parser (3.7.0) ruby_parser (3.7.1)
sexp_processor (~> 4.1) sexp_processor (~> 4.1)
sass (3.4.16) sass (3.4.16)
sass-rails (5.0.1) sass-rails (5.0.3)
railties (>= 4.0.0, < 5.0) railties (>= 4.0.0, < 5.0)
sass (~> 3.1) sass (~> 3.1)
sprockets (>= 2.8, < 4.0) sprockets (>= 2.8, < 4.0)
...@@ -384,7 +382,7 @@ GEM ...@@ -384,7 +382,7 @@ GEM
thor (0.19.1) thor (0.19.1)
thread_safe (0.3.5) thread_safe (0.3.5)
tilt (1.4.1) tilt (1.4.1)
tinymce-rails (4.2.2) tinymce-rails (4.2.3)
railties (>= 3.1.1) railties (>= 3.1.1)
tinymce-rails-langs (4.20140129) tinymce-rails-langs (4.20140129)
tinymce-rails (~> 4.0) tinymce-rails (~> 4.0)
...@@ -478,4 +476,4 @@ DEPENDENCIES ...@@ -478,4 +476,4 @@ DEPENDENCIES
webshims-rails webshims-rails
BUNDLED WITH BUNDLED WITH
1.10.5 1.10.6
app/models/event.rb
+ 1
− 1
Voir le fichier @ e6bcc4e5
...@@ -95,7 +95,7 @@ class Event < ActiveRecord::Base ...@@ -95,7 +95,7 @@ class Event < ActiveRecord::Base
end end
def hashtags def hashtags
tags.split.map { |tag| "##{tag.gsub(/-/, '_').camelize :lower}" } tags.split.map { |tag| "##{tag.tr('-', '_').camelize :lower}" }
end end
def to_s def to_s
......
bin/setup
+ 1
− 1
Voir le fichier @ e6bcc4e5
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
require 'pathname' require 'pathname'
# path to your application root. # path to your application root.
APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
Dir.chdir APP_ROOT do Dir.chdir APP_ROOT do
# This script is a starting point to setup your application. # This script is a starting point to setup your application.
......
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter