Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
  • 4 commits
  • 5 files changed
  • 0 commit comments
  • 2 contributors
View
2  Gemfile
@@ -1,6 +1,6 @@
source 'https://rubygems.org'
-gem 'rails', '3.2.16' #, git: 'git://github.com/rails/rails.git'
+gem 'rails', '3.2.17'
gem 'redhillonrails_core', git: 'git://github.com/rosa-abf/redhillonrails_core.git', branch: 'rails31' # '~> 2.0.0.pre' # deprecated
gem 'pg', '~> 0.14.0'
View
52 Gemfile.lock
@@ -35,12 +35,12 @@ GEM
remote: https://rubygems.org/
specs:
RedCloth (4.2.9)
- actionmailer (3.2.16)
- actionpack (= 3.2.16)
+ actionmailer (3.2.17)
+ actionpack (= 3.2.17)
mail (~> 2.5.4)
- actionpack (3.2.16)
- activemodel (= 3.2.16)
- activesupport (= 3.2.16)
+ actionpack (3.2.17)
+ activemodel (= 3.2.17)
+ activesupport (= 3.2.17)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
@@ -48,22 +48,22 @@ GEM
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
- activemodel (3.2.16)
- activesupport (= 3.2.16)
+ activemodel (3.2.17)
+ activesupport (= 3.2.17)
builder (~> 3.0.0)
- activerecord (3.2.16)
- activemodel (= 3.2.16)
- activesupport (= 3.2.16)
+ activerecord (3.2.17)
+ activemodel (= 3.2.17)
+ activesupport (= 3.2.17)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activerecord-postgres-hstore (0.7.7)
activerecord (>= 3.1)
pg-hstore (>= 1.1.5)
rake
- activeresource (3.2.16)
- activemodel (= 3.2.16)
- activesupport (= 3.2.16)
- activesupport (3.2.16)
+ activeresource (3.2.17)
+ activemodel (= 3.2.17)
+ activesupport (= 3.2.17)
+ activesupport (3.2.17)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
airbrake (3.1.15)
@@ -277,7 +277,7 @@ GEM
mime-types
pg (0.14.1)
pg-hstore (1.2.0)
- polyglot (0.3.3)
+ polyglot (0.3.4)
posix-spawn (0.3.8)
puma (2.7.1)
rack (>= 1.1, < 2.0)
@@ -296,21 +296,21 @@ GEM
rack (>= 1.0)
rack-throttle (0.3.0)
rack (>= 1.0.0)
- rails (3.2.16)
- actionmailer (= 3.2.16)
- actionpack (= 3.2.16)
- activerecord (= 3.2.16)
- activeresource (= 3.2.16)
- activesupport (= 3.2.16)
+ rails (3.2.17)
+ actionmailer (= 3.2.17)
+ actionpack (= 3.2.17)
+ activerecord (= 3.2.17)
+ activeresource (= 3.2.17)
+ activesupport (= 3.2.17)
bundler (~> 1.0)
- railties (= 3.2.16)
+ railties (= 3.2.17)
rails3-generators (1.0.0)
railties (>= 3.0.0)
rails3-jquery-autocomplete (1.0.12)
rails (>= 3.0)
- railties (3.2.16)
- actionpack (= 3.2.16)
- activesupport (= 3.2.16)
+ railties (3.2.17)
+ actionpack (= 3.2.17)
+ activesupport (= 3.2.17)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@@ -517,7 +517,7 @@ DEPENDENCIES
pg (~> 0.14.0)
puma
rack-throttle
- rails (= 3.2.16)
+ rails (= 3.2.17)
rails3-generators
rails3-jquery-autocomplete (~> 1.0.7)
rake
View
6 app/controllers/projects/projects_controller.rb
@@ -98,7 +98,11 @@ def schedule
p_to_r.enabled = params[:enabled].present?
p_to_r.auto_publish = params[:auto_publish].present?
p_to_r.save
- render json: { notice: I18n.t('flash.project.saved') }.to_json
+ if p_to_r.save
+ render json: { notice: I18n.t('flash.project.saved') }.to_json
+ else
+ render json: { error: I18n.t('flash.project.save_error') }.to_json, status: 422
+ end
end
def destroy
View
28 app/views/pages/tos.html.haml
@@ -70,13 +70,22 @@
account is canceled. Any content committed by you to repositories of other platforms
will remain in place until owners of that platforms cancel their accounts.
%li
- ROSA, in its sole discretion, has the right to suspend or terminate your account
- and refuse any and all current or future use of the Service, or any other ROSA
- service, for any reason at any time. Such termination of the Service will result
- in the deactivation or deletion of your Account or your access
- to your Account, and the forfeiture and relinquishment of all Content in your
- Account. ROSA reserves the right to refuse service to anyone for any reason
- at any time.
+ ROSA has the right to suspend or terminate your account and refuse any and all current
+ or future use of the Service, or any other ROSA service, for one of the following reasons:
+ %ul
+ %li
+ your bandwidth or server CPU usage significantly exceeds the average bandwidth or
+ server CPU usage (as determined ABF administrators) of other ROSA customers.
+ %li
+ content uploaded by you to ROSA servers violates the laws of one of the countries where
+ the storage servers reside. Currently these countries include Russian Federation,
+ Switzerland and Germany. This list can be extended or changed in future;
+ if this is the case, we will notify ABF users in our blog in advance.
+ %li
+ you violate one of the statements from this Terms of Service.
+ If any of these events happens, ROSA representatives will temporary block your account,
+ remove forbidden content and contact you to discuss possible ways to resolve the problematic
+ situation. Once the solution is found, your account will be unblocked.
%a{name: 'Service_Modifications'}
%h2 III. Modifications to the Service and Conditions
@@ -160,11 +169,6 @@
%li
You must not transmit any worms or viruses or any code of a destructive nature.
%li
- If your bandwidth usage significantly exceeds the average bandwidth usage (as
- determined solely by ROSA) of other ROSA customers, we reserve the right to
- immediately disable your account or throttle your file hosting until you can
- reduce your bandwidth consumption.
- %li
ROSA does not warrant that (i) the service will meet your specific requirements,
(ii) the service will be uninterrupted, timely, secure, or error-free, (iii) the
results that may be obtained from the use of the service will be accurate or
View
14 spec/controllers/projects/projects_controller_spec.rb
@@ -31,6 +31,10 @@
put :update, {owner_name: @project.owner.uname, project_name: @project.name}.merge(@update_params)
response.should redirect_to(project_path(@project))
end
+ it 'should be able to perform schedule action' do
+ put :schedule, {owner_name: @project.owner.uname, project_name: @project.name}.merge(repository_id: @project.repositories.first.id)
+ response.should be_success
+ end
end
shared_examples_for 'user with destroy rights' do
@@ -52,6 +56,11 @@
response.should redirect_to(forbidden_path)
end
+ it 'should not be able to perform schedule action' do
+ put :schedule, {owner_name: @project.owner.uname, project_name: @project.name}.merge(repository_id: @project.repositories.first.id)
+ response.should redirect_to(forbidden_path)
+ end
+
it 'should not be able to edit project sections' do
has_wiki, has_issues = @project.has_wiki, @project.has_issues
post :sections, project:{has_wiki: !has_wiki, has_issues: !has_issues}, owner_name: @project.owner.uname, project_name: @project.name
@@ -119,6 +128,11 @@
response.should redirect_to(new_user_session_path)
end
+ it 'should not be able to perform schedule action' do
+ put :schedule, {owner_name: @project.owner.uname, project_name: @project.name}.merge(repository_id: @project.repositories.first.id)
+ response.should redirect_to(new_user_session_path)
+ end
+
it 'should not be able to perform create action' do
post :create, @create_params
response.should redirect_to(new_user_session_path)

No commit comments for this range

Something went wrong with that request. Please try again.