diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-01-11 12:35:15 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-01-15 02:59:30 +0300 |
| commit | 21fdf71a2e78ba3a3c7bd69e90c371ae895e7749 (patch) | |
| tree | b6df1cf3976b887d0c75ab52dc38a835a69f4ee3 /app | |
| parent | ccd6d3d38a2d0711f6587bad7da143061196d15a (diff) | |
Merge branch 'remove-releases_page-feature-flag' into 'master'
Remove `releases_page` feature flag
Closes #56072
See merge request gitlab-org/gitlab-ce!24215
(cherry picked from commit b682a6f8981d303e7ee7ecc4273768ee6ed66864)
9b823af4 Remove releases_page feature flag
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/projects/releases_controller.rb | 9 | ||||
| -rw-r--r-- | app/views/layouts/nav/sidebar/_project.html.haml | 2 |
2 files changed, 1 insertions, 10 deletions
diff --git a/app/controllers/projects/releases_controller.rb b/app/controllers/projects/releases_controller.rb index 62bdc84b41a..4c39ee4045f 100644 --- a/app/controllers/projects/releases_controller.rb +++ b/app/controllers/projects/releases_controller.rb @@ -4,16 +4,7 @@ class Projects::ReleasesController < Projects::ApplicationController # Authorize before_action :require_non_empty_project before_action :authorize_read_release! - before_action :check_releases_page_feature_flag def index end - - private - - def check_releases_page_feature_flag - return render_404 unless Feature.enabled?(:releases_page, @project) - - push_frontend_feature_flag(:releases_page, @project) - end end diff --git a/app/views/layouts/nav/sidebar/_project.html.haml b/app/views/layouts/nav/sidebar/_project.html.haml index e516c76400a..c8fdc0112b4 100644 --- a/app/views/layouts/nav/sidebar/_project.html.haml +++ b/app/views/layouts/nav/sidebar/_project.html.haml @@ -29,7 +29,7 @@ = link_to activity_project_path(@project), title: _('Activity'), class: 'shortcuts-project-activity' do %span= _('Activity') - - if project_nav_tab?(:releases) && Feature.enabled?(:releases_page, @project) + - if project_nav_tab?(:releases) = nav_link(controller: :releases) do = link_to project_releases_path(@project), title: _('Releases'), class: 'shortcuts-project-releases' do %span= _('Releases') |