summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngus MacArthur <amacarthur@blackberry.com>2013-05-02 16:27:40 -0400
committerAngus MacArthur <amacarthur@blackberry.com>2013-05-02 16:41:33 -0400
commitec63804831d1a55171abfb7fc0894af20d4298e8 (patch)
tree70b763f549274e1a5fb5fc87667e7327a90c3633
parentde8df1be1a75cfde02a5a1d3f52a888b770c54e0 (diff)
downloadgitlab-ce-ec63804831d1a55171abfb7fc0894af20d4298e8.tar.gz
Made fixes suggested by @randx in pull request
See https://github.com/gitlabhq/gitlabhq/pull/3597#discussion-diff-4014638
-rw-r--r--app/models/ability.rb7
-rw-r--r--db/migrate/20130319214458_create_forked_project_links.rb6
2 files changed, 7 insertions, 6 deletions
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 0c5fbc2e5e7..eb7f89dcfc1 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -60,15 +60,16 @@ class Ability
:read_note,
:write_project,
:write_issue,
- :write_note,
- :fork_project
+ :write_note
]
end
def project_report_rules
project_guest_rules + [
:download_code,
- :write_snippet
+ :write_snippet,
+ :fork_project
+
]
end
diff --git a/db/migrate/20130319214458_create_forked_project_links.rb b/db/migrate/20130319214458_create_forked_project_links.rb
index 55aad12093e..f91afc26e77 100644
--- a/db/migrate/20130319214458_create_forked_project_links.rb
+++ b/db/migrate/20130319214458_create_forked_project_links.rb
@@ -1,11 +1,11 @@
class CreateForkedProjectLinks < ActiveRecord::Migration
def change
create_table :forked_project_links do |t|
- t.integer :forked_to_project_id, :null => false
- t.integer :forked_from_project_id, :null => false
+ t.integer :forked_to_project_id, null: false
+ t.integer :forked_from_project_id, null: false
t.timestamps
end
- add_index :forked_project_links, :forked_to_project_id, :unique => true
+ add_index :forked_project_links, :forked_to_project_id, unique: true
end
end