Skip to content

Commit

Permalink
Merge branch 'main' into segiddins/add-compact-index-support-for-priv…
Browse files Browse the repository at this point in the history
…ate-sources
  • Loading branch information
segiddins authored Nov 19, 2024
2 parents 6bf4489 + 93a8a01 commit fb19685
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 8 deletions.
5 changes: 0 additions & 5 deletions .rubocop-bundler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,6 @@ Lint/AssignmentInCondition:
Lint/UnusedMethodArgument:
Enabled: false

Lint/UriEscapeUnescape:
Enabled: true

# Style

Layout/EndAlignment:
EnforcedStyleAlignWith: variable

Expand Down
2 changes: 1 addition & 1 deletion docs/gemstash-private-gems.7.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

Stashing private gems in your Gemstash server requires a bit of
additional setup. If you haven’t read through the [Quickstart
Guide](../README.md#quickstart-guide), you should do that first. By the
Guide](../readme.md#quickstart-guide), you should do that first. By the
end of this guide, you will be able to interact with your Gemstash
server to store and retrieve your private gems.

Expand Down
2 changes: 1 addition & 1 deletion lib/gemstash/env.rb
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ def db
db = if RUBY_PLATFORM == "java"
Sequel.connect("jdbc:sqlite:#{db_path}", config.database_connection_config)
else
Sequel.connect("sqlite://#{CGI.escape(db_path)}", config.database_connection_config)
Sequel.connect("sqlite://#{db_path}", config.database_connection_config)
end
raise "SQLite 3.44+ required, have #{db.sqlite_version}" unless db.sqlite_version >= 34_400
when "postgres", "mysql", "mysql2"
Expand Down
3 changes: 2 additions & 1 deletion rakelib/doc.rake
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@ class Doc
content = ::File.read(to_file)
content.gsub!("](./", "](docs/")
content.gsub!(/\A---(.|\n)*?---/, "")
::File.write to_file, "<!-- Automatically generated by Pandoc -->\n#{content}"
prefix = format == "man" ? "" : "<!-- Automatically generated by Pandoc -->\n"
::File.write to_file, "#{prefix}#{content}"
end

def export_path(dir, filename)
Expand Down

0 comments on commit fb19685

Please sign in to comment.