diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-11-01 15:19:22 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-11-01 15:19:22 +0000 |
| commit | 6848c4f93c7727d6975632135a04c5633c1781f1 (patch) | |
| tree | 79de7b002747e9906e7563a81bba5a1f1979b679 /app/controllers/projects_controller.rb | |
| parent | ccd8cd283c4fade866542ea70caed770f675940c (diff) | |
| parent | d3a407d66fa553f3ff8afd1b9e42f01b9912e14a (diff) | |
| download | gitlab-ce-gl-ui-tooltip.tar.gz | |
Merge branch 'master' into 'gl-ui-tooltip'gl-ui-tooltip
# Conflicts:
# app/assets/javascripts/commons/gitlab_ui.js
Diffstat (limited to 'app/controllers/projects_controller.rb')
| -rw-r--r-- | app/controllers/projects_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index ee438e160f2..7f4a9f5151b 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -276,7 +276,7 @@ class ProjectsController < Projects::ApplicationController # rubocop: enable CodeReuse/ActiveRecord # Render project landing depending of which features are available - # So if page is not availble in the list it renders the next page + # So if page is not available in the list it renders the next page # # pages list order: repository readme, wiki home, issues list, customize workflow def render_landing_page |