質問編集履歴
2
$ git statusを追記
test
CHANGED
|
File without changes
|
test
CHANGED
|
@@ -12,6 +12,46 @@
|
|
|
12
12
|
|
|
13
13
|
|
|
14
14
|
|
|
15
|
+
※追記
|
|
16
|
+
|
|
17
|
+
git statusで見てみると、carrierwave.rbに問題があるようなのですが。
|
|
18
|
+
|
|
19
|
+
どのように対処すればよろしいでしょうか。
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
$ git status
|
|
24
|
+
|
|
25
|
+
```ここに言語を入力
|
|
26
|
+
|
|
27
|
+
On branch master
|
|
28
|
+
|
|
29
|
+
Your branch is ahead of 'childtalent/master' by 1 commit.
|
|
30
|
+
|
|
31
|
+
(use "git push" to publish your local commits)
|
|
32
|
+
|
|
33
|
+
Changes to be committed:
|
|
34
|
+
|
|
35
|
+
(use "git reset HEAD <file>..." to unstage)
|
|
36
|
+
|
|
37
|
+
|
|
38
|
+
|
|
39
|
+
modified: app/uploaders/image_uploader.rb
|
|
40
|
+
|
|
41
|
+
|
|
42
|
+
|
|
43
|
+
Untracked files:
|
|
44
|
+
|
|
45
|
+
(use "git add <file>..." to include in what will be committed)
|
|
46
|
+
|
|
47
|
+
|
|
48
|
+
|
|
49
|
+
config/initializers/carrierwave.rb
|
|
50
|
+
|
|
51
|
+
```
|
|
52
|
+
|
|
53
|
+
|
|
54
|
+
|
|
15
55
|
gemfile
|
|
16
56
|
|
|
17
57
|
```ruby
|
1
gemfileコードの追加
test
CHANGED
|
File without changes
|
test
CHANGED
|
@@ -12,6 +12,146 @@
|
|
|
12
12
|
|
|
13
13
|
|
|
14
14
|
|
|
15
|
+
gemfile
|
|
16
|
+
|
|
17
|
+
```ruby
|
|
18
|
+
|
|
19
|
+
source 'https://rubygems.org'
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
|
|
26
|
+
|
|
27
|
+
gem 'rails', '4.2.6'
|
|
28
|
+
|
|
29
|
+
# Use mysql as the database for Active Record
|
|
30
|
+
|
|
31
|
+
gem 'mysql2', '0.3.18'
|
|
32
|
+
|
|
33
|
+
# Use SCSS for stylesheets
|
|
34
|
+
|
|
35
|
+
gem 'sass-rails', '~> 4.0.2'
|
|
36
|
+
|
|
37
|
+
# Use Uglifier as compressor for JavaScript assets
|
|
38
|
+
|
|
39
|
+
gem 'uglifier', '>= 1.3.0'
|
|
40
|
+
|
|
41
|
+
# Use CoffeeScript for .coffee assets and views
|
|
42
|
+
|
|
43
|
+
gem 'coffee-rails', '~> 4.1.0'
|
|
44
|
+
|
|
45
|
+
# See https://github.com/rails/execjs#readme for more supported runtimes
|
|
46
|
+
|
|
47
|
+
# gem 'therubyracer', platforms: :ruby
|
|
48
|
+
|
|
49
|
+
|
|
50
|
+
|
|
51
|
+
# Use jquery as the JavaScript library
|
|
52
|
+
|
|
53
|
+
gem 'jquery-rails'
|
|
54
|
+
|
|
55
|
+
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
|
|
56
|
+
|
|
57
|
+
gem 'turbolinks'
|
|
58
|
+
|
|
59
|
+
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
|
|
60
|
+
|
|
61
|
+
gem 'jbuilder', '~> 2.0'
|
|
62
|
+
|
|
63
|
+
# bundle exec rake doc:rails generates the API under doc/api.
|
|
64
|
+
|
|
65
|
+
gem 'sdoc', '~> 0.4.0', group: :doc
|
|
66
|
+
|
|
67
|
+
|
|
68
|
+
|
|
69
|
+
# Use ActiveModel has_secure_password
|
|
70
|
+
|
|
71
|
+
# gem 'bcrypt', '~> 3.1.7'
|
|
72
|
+
|
|
73
|
+
|
|
74
|
+
|
|
75
|
+
# Use Unicorn as the app server
|
|
76
|
+
|
|
77
|
+
# gem 'unicorn'
|
|
78
|
+
|
|
79
|
+
|
|
80
|
+
|
|
81
|
+
# Use Capistrano for deployment
|
|
82
|
+
|
|
83
|
+
# gem 'capistrano-rails', group: :development
|
|
84
|
+
|
|
85
|
+
|
|
86
|
+
|
|
87
|
+
group :development, :test do
|
|
88
|
+
|
|
89
|
+
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
|
|
90
|
+
|
|
91
|
+
gem 'byebug'
|
|
92
|
+
|
|
93
|
+
end
|
|
94
|
+
|
|
95
|
+
|
|
96
|
+
|
|
97
|
+
group :development do
|
|
98
|
+
|
|
99
|
+
# Access an IRB console on exception pages or by using <%= console %> in views
|
|
100
|
+
|
|
101
|
+
gem 'web-console', '~> 2.0'
|
|
102
|
+
|
|
103
|
+
|
|
104
|
+
|
|
105
|
+
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
|
|
106
|
+
|
|
107
|
+
gem 'spring'
|
|
108
|
+
|
|
109
|
+
end
|
|
110
|
+
|
|
111
|
+
|
|
112
|
+
|
|
113
|
+
gem 'pry-rails'
|
|
114
|
+
|
|
115
|
+
gem 'compass-rails', '~> 2.0'
|
|
116
|
+
|
|
117
|
+
gem 'sprockets', '2.11.0'
|
|
118
|
+
|
|
119
|
+
gem 'devise'
|
|
120
|
+
|
|
121
|
+
gem 'paperclip'
|
|
122
|
+
|
|
123
|
+
gem 'kaminari'
|
|
124
|
+
|
|
125
|
+
gem 'therubyracer'
|
|
126
|
+
|
|
127
|
+
gem 'twitter-bootstrap-rails'
|
|
128
|
+
|
|
129
|
+
gem 'bootstrap-material-design', '0.1.4'
|
|
130
|
+
|
|
131
|
+
gem 'carrierwave'
|
|
132
|
+
|
|
133
|
+
|
|
134
|
+
|
|
135
|
+
gem 'mini_magick'
|
|
136
|
+
|
|
137
|
+
|
|
138
|
+
|
|
139
|
+
|
|
140
|
+
|
|
141
|
+
group :production do
|
|
142
|
+
|
|
143
|
+
gem 'rails_12factor'
|
|
144
|
+
|
|
145
|
+
end
|
|
146
|
+
|
|
147
|
+
|
|
148
|
+
|
|
149
|
+
gem 'fog'
|
|
150
|
+
|
|
151
|
+
```
|
|
152
|
+
|
|
153
|
+
|
|
154
|
+
|
|
15
155
|
image_uploader.rb
|
|
16
156
|
|
|
17
157
|
```ruby
|