diff options
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | app/views/projects/wikis/_form.html.haml | 2 | ||||
| -rw-r--r-- | public/deploy.html | 7 | ||||
| -rw-r--r-- | public/robots.txt | 2 |
6 files changed, 12 insertions, 8 deletions
diff --git a/CHANGELOG b/CHANGELOG index a0f7c1654b9..1c5a004501a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.13.0 (unreleased) - Speed-up group milestones show page + - Fix robots.txt disallowing access to groups starting with "s" (Matt Harrison) v 8.12.2 (unreleased) - Fix Import/Export not recognising correctly the imported services. @@ -6,9 +6,7 @@ gem 'rails-deprecated_sanitizer', '~> 1.0.3' # Responders respond_to and respond_with gem 'responders', '~> 2.0' -# Specify a sprockets version due to increased performance -# See https://gitlab.com/gitlab-org/gitlab-ce/issues/6069 -gem 'sprockets', '~> 3.6.0' +gem 'sprockets', '~> 3.7.0' gem 'sprockets-es6' # Default values for AR models diff --git a/Gemfile.lock b/Gemfile.lock index 1db8c9dd8c8..396e692847b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -705,7 +705,7 @@ GEM spring (>= 0.9.1) spring-commands-teaspoon (0.0.2) spring (>= 0.9.1) - sprockets (3.6.3) + sprockets (3.7.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-es6 (0.9.0) @@ -964,7 +964,7 @@ DEPENDENCIES spring-commands-rspec (~> 1.0.4) spring-commands-spinach (~> 1.1.0) spring-commands-teaspoon (~> 0.0.2) - sprockets (~> 3.6.0) + sprockets (~> 3.7.0) sprockets-es6 state_machines-activerecord (~> 0.4.0) sys-filesystem (~> 1.1.6) diff --git a/app/views/projects/wikis/_form.html.haml b/app/views/projects/wikis/_form.html.haml index 643f7c589e6..6624d5cb427 100644 --- a/app/views/projects/wikis/_form.html.haml +++ b/app/views/projects/wikis/_form.html.haml @@ -24,7 +24,7 @@ = succeed '.' do More examples are in the - = link_to 'documentation', help_page_path("user/project/markdown", anchor: "wiki-specific-markdown") + = link_to 'documentation', help_page_path("user/markdown", anchor: "wiki-specific-markdown") .form-group = f.label :commit_message, class: 'control-label' diff --git a/public/deploy.html b/public/deploy.html index 142472b6c35..49ec4ac5ce1 100644 --- a/public/deploy.html +++ b/public/deploy.html @@ -2,6 +2,11 @@ <html> <head> <meta content="width=device-width, initial-scale=1, maximum-scale=1" name="viewport"> + <meta name="refresh" content="60"> + <meta name="retry-after" content="100"> + <meta name="robots" content="noindex, nofollow, noarchive, nostore"> + <meta name="cache-control" content="no-cache, no-store"> + <meta name="pragma" content="no-cache"> <title>Deploy in progress</title> <style> body { @@ -61,4 +66,4 @@ <p>Please contact your GitLab administrator if this problem persists.</p> </div> </body> -</html> +</html>
\ No newline at end of file diff --git a/public/robots.txt b/public/robots.txt index 334f4c03533..7d69fad59d1 100644 --- a/public/robots.txt +++ b/public/robots.txt @@ -23,7 +23,7 @@ Disallow: /groups/*/edit Disallow: /users # Global snippets -Disallow: /s +Disallow: /s/ Disallow: /snippets/new Disallow: /snippets/*/edit Disallow: /snippets/*/raw |