diff options
| author | Simon Brandhof <simon.brandhof@gmail.com> | 2011-08-15 15:50:26 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@gmail.com> | 2011-08-15 15:50:26 +0200 |
| commit | 5355a78c8ef7d96661bc3ef64c03e908df934799 (patch) | |
| tree | 55ec389505b38a0276c2d3666371900d014bfc95 /sonar-server | |
| parent | 911ba2f2c7aeabc2dc7c840f3f797dd6f1fb4d64 (diff) | |
| parent | 9ca86cd73f8807401910cf8610b7b37bfb528b10 (diff) | |
| download | sonarqube-5355a78c8ef7d96661bc3ef64c03e908df934799.tar.gz sonarqube-5355a78c8ef7d96661bc3ef64c03e908df934799.zip | |
Merge branch 'release-2.10'
Diffstat (limited to 'sonar-server')
| -rw-r--r-- | sonar-server/pom.xml | 2 | ||||
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sonar-server/pom.xml b/sonar-server/pom.xml index ef0b4b3ffd7..88a1bb5c25e 100644 --- a/sonar-server/pom.xml +++ b/sonar-server/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.codehaus.sonar</groupId> <artifactId>sonar</artifactId> - <version>2.11-SNAPSHOT</version> + <version>2.10-SNAPSHOT</version> </parent> <artifactId>sonar-server</artifactId> <packaging>war</packaging> diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb index e8364f9b06b..871641fa03a 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb @@ -80,13 +80,13 @@ <li class="h2"><%= message('sidebar.system') -%></li> <li class="<%= 'selected' if request.request_uri.include?('/settings') -%>"><a href="<%= ApplicationController.root_context -%>/settings/index"><%= message('settings.page') -%></a></li> + <li class="<%= 'selected' if controller.controller_path=='email_configuration' -%>"><a href="<%= ApplicationController.root_context -%>/email_configuration"><%= message('email_configuration.page') -%></a></li> <li class="<%= 'selected' if controller.controller_path=='backup' -%>"><a href="<%= ApplicationController.root_context -%>/backup"><%= message('backup.page') -%></a></li> <li class="<%= 'selected' if controller.controller_path=='system' -%>"><a href="<%= ApplicationController.root_context -%>/system"><%= message('system_info.page') -%></a></li> <% update_center_activated = controller.java_facade.getConfigurationValue('sonar.updatecenter.activate') || 'true'; if update_center_activated=='true' %> <li class="<%= 'selected' if controller.controller_path=='updatecenter' -%>"><a href="<%= ApplicationController.root_context -%>/updatecenter"><%= message('update_center.page') -%></a></li> <% end %> - <li class="<%= 'selected' if controller.controller_path=='email_configuration' -%>"><a href="<%= ApplicationController.root_context -%>/email_configuration"><%= message('email_configuration.page') -%></a></li> <% end %> <% end %> |