Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nay bugfix #153

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Nay bugfix #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
987b2fb
Two bugs fixed.
Feb 11, 2012
8ab923a
Two bugs fixed.
Feb 11, 2012
d36dd8b
README file has been updated.
Feb 13, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.mkd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ owner of these files to www-data and the permissions to 600 for the private key
root directory:

cd vendor/plugins
git clone https://github.com/ericpaulbishop/redmine_git_hosting.git
git clone https://Devoter@github.com/Devoter/redmine_git_hosting.git
rm -rf redmine_git_hosting/.git
cd ../..

Expand Down
1 change: 1 addition & 0 deletions app/controllers/gitolite_public_keys_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ def edit
def delete
@gitolite_public_key[:active] = 0
@gitolite_public_key.save
@gitolite_public_key.destroy
redirect_to url_for(:controller => 'my', :action => 'account')
end

Expand Down
2 changes: 1 addition & 1 deletion lib/git_hosting.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ def self.update_repositories(projects, is_repo_delete)
users.map{|u| u.gitolite_public_keys.active}.flatten.compact.uniq.each do |key|
filename = File.join(local_dir, 'gitolite-admin/keydir',"#{key.identifier}.pub")
unless File.exists? filename
File.open(filename, 'w') {|f| f.write(key.key.gsub(/\n/,'')) }
File.open(filename, 'w') {|f| f.write(key.key.gsub(/\r\n/,"\n")) }
changed = true
end
end
Expand Down