Skip to content

Commit f0fc793

Browse files
committed
Merge branch 'following-users' of https://github.com/learnenough/rails_tutorial_sample_app_7th_ed into following-users
2 parents a648432 + 0e32268 commit f0fc793

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.1.1
1+
3.1.2

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
source "https://rubygems.org"
22
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
33

4-
ruby "3.1.1"
4+
ruby "3.1.2"
55

66
gem "rails", "7.0.2.3"
77
gem "image_processing", "1.12.2"

app/helpers/sessions_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,4 @@ def log_out
5959
def store_location
6060
session[:forwarding_url] = request.original_url if request.get?
6161
end
62-
end
62+
end

app/models/user.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,4 +120,4 @@ def create_activation_digest
120120
self.activation_token = User.new_token
121121
self.activation_digest = User.digest(activation_token)
122122
end
123-
end
123+
end

0 commit comments

Comments
 (0)