mirror of
https://github.com/git/git.git
synced 2026-01-09 17:46:37 +00:00
Merge branch 'jn/gitweb-blame'
* jn/gitweb-blame: gitweb: Add link to other blame implementation in blame views gitweb: Make linking to actions requiring JavaScript a feature gitweb.js: fix padLeftStr() and its usage gitweb.js: Harden setting blamed commit info in incremental blame gitweb.js: fix null object exception in initials calculation gitweb: Minify gitweb.js if JSMIN is defined gitweb: Create links leading to 'blame_incremental' using JavaScript gitweb: Colorize 'blame_incremental' view during processing gitweb: Incremental blame (using JavaScript) gitweb: Add optional "time to generate page" info in footer Conflicts: Makefile gitweb/gitweb.css
This commit is contained in:
@@ -394,8 +394,15 @@ gitweb_css () {
|
||||
EOFGITWEB
|
||||
}
|
||||
|
||||
gitweb_js () {
|
||||
cat > "$1" <<\EOFGITWEB
|
||||
@@GITWEB_JS@@
|
||||
EOFGITWEB
|
||||
}
|
||||
|
||||
gitweb_cgi "$GIT_DIR/gitweb/gitweb.cgi"
|
||||
gitweb_css "$GIT_DIR/gitweb/gitweb.css"
|
||||
gitweb_js "$GIT_DIR/gitweb/gitweb.js"
|
||||
|
||||
case "$httpd" in
|
||||
*lighttpd*)
|
||||
|
||||
Reference in New Issue
Block a user