Merge branch 'revert-add-whats-new' into 'master'
Revert the "What's new" feature See merge request gitlab-org/gitlab-ce!24772
This commit is contained in:
commit
fc16bebb67
|
@ -1,7 +0,0 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
module ReleaseBlogPostHelper
|
||||
def blog_post_url
|
||||
Gitlab::ReleaseBlogPost.instance.blog_post_url
|
||||
end
|
||||
end
|
|
@ -1,12 +1,8 @@
|
|||
- show_blog_link = current_user_menu?(:help) && blog_post_url.present?
|
||||
%ul
|
||||
- if current_user_menu?(:help)
|
||||
%li
|
||||
= link_to _("Help"), help_path
|
||||
%li.divider
|
||||
- if show_blog_link
|
||||
%li
|
||||
= link_to _("What's new?"), blog_post_url
|
||||
%li
|
||||
= link_to _("Submit feedback"), "https://about.gitlab.com/submit-feedback"
|
||||
- if current_user_menu?(:help) || current_user_menu?(:settings) || current_user_menu?(:profile)
|
||||
|
|
|
@ -1,5 +0,0 @@
|
|||
---
|
||||
title: Resolve Add What's new menu item in top navigation
|
||||
merge_request: 23186
|
||||
author:
|
||||
type: added
|
|
@ -7,6 +7,14 @@ module Gitlab
|
|||
Pathname.new(File.expand_path('..', __dir__))
|
||||
end
|
||||
|
||||
def self.version_info
|
||||
Gitlab::VersionInfo.parse(Gitlab::VERSION)
|
||||
end
|
||||
|
||||
def self.pre_release?
|
||||
VERSION.include?('pre')
|
||||
end
|
||||
|
||||
def self.config
|
||||
Settings
|
||||
end
|
||||
|
@ -27,52 +35,12 @@ module Gitlab
|
|||
end
|
||||
end
|
||||
|
||||
def self.version_info
|
||||
Gitlab::VersionInfo.parse(Gitlab::VERSION)
|
||||
end
|
||||
|
||||
COM_URL = 'https://gitlab.com'.freeze
|
||||
APP_DIRS_PATTERN = %r{^/?(app|config|ee|lib|spec|\(\w*\))}
|
||||
SUBDOMAIN_REGEX = %r{\Ahttps://[a-z0-9]+\.gitlab\.com\z}
|
||||
VERSION = File.read(root.join("VERSION")).strip.freeze
|
||||
INSTALLATION_TYPE = File.read(root.join("INSTALLATION_TYPE")).strip.freeze
|
||||
|
||||
def self.pre_release?
|
||||
VERSION.include?('pre')
|
||||
end
|
||||
|
||||
def self.final_release?
|
||||
!VERSION.include?('rc') && !pre_release?
|
||||
end
|
||||
|
||||
def self.minor_release
|
||||
"#{version_info.major}.#{version_info.minor}"
|
||||
end
|
||||
|
||||
def self.prev_minor_release
|
||||
"#{version_info.major}.#{version_info.minor - 1}"
|
||||
end
|
||||
|
||||
def self.prev_major_release
|
||||
"#{version_info.major.to_i - 1}"
|
||||
end
|
||||
|
||||
def self.new_major_release?
|
||||
version_info.minor.to_i.zero?
|
||||
end
|
||||
|
||||
def self.previous_release
|
||||
if version_info.minor_version?
|
||||
if version_info.patch_version?
|
||||
minor_release
|
||||
else
|
||||
prev_minor_release
|
||||
end
|
||||
else
|
||||
prev_major_release
|
||||
end
|
||||
end
|
||||
|
||||
def self.com?
|
||||
# Check `gl_subdomain?` as well to keep parity with gitlab.com
|
||||
Gitlab.config.gitlab.url == COM_URL || gl_subdomain?
|
||||
|
|
|
@ -1,40 +0,0 @@
|
|||
# frozen_string_literal: true
|
||||
require 'singleton'
|
||||
|
||||
module Gitlab
|
||||
class ReleaseBlogPost
|
||||
include Singleton
|
||||
|
||||
RELEASE_RSS_URL = 'https://about.gitlab.com/releases.xml'
|
||||
|
||||
def blog_post_url
|
||||
@url ||= fetch_blog_post_url
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def fetch_blog_post_url
|
||||
installed_version = Gitlab.final_release? ? Gitlab.minor_release : Gitlab.previous_release
|
||||
response = Gitlab::HTTP.get(RELEASE_RSS_URL, verify: false)
|
||||
|
||||
return unless response.code == 200
|
||||
|
||||
blog_entry = find_installed_blog_entry(response, installed_version)
|
||||
blog_entry['id'] if blog_entry
|
||||
end
|
||||
|
||||
def find_installed_blog_entry(response, installed_version)
|
||||
response['feed']['entry'].find do |entry|
|
||||
entry['release'] == installed_version || matches_previous_release_post(entry['release'], installed_version)
|
||||
end
|
||||
end
|
||||
|
||||
def should_match_previous_release_post?
|
||||
Gitlab.new_major_release? && !Gitlab.final_release?
|
||||
end
|
||||
|
||||
def matches_previous_release_post(rss_release_version, installed_version)
|
||||
should_match_previous_release_post? && rss_release_version[/\d+/] == installed_version
|
||||
end
|
||||
end
|
||||
end
|
|
@ -20,14 +20,6 @@ module Gitlab
|
|||
@patch = patch
|
||||
end
|
||||
|
||||
def minor_version?
|
||||
minor.to_i > 0
|
||||
end
|
||||
|
||||
def patch_version?
|
||||
patch.to_i > 0
|
||||
end
|
||||
|
||||
def <=>(other)
|
||||
return unless other.is_a? VersionInfo
|
||||
return unless valid? && other.valid?
|
||||
|
|
|
@ -7953,9 +7953,6 @@ msgstr ""
|
|||
msgid "Web terminal"
|
||||
msgstr ""
|
||||
|
||||
msgid "What's new?"
|
||||
msgstr ""
|
||||
|
||||
msgid "When a runner is locked, it cannot be assigned to other projects"
|
||||
msgstr ""
|
||||
|
||||
|
|
|
@ -5,14 +5,6 @@ RSpec.describe 'Dashboard Help' do
|
|||
sign_in(create(:user))
|
||||
end
|
||||
|
||||
context 'help dropdown' do
|
||||
it 'shows the "What\'s new?" menu item' do
|
||||
visit root_dashboard_path
|
||||
|
||||
expect(page.find('.header-help .dropdown-menu')).to have_text("What's new?")
|
||||
end
|
||||
end
|
||||
|
||||
context 'documentation' do
|
||||
it 'renders correctly markdown' do
|
||||
visit help_page_path("administration/raketasks/maintenance")
|
||||
|
|
|
@ -1,97 +0,0 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe Gitlab::ReleaseBlogPost do
|
||||
describe '.blog_post_url' do
|
||||
let(:releases_xml) do
|
||||
<<~EOS
|
||||
<?xml version='1.0' encoding='utf-8' ?>
|
||||
<feed xmlns='http://www.w3.org/2005/Atom'>
|
||||
<entry>
|
||||
<release>11.2</release>
|
||||
<id>https://about.gitlab.com/2018/08/22/gitlab-11-2-released/</id>
|
||||
</entry>
|
||||
<entry>
|
||||
<release>11.1</release>
|
||||
<id>https://about.gitlab.com/2018/07/22/gitlab-11-1-released/</id>
|
||||
</entry>
|
||||
<entry>
|
||||
<release>11.0</release>
|
||||
<id>https://about.gitlab.com/2018/06/22/gitlab-11-0-released/</id>
|
||||
</entry>
|
||||
<entry>
|
||||
<release>10.8</release>
|
||||
<id>https://about.gitlab.com/2018/05/22/gitlab-10-8-released/</id>
|
||||
</entry>
|
||||
</feed>
|
||||
EOS
|
||||
end
|
||||
|
||||
subject { described_class.send(:new).blog_post_url }
|
||||
|
||||
before do
|
||||
stub_request(:get, 'https://about.gitlab.com/releases.xml')
|
||||
.to_return(status: 200, headers: { 'content-type' => ['text/xml'] }, body: releases_xml)
|
||||
end
|
||||
|
||||
context 'matches GitLab version to blog post url' do
|
||||
it 'returns the correct url for major pre release' do
|
||||
stub_const('Gitlab::VERSION', '11.0.0-pre')
|
||||
|
||||
expect(subject).to eql('https://about.gitlab.com/2018/05/22/gitlab-10-8-released/')
|
||||
end
|
||||
|
||||
it 'returns the correct url for major release candidate' do
|
||||
stub_const('Gitlab::VERSION', '11.0.0-rc3')
|
||||
|
||||
expect(subject).to eql('https://about.gitlab.com/2018/05/22/gitlab-10-8-released/')
|
||||
end
|
||||
|
||||
it 'returns the correct url for major release' do
|
||||
stub_const('Gitlab::VERSION', '11.0.0')
|
||||
|
||||
expect(subject).to eql('https://about.gitlab.com/2018/06/22/gitlab-11-0-released/')
|
||||
end
|
||||
|
||||
it 'returns the correct url for minor pre release' do
|
||||
stub_const('Gitlab::VERSION', '11.2.0-pre')
|
||||
|
||||
expect(subject).to eql('https://about.gitlab.com/2018/07/22/gitlab-11-1-released/')
|
||||
end
|
||||
|
||||
it 'returns the correct url for minor release candidate' do
|
||||
stub_const('Gitlab::VERSION', '11.2.0-rc3')
|
||||
|
||||
expect(subject).to eql('https://about.gitlab.com/2018/07/22/gitlab-11-1-released/')
|
||||
end
|
||||
|
||||
it 'returns the correct url for minor release' do
|
||||
stub_const('Gitlab::VERSION', '11.2.0')
|
||||
|
||||
expect(subject).to eql('https://about.gitlab.com/2018/08/22/gitlab-11-2-released/')
|
||||
end
|
||||
|
||||
it 'returns the correct url for patch pre release' do
|
||||
stub_const('Gitlab::VERSION', '11.2.1-pre')
|
||||
expect(subject).to eql('https://about.gitlab.com/2018/08/22/gitlab-11-2-released/')
|
||||
end
|
||||
|
||||
it 'returns the correct url for patch release candidate' do
|
||||
stub_const('Gitlab::VERSION', '11.2.1-rc3')
|
||||
|
||||
expect(subject).to eql('https://about.gitlab.com/2018/08/22/gitlab-11-2-released/')
|
||||
end
|
||||
|
||||
it 'returns the correct url for patch release' do
|
||||
stub_const('Gitlab::VERSION', '11.2.1')
|
||||
|
||||
expect(subject).to eql('https://about.gitlab.com/2018/08/22/gitlab-11-2-released/')
|
||||
end
|
||||
|
||||
it 'returns nil when no blog post is matched' do
|
||||
stub_const('Gitlab::VERSION', '9.0.0')
|
||||
|
||||
expect(subject).to be(nil)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
|
@ -70,82 +70,6 @@ describe Gitlab do
|
|||
end
|
||||
end
|
||||
|
||||
describe '.final_release?' do
|
||||
subject { described_class.final_release? }
|
||||
|
||||
context 'returns the corrent boolean value' do
|
||||
it 'is false for a pre release' do
|
||||
stub_const('Gitlab::VERSION', '11.0.0-pre')
|
||||
|
||||
expect(subject).to be false
|
||||
end
|
||||
|
||||
it 'is false for a release candidate' do
|
||||
stub_const('Gitlab::VERSION', '11.0.0-rc2')
|
||||
|
||||
expect(subject).to be false
|
||||
end
|
||||
|
||||
it 'is true for a final release' do
|
||||
stub_const('Gitlab::VERSION', '11.0.2')
|
||||
|
||||
expect(subject).to be true
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe '.minor_release' do
|
||||
subject { described_class.minor_release }
|
||||
|
||||
it 'returns the minor release of the full GitLab version' do
|
||||
stub_const('Gitlab::VERSION', '11.0.1-rc3')
|
||||
|
||||
expect(subject).to eql '11.0'
|
||||
end
|
||||
end
|
||||
|
||||
describe '.previous_release' do
|
||||
subject { described_class.previous_release }
|
||||
|
||||
context 'it should return the previous release' do
|
||||
it 'returns the previous major version when GitLab major version is not final' do
|
||||
stub_const('Gitlab::VERSION', '11.0.1-pre')
|
||||
|
||||
expect(subject).to eql '10'
|
||||
end
|
||||
|
||||
it 'returns the current minor version when the GitLab patch version is RC and > 0' do
|
||||
stub_const('Gitlab::VERSION', '11.2.1-rc3')
|
||||
|
||||
expect(subject).to eql '11.2'
|
||||
end
|
||||
|
||||
it 'returns the previous minor version when the GitLab patch version is RC and 0' do
|
||||
stub_const('Gitlab::VERSION', '11.2.0-rc3')
|
||||
|
||||
expect(subject).to eql '11.1'
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe '.new_major_release?' do
|
||||
subject { described_class.new_major_release? }
|
||||
|
||||
context 'returns the corrent boolean value' do
|
||||
it 'is true when the minor version is 0 and the patch is a pre release' do
|
||||
stub_const('Gitlab::VERSION', '11.0.1-pre')
|
||||
|
||||
expect(subject).to be true
|
||||
end
|
||||
|
||||
it 'is false when the minor version is above 0' do
|
||||
stub_const('Gitlab::VERSION', '11.2.1-rc3')
|
||||
|
||||
expect(subject).to be false
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe '.com?' do
|
||||
it 'is true when on GitLab.com' do
|
||||
stub_config_setting(url: 'https://gitlab.com')
|
||||
|
|
|
@ -127,11 +127,6 @@ RSpec.configure do |config|
|
|||
.and_return(false)
|
||||
end
|
||||
|
||||
config.before(:suite) do
|
||||
# Set latest release blog post URL for "What's new?" link
|
||||
Gitlab::ReleaseBlogPost.instance.instance_variable_set(:@url, 'https://about.gitlab.com')
|
||||
end
|
||||
|
||||
config.before(:example, :quarantine) do
|
||||
# Skip tests in quarantine unless we explicitly focus on them.
|
||||
skip('In quarantine') unless config.inclusion_filter[:quarantine]
|
||||
|
|
Loading…
Reference in New Issue