Skip to content
Snippets Groups Projects
Commit e66e2ff6 authored by Lauren Barker's avatar Lauren Barker Committed by Rémy Coutable
Browse files

Revert "Merge branch 'bojan/update-ruby' into 'master'"

parent 2e90bbc4
No related branches found
No related tags found
1 merge request!137992Revert "Merge branch 'bojan/update-ruby' into 'master'"
......@@ -117,8 +117,8 @@ variables:
# Performs an error check after each Bash script command is executed, and exits if the previously executed command returned a non-zero exit code
# https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/2671
FF_ENABLE_BASH_EXIT_CODE_CHECK: "true"
DEBIAN_VERSION: "bookworm"
RUBY_VERSION: "3.2.6"
DEBIAN_VERSION: "bullseye"
RUBY_VERSION: "3.0.6"
NODE_VERSION: "20"
 
### RULES REUSED VIA YAML ANCHORS:
......
3.2.6
3.0.6
......@@ -4,5 +4,5 @@
gitleaks 8.16.4
nodejs 20.15.0
python 3.9.12
ruby 3.2.6
ruby 3.0.6
yarn 1.22.19
......@@ -11,13 +11,13 @@ gem 'wdm', '~> 0.1.0', platforms: %i[mswin mingw x64_mingw]
gem 'tzinfo-data', platforms: %i[mswin mingw x64_mingw jruby]
 
# Middleman Gems
gem 'middleman', '~> 4.5.1'
gem 'middleman-blog', '~> 4.0.3'
gem 'middleman-livereload', '~> 3.4.7'
gem 'middleman', '~> 4.4'
gem 'middleman-blog', '~> 4.0'
gem 'middleman-livereload', '~> 3.4.6'
gem 'middleman-minify-html', '~> 3.4.1'
gem 'middleman-autoprefixer', '~> 3.0.0'
gem 'middleman-syntax', '~> 3.4.0'
gem "middleman-inline_svg", '~> 0.1.2'
gem 'middleman-autoprefixer'
gem 'middleman-syntax', '~> 3.0.0'
gem "middleman-inline_svg"
 
gem 'asciidoctor-plantuml', '0.0.9'
gem 'kramdown', '>= 2.3.1'
......@@ -41,7 +41,7 @@ gem 'faraday_middleware-parse_oj', '~> 0.3'
 
# Gitlab API access
gem 'gitlab', '~> 4.18.0'
gem 'graphql-client', '~> 0.25'
gem 'graphql-client', '~> 0.16'
 
# Greenhouse API
gem 'greenhouse_io-gitlab', '~> 2.5.6'
......@@ -73,5 +73,5 @@ group :development, :test do
gem 'pry-byebug', '~> 3.9.0'
gem 'timecop', '~> 0.9.4'
gem 'lefthook', '~> 1.2.4', require: false
gem 'gitlab-dangerfiles', '~> 4.8.1'
gem 'gitlab-dangerfiles', '~> 4.8.0'
end
......@@ -16,7 +16,6 @@ GEM
autoprefixer-rails (10.4.7.0)
execjs (~> 2)
backports (3.21.0)
base64 (0.2.0)
bigdecimal (3.1.7)
builder (3.2.3)
byebug (11.1.3)
......@@ -42,8 +41,7 @@ GEM
unicode_utils (~> 1.4)
crack (0.4.3)
safe_yaml (~> 1.0.0)
danger (9.5.1)
base64 (~> 0.2)
danger (9.4.3)
claide (~> 1.0)
claide-plugins (>= 0.9.2)
colored2 (~> 3.1)
......@@ -53,8 +51,8 @@ GEM
git (~> 1.13)
kramdown (~> 2.3)
kramdown-parser-gfm (~> 1.0)
no_proxy_fix
octokit (>= 4.0)
pstore (~> 0.1)
terminal-table (>= 1, < 4)
danger-gitlab (8.0.0)
danger
......@@ -63,9 +61,9 @@ GEM
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
dotenv (2.7.6)
em-websocket (0.5.3)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
http_parser.rb (~> 0.6.0)
erubis (2.7.0)
ethon (0.12.0)
ffi (>= 1.3.0)
......@@ -84,28 +82,24 @@ GEM
fast_blank (1.0.1)
fastimage (2.2.5)
ffi (1.15.4)
fiber-storage (1.0.0)
git (1.19.1)
addressable (~> 2.8)
rchardet (~> 1.8)
gitlab (4.18.0)
httparty (~> 0.18)
terminal-table (>= 1.5.1)
gitlab-dangerfiles (4.8.1)
gitlab-dangerfiles (4.8.0)
danger (>= 9.3.0)
danger-gitlab (>= 8.0.0)
rake (~> 13.0)
graphql (2.4.8)
base64
fiber-storage
graphql-client (0.25.0)
graphql (1.10.8)
graphql-client (0.16.0)
activesupport (>= 3.0)
graphql (>= 1.13.0)
graphql (~> 1.8)
greenhouse_io-gitlab (2.5.6)
rest-client (~> 2.0)
haml (6.3.0)
temple (>= 0.8.2)
thor
haml (5.2.2)
temple (>= 0.8.0)
tilt
hamster (3.0.0)
concurrent-ruby (~> 1.0)
......@@ -124,7 +118,7 @@ GEM
http-accept (1.7.0)
http-cookie (1.0.3)
domain_name (~> 0.5)
http_parser.rb (0.8.0)
http_parser.rb (0.6.0)
httparty (0.20.0)
mime-types (~> 3.0)
multi_xml (>= 0.5.2)
......@@ -156,12 +150,12 @@ GEM
memoist (0.16.2)
mercenary (0.3.6)
method_source (1.0.0)
middleman (4.5.1)
middleman (4.4.2)
coffee-script (~> 2.2)
haml (>= 4.0.5)
kramdown (>= 2.3.0)
middleman-cli (= 4.5.1)
middleman-core (= 4.5.1)
middleman-cli (= 4.4.2)
middleman-core (= 4.4.2)
middleman-autoprefixer (3.0.0)
autoprefixer-rails (~> 10.0)
middleman-core (>= 4.0.0)
......@@ -169,14 +163,14 @@ GEM
addressable (~> 2.3)
middleman-core (>= 4.0.0)
tzinfo (>= 0.3.0)
middleman-cli (4.5.1)
thor (>= 0.17.0, < 1.3.0)
middleman-core (4.5.1)
activesupport (>= 6.1, < 7.1)
middleman-cli (4.4.2)
thor (>= 0.17.0, < 2.0)
middleman-core (4.4.2)
activesupport (>= 6.1, < 7.0)
addressable (~> 2.4)
backports (~> 3.6)
bundler (~> 2.0)
contracts (~> 0.13, < 0.17)
contracts (~> 0.13.0)
dotenv
erubis
execjs (~> 2.0)
......@@ -185,7 +179,7 @@ GEM
hamster (~> 3.0)
hashie (~> 3.4)
i18n (~> 1.6.0)
listen (~> 3.0)
listen (~> 3.0.0)
memoist (~> 0.14)
padrino-helpers (~> 0.15.0)
parallel
......@@ -199,20 +193,19 @@ GEM
middleman-inline_svg (0.1.2)
middleman-core (>= 3.4.1)
nokogiri (>= 1.8)
middleman-livereload (3.4.7)
middleman-livereload (3.4.6)
em-websocket (~> 0.5.1)
middleman-core (>= 3.3)
rack-livereload (~> 0.3.15)
middleman-minify-html (3.4.1)
htmlcompressor (~> 0.2.0)
middleman-core (>= 3.2)
middleman-syntax (3.4.0)
middleman-syntax (3.0.0)
middleman-core (>= 3.2)
rouge (~> 3.2)
rouge (~> 2.0)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2021.0225)
mini_portile2 (2.8.8)
minitest (5.14.4)
mixlib-cli (2.1.8)
mixlib-config (3.0.9)
......@@ -221,8 +214,8 @@ GEM
multipart-post (2.0.0)
nap (1.1.0)
netrc (0.11.0)
no_proxy_fix (0.1.2)
nokogiri (1.16.6)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
octokit (4.22.0)
faraday (>= 0.9)
......@@ -247,7 +240,6 @@ GEM
pry-byebug (3.9.0)
byebug (~> 11.0)
pry (~> 0.13.0)
pstore (0.1.4)
public_suffix (4.0.6)
racc (1.6.0)
rack (2.2.4)
......@@ -258,7 +250,7 @@ GEM
rb-fsevent (0.11.0)
rb-inotify (0.10.1)
ffi (~> 1.0)
rchardet (1.9.0)
rchardet (1.8.0)
regexp_parser (2.9.2)
rest-client (2.1.0)
http-accept (>= 1.7.0, < 2.0)
......@@ -266,7 +258,7 @@ GEM
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rexml (3.2.5)
rouge (3.30.0)
rouge (2.2.1)
rspec (3.8.0)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
......@@ -308,10 +300,10 @@ GEM
sixarm_ruby_unaccent (1.2.0)
stringex (2.8.5)
styled_yaml (0.0.1)
temple (0.10.3)
temple (0.8.2)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
thor (1.2.2)
thor (1.1.0)
tilt (2.0.10)
timecop (0.9.4)
toml (0.3.0)
......@@ -349,8 +341,8 @@ DEPENDENCIES
faraday_middleware (~> 0.14.0)
faraday_middleware-parse_oj (~> 0.3)
gitlab (~> 4.18.0)
gitlab-dangerfiles (~> 4.8.1)
graphql-client (~> 0.25)
gitlab-dangerfiles (~> 4.8.0)
graphql-client (~> 0.16)
greenhouse_io-gitlab (~> 2.5.6)
html-proofer (~> 3.12.2)
json_schemer
......@@ -358,13 +350,13 @@ DEPENDENCIES
lefthook (~> 1.2.4)
linter
mdl (~> 0.7.0)
middleman (~> 4.5.1)
middleman-autoprefixer (~> 3.0.0)
middleman-blog (~> 4.0.3)
middleman-inline_svg (~> 0.1.2)
middleman-livereload (~> 3.4.7)
middleman (~> 4.4)
middleman-autoprefixer
middleman-blog (~> 4.0)
middleman-inline_svg
middleman-livereload (~> 3.4.6)
middleman-minify-html (~> 3.4.1)
middleman-syntax (~> 3.4.0)
middleman-syntax (~> 3.0.0)
nokogiri (>= 1.13.8)
openssl (~> 3.2.0)
pry-byebug (~> 3.9.0)
......
require 'yaml'
require 'date'
 
module Categories
class CategoriesYmlLinkChecker
......@@ -49,7 +48,7 @@ module Categories
 
def load_categories_yml(categories_yml_path)
categories_yml_path ||= File.expand_path('../../data/categories.yml', __dir__)
categories = YAML.safe_load_file(categories_yml_path, permitted_classes: [Date])
categories = YAML.load_file(categories_yml_path)
categories
end
 
......
require 'yaml'
require 'date'
 
module Gitlab
module Homepage
......@@ -117,7 +116,7 @@ module Gitlab
end
 
def self.all!
@categories ||= YAML.safe_load_file(File.expand_path('../data/categories.yml', __dir__), permitted_classes: [Date])
@categories ||= YAML.load_file(File.expand_path('../data/categories.yml', __dir__))
@categories.map do |key, data|
new(key, data)
end
......
# frozen_literal: true
 
require 'yaml'
require 'date'
require 'set'
require 'json_schemer'
 
......@@ -22,7 +21,7 @@ module Lint
end
 
def lint_yaml(yaml_path)
lint(YAML.safe_load_file(yaml_path, permitted_classes: [Date]))
lint(YAML.load_file(yaml_path, permitted_classes: [Date]))
end
 
private
......
require 'yaml'
require 'date'
require 'pathname'
 
require_relative './org_chart'
......@@ -131,7 +130,7 @@ module Gitlab
end
 
def from_file(path)
YAML.safe_load_file(path, permitted_classes: [Date]) if path.exist?
YAML.load_file(path) if path.exist?
end
 
def to_file(path, obj, header = nil)
......
......@@ -5,7 +5,7 @@ require 'date'
require 'yaml'
 
Dir['data/team_members/person/**/*.yml'].each do |path|
member = YAML.safe_load_file(path, permitted_classes: [Date])
member = YAML.load_file(path, permitted_classes: [Date])
 
department = [
'Customer Support',
......
......@@ -23,7 +23,8 @@ extra_css:
The mission of the core team is to grow the wider GitLab community, act as a steward for the community, and help GitLab live up to its
= link_to "mission", "/company/mission/"
and
= "#{link_to 'values', '/handbook/values/'}."
= succeed '.' do
= link_to "values", "/handbook/values/"
%p
The core team is not bound to any single organization and primarily consists of volunteers that have made significant
= link_to "contributions", "/community/contribute/"
......@@ -43,9 +44,11 @@ extra_css:
%code
= "#contribute"
channel in
= "#{link_to 'Discord', 'https://discord.gg/gitlab'}."
= succeed '.' do
= link_to "Discord", "https://discord.gg/gitlab"
Learn more about the core team in the
= "#{link_to 'Core Team handbook page', '/handbook/marketing/developer-relations/core-team/'}."
= succeed '.' do
= link_to "Core Team handbook page", "/handbook/marketing/developer-relations/core-team/"
 
.wrapper
.team-container
......
......@@ -2,30 +2,35 @@
%td.maturity-cell
= image_tag "/images/maturity/planned.svg"
%td
#{content_tag(:b, "Planned")}: Not yet implemented in GitLab, but on our roadmap.
= succeed ": Not yet implemented in GitLab, but on our roadmap." do
%b Planned
%tr
%td.maturity-cell
= image_tag "/images/maturity/minimal.svg"
%td
#{content_tag(:b, "Minimal")}: Available in the product, and works in the recommended setup. Has utility to the user, but does not completely address the job-to-be-done, yet. Not to be used as a primary selling point, as capabilities are minimal. Suitable to replace the need for existing tools for new companies, departments, and teams.
= succeed ": Available in the product, and works in the recommended setup. Has utility to the user, but does not completely address the job-to-be-done, yet. Not to be used as a primary selling point, as capabilities are minimal. Suitable to replace the need for existing tools for new companies, departments, and teams." do
%b Minimal
%tr
%td.maturity-cell
= image_tag "/images/maturity/viable.svg"
%td
#{content_tag(:b, "Viable")}: Significant use at GitLab the company.
= link_to "CM Scorecard", "/handbook/product/ux/category-maturity/category-maturity-scorecards/"
at least 3.14 for the
= link_to "job to be done (JTBD)", "/handbook/product/ux/ux-resources/#jobs-to-be-done-jtbd"
when tested with internal users. No assessment of related jobs to be done. Suitable to replace the need for existing tools for new namespaces, projects, and environments. Meets the design requirements for
= succeed ": Significant use at GitLab the company." do
%b Viable
= link_to "CM Scorecard", "/handbook/product/ux/category-maturity/category-maturity-scorecards/"
at least 3.14 for the
= link_to "job to be done (JTBD)", "/handbook/product/ux/ux-resources/#jobs-to-be-done-jtbd"
when tested with internal users. No assessment of related jobs to be done. Suitable to replace the need for existing tools for new namespaces, projects, and environments. Meets the design requirements for
= link_to "General Availability (GA)", "https://docs.gitlab.com/ee/policy/experiment-beta-support.html#generally-available-ga"
and usability status has a grade of C average.
%tr
%td.maturity-cell
= image_tag "/images/maturity/competitive.svg"
%td
#{content_tag(:b, "Competitive")}: Our experiences not only need to solve user needs, but this is where we start measuring solutions against our competitors. At least 100 customers use it. GitLab scores equal or best-in-class applying the #{link_to 'competitive add-on evaluation', 'https://handbook.gitlab.com/handbook/product/ux/category-maturity/competitor-comparison/'} and a CM Scorecard score of at least 3.63 for the identified JTBDs when tested with external users. Suitable to migrate from existing tools. Usability status has a grade of B average.
= succeed ": Our experiences not only need to solve user needs, but this is where we start measuring solutions against our competitors. At least 100 customers use it. GitLab scores equal or best-in-class applying the #{link_to 'competitive add-on evaluation', 'https://handbook.gitlab.com/handbook/product/ux/category-maturity/competitor-comparison/'} and a CM Scorecard score of at least 3.63 for the identified JTBDs when tested with external users. Suitable to migrate from existing tools. Usability status has a grade of B average." do
%b Competitive
%tr
%td.maturity-cell
= image_tag "/images/maturity/complete.svg"
%td
#{content_tag(:b, "Complete")}: Market and customer expectations shift over time. Because of that, this category is proactively baselined and rescored as we identify those shifts. Such an approach allows us to quickly react by identifying what we need to adjust. GitLab scores best-in-class applying the competitive add-on evaluation. CM score of at least 3.95 for the JTBD (and related JTBDs, if applicable) when tested with external users. Usability status has a grade of A average.
= succeed ": Market and customer expectations shift over time. Because of that, this category is proactively baselined and rescored as we identify those shifts. Such an approach allows us to quickly react by identifying what we need to adjust. GitLab scores best-in-class applying the competitive add-on evaluation. CM score of at least 3.95 for the JTBD (and related JTBDs, if applicable) when tested with external users. Usability status has a grade of A average." do
%b Complete
......@@ -11,7 +11,7 @@ describe Gitlab::Homepage::Team::Yaml do
 
it 'can join a directory of files' do
fixture = Pathname.new(base_dir / 'team.yml')
team = YAML.safe_load_file(fixture, permitted_classes: [Date])
team = YAML.load_file(fixture)
 
expect(subject).to receive(:to_file).with(fixture, match_array(team), described_class::HEADER)
 
......
......@@ -14,6 +14,7 @@ require 'lib/redirect'
require 'lib/code_owners'
 
require 'webmock/rspec'
require 'pry-byebug'
require 'timecop'
 
# Disable the ApiRetry logic in test by default
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment