cafe-grader-web

Commit r379:91238b16dbc9 public

parent | child
Description:
Merge pull request #12 from wytesk133/master Updated Gemfile and fixed various bugs
Commit status:
[Not Reviewed]
References:
merge default
Diff options:
Raw Diff | Patch Diff | Download Diff | Show whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r379:91238b16dbc9 - - 10 files changed: 74 inserted, 69 deleted

Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,6 +1,6
1 1 source 'https://rubygems.org'
2 2
3 - gem 'rails', '3.2.19'
3 + gem 'rails', '3.2.21'
4 4
5 5 # Bundle edge Rails instead:
6 6 # gem 'rails', :git => 'git://github.com/rails/rails.git'
@@ -10,13 +10,13
10 10 # Gems used only for assets and not required
11 11 # in production environments by default.
12 12 group :assets do
13 - gem 'sass-rails', '~> 3.2.3'
14 - gem 'coffee-rails', '~> 3.2.1'
13 + gem 'sass-rails', '~> 3.2.6'
14 + gem 'coffee-rails', '~> 3.2.2'
15 15
16 16 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
17 17 # gem 'therubyracer', :platforms => :ruby
18 18
19 - gem 'uglifier', '>= 1.0.3'
19 + gem 'uglifier'
20 20 end
21 21
22 22 gem 'prototype-rails'
@@ -36,15 +36,15
36 36 # To use debugger
37 37 # gem 'debugger'
38 38
39 - gem "haml"
40 - gem "mail"
41 - gem "rdiscount"
42 - gem "test-unit"
43 - gem 'will_paginate', '~> 3.0.0'
39 + gem 'haml'
40 + gem 'mail'
41 + gem 'rdiscount'
42 + gem 'test-unit'
43 + gem 'will_paginate', '~> 3.0.7'
44 44 gem 'dynamic_form'
45 45 gem 'in_place_editing'
46 - gem 'verification', :git => 'git://github.com/sikachu/verification.git'
46 + gem 'verification', :git => 'https://github.com/sikachu/verification.git'
47 47
48 48 group :test, :development do
49 - gem "rspec-rails", "~> 2.0"
49 + gem 'rspec-rails', '~> 2.99.0'
50 50 end
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,5 +1,5
1 1 GIT
2 - remote: git://github.com/sikachu/verification.git
2 + remote: https://github.com/sikachu/verification.git
3 3 revision: 76eaf51b13276ecae54bd9cd115832595d2ff56d
4 4 specs:
5 5 verification (1.0.3)
@@ -9,12 +9,12
9 9 GEM
10 10 remote: https://rubygems.org/
11 11 specs:
12 - actionmailer (3.2.19)
13 - actionpack (= 3.2.19)
12 + actionmailer (3.2.21)
13 + actionpack (= 3.2.21)
14 14 mail (~> 2.5.4)
15 - actionpack (3.2.19)
16 - activemodel (= 3.2.19)
17 - activesupport (= 3.2.19)
15 + actionpack (3.2.21)
16 + activemodel (= 3.2.21)
17 + activesupport (= 3.2.21)
18 18 builder (~> 3.0.0)
19 19 erubis (~> 2.7.0)
20 20 journey (~> 1.0.4)
@@ -22,18 +22,18
22 22 rack-cache (~> 1.2)
23 23 rack-test (~> 0.6.1)
24 24 sprockets (~> 2.2.1)
25 - activemodel (3.2.19)
26 - activesupport (= 3.2.19)
25 + activemodel (3.2.21)
26 + activesupport (= 3.2.21)
27 27 builder (~> 3.0.0)
28 - activerecord (3.2.19)
29 - activemodel (= 3.2.19)
30 - activesupport (= 3.2.19)
28 + activerecord (3.2.21)
29 + activemodel (= 3.2.21)
30 + activesupport (= 3.2.21)
31 31 arel (~> 3.0.2)
32 32 tzinfo (~> 0.3.29)
33 - activeresource (3.2.19)
34 - activemodel (= 3.2.19)
35 - activesupport (= 3.2.19)
36 - activesupport (3.2.19)
33 + activeresource (3.2.21)
34 + activemodel (= 3.2.21)
35 + activesupport (= 3.2.21)
36 + activesupport (3.2.21)
37 37 i18n (~> 0.6, >= 0.6.4)
38 38 multi_json (~> 1.0)
39 39 arel (3.0.3)
@@ -44,15 +44,15
44 44 coffee-script (2.3.0)
45 45 coffee-script-source
46 46 execjs
47 - coffee-script-source (1.7.1)
47 + coffee-script-source (1.8.0)
48 48 diff-lcs (1.2.5)
49 49 dynamic_form (1.1.4)
50 50 erubis (2.7.0)
51 - execjs (2.2.1)
52 - haml (4.0.5)
51 + execjs (2.2.2)
52 + haml (4.0.6)
53 53 tilt
54 54 hike (1.2.3)
55 - i18n (0.6.11)
55 + i18n (0.7.0)
56 56 in_place_editing (1.2.0)
57 57 journey (1.0.4)
58 58 json (1.8.1)
@@ -61,9 +61,9
61 61 treetop (~> 1.4.8)
62 62 mime-types (1.25.1)
63 63 multi_json (1.10.1)
64 - mysql2 (0.3.16)
64 + mysql2 (0.3.17)
65 65 polyglot (0.3.5)
66 - power_assert (0.1.3)
66 + power_assert (0.2.2)
67 67 prototype-rails (3.2.1)
68 68 rails (~> 3.2)
69 69 rack (1.4.5)
@@ -73,26 +73,26
73 73 rack
74 74 rack-test (0.6.2)
75 75 rack (>= 1.0)
76 - rails (3.2.19)
77 - actionmailer (= 3.2.19)
78 - actionpack (= 3.2.19)
79 - activerecord (= 3.2.19)
80 - activeresource (= 3.2.19)
81 - activesupport (= 3.2.19)
76 + rails (3.2.21)
77 + actionmailer (= 3.2.21)
78 + actionpack (= 3.2.21)
79 + activerecord (= 3.2.21)
80 + activeresource (= 3.2.21)
81 + activesupport (= 3.2.21)
82 82 bundler (~> 1.0)
83 - railties (= 3.2.19)
84 - railties (3.2.19)
85 - actionpack (= 3.2.19)
86 - activesupport (= 3.2.19)
83 + railties (= 3.2.21)
84 + railties (3.2.21)
85 + actionpack (= 3.2.21)
86 + activesupport (= 3.2.21)
87 87 rack-ssl (~> 1.3.2)
88 88 rake (>= 0.8.7)
89 89 rdoc (~> 3.4)
90 90 thor (>= 0.14.6, < 2.0)
91 - rake (10.3.2)
91 + rake (10.4.2)
92 92 rdiscount (2.1.7.1)
93 93 rdoc (3.12.2)
94 94 json (~> 1.4)
95 - rspec-collection_matchers (1.0.0)
95 + rspec-collection_matchers (1.1.2)
96 96 rspec-expectations (>= 2.99.0.beta1)
97 97 rspec-core (2.99.2)
98 98 rspec-expectations (2.99.2)
@@ -107,25 +107,25
107 107 rspec-core (~> 2.99.0)
108 108 rspec-expectations (~> 2.99.0)
109 109 rspec-mocks (~> 2.99.0)
110 - sass (3.4.1)
110 + sass (3.4.9)
111 111 sass-rails (3.2.6)
112 112 railties (~> 3.2.0)
113 113 sass (>= 3.1.10)
114 114 tilt (~> 1.3)
115 - sprockets (2.2.2)
115 + sprockets (2.2.3)
116 116 hike (~> 1.2)
117 117 multi_json (~> 1.0)
118 118 rack (~> 1.0)
119 119 tilt (~> 1.1, != 1.3.0)
120 - test-unit (3.0.1)
120 + test-unit (3.0.9)
121 121 power_assert
122 122 thor (0.19.1)
123 123 tilt (1.4.1)
124 124 treetop (1.4.15)
125 125 polyglot
126 126 polyglot (>= 0.3.1)
127 - tzinfo (0.3.41)
128 - uglifier (2.5.3)
127 + tzinfo (0.3.42)
128 + uglifier (2.6.0)
129 129 execjs (>= 0.3.0)
130 130 json (>= 1.8.0)
131 131 will_paginate (3.0.7)
@@ -134,18 +134,18
134 134 ruby
135 135
136 136 DEPENDENCIES
137 - coffee-rails (~> 3.2.1)
137 + coffee-rails (~> 3.2.2)
138 138 dynamic_form
139 139 haml
140 140 in_place_editing
141 141 mail
142 142 mysql2
143 143 prototype-rails
144 - rails (= 3.2.19)
144 + rails (= 3.2.21)
145 145 rdiscount
146 - rspec-rails (~> 2.0)
147 - sass-rails (~> 3.2.3)
146 + rspec-rails (~> 2.99.0)
147 + sass-rails (~> 3.2.6)
148 148 test-unit
149 - uglifier (>= 1.0.3)
149 + uglifier
150 150 verification!
151 - will_paginate (~> 3.0.0)
151 + will_paginate (~> 3.0.7)
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -31,20 +31,21
31 31 user = User.find(session[:user_id])
32 32 @message = Message.new(params[:message])
33 33 @message.sender = user
34 - if !@message.save
35 - render :action => 'list' and return
34 + if @message.body == '' or !@message.save
35 + flash[:notice] = 'An error occurred'
36 36 else
37 37 flash[:notice] = 'New message posted'
38 + end
38 39 redirect_to :action => 'list'
39 40 end
40 - end
41 41
42 42 def reply
43 43 user = User.find(session[:user_id])
44 44 @message = Message.new(params[:r_message])
45 45 @message.sender = user
46 - if !@message.save
47 - render :action => 'show' and return
46 + if @message.body == '' or !@message.save
47 + flash[:notice] = 'An error occurred'
48 + redirect_to :action => 'show', :id => @message.replying_message_id
48 49 else
49 50 flash[:notice] = 'Message replied'
50 51 rep_msg = @message.replying_message
@@ -58,7 +59,7
58 59 message = Message.find(params[:id])
59 60 message.replied = true
60 61 message.save
61 - flash[:notice] = 'Message hided (just marked replied)'
62 + flash[:notice] = 'Message hidden (just marked replied)'
62 63 redirect_to :action => 'console'
63 64 end
64 65
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,5 +1,5
1 1
2 - <% if compiler_message==nil or compiler_message=='' %>
2 + <% if compiler_message == nil or compiler_message.chomp == '' %>
3 3 No message
4 4 <% else %>
5 5 <div><div><a href="#" onClick="n = this.parentNode.parentNode.lastChild;
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,6 +1,6
1 1 %h2= "Compiler message for submission \##{@submission.number}, task: #{@submission.problem.name}"
2 2 %p
3 - - if @submission.compiler_message.chomp == ''
4 - no message
3 + - if @submission.compiler_message == nil or @submission.compiler_message.chomp == ''
4 + No message
5 5 - else
6 6 = simple_format(@submission.compiler_message)
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -14,7 +14,7
14 14 <%= password_field 'user', 'password_confirmation' %></p>
15 15
16 16 <p><label for="user_email">E-mail</label><br/>
17 - <%= text_field 'user', 'email' %></p>
17 + <%= email_field 'user', 'email' %></p>
18 18
19 19 <p><label for="user_alias">Alias</label><br/>
20 20 <%= text_field 'user', 'alias' %></p>
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -16,7 +16,7
16 16 <td><%= text_field 'user', 'full_name', :size => 30 %></td>
17 17 <td><%= password_field 'user', 'password', :size => 10 %></td>
18 18 <td><%= password_field 'user', 'password_confirmation', :size => 10 %></td>
19 - <td><%= text_field 'user', 'email', :size => 15 %></td>
19 + <td><%= email_field 'user', 'email', :size => 15 %></td>
20 20 <td><%= submit_tag "Create" %></td>
21 21 </tr>
22 22 </table>
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -11,7 +11,8
11 11
12 12 = form_tag :action => 'retrieve_password' do
13 13 =t 'registration.password_retrieval.instructions'
14 - = text_field 'email', nil, :size => 20
14 + %br/
15 + = email_field 'email', nil, :size => 20
15 16 %br/
16 17 = submit_tag(t 'registration.password_retrieval.button_label')
17 18
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -25,12 +25,12
25 25 %tr
26 26 %td{:align => "right"}
27 27 = "#{t 'email_label'}:"
28 - %td= f.text_field :email
28 + %td= f.email_field :email
29 29 %tr
30 30 %td
31 31 %td
32 32 %small
33 - =t 'registration.email_guide'
33 + =t('registration.email_guide').html_safe
34 34 %tr
35 35 %td/
36 36 %td
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -34,4 +34,7
34 34
35 35 # Expands the lines which load the assets
36 36 config.assets.debug = true
37 +
38 + # Prevents assets from rendering twice
39 + config.serve_static_assets = false
37 40 end
You need to be logged in to leave comments. Login now