merge ru urm q2

.rubocop.yml

@@ -0,0 +1,32 @@
+require: rubocop-performance
+
+Documentation:
+  Enabled: false
+Metrics/ClassLength:
+  Enabled: false
+Style/ClassAndModuleChildren:
+  Enabled: false
+Metrics/LineLength:
+  Enabled: false
+Metrics/MethodLength:
+  Max: 40
+Style/AsciiComments:
+  Enabled: false
+Metrics/AbcSize:
+  Enabled: false
+Style/GuardClause:
+  Enabled: false
+Style/FormatStringToken:
+  Enabled: false
+Lint/AssignmentInCondition:
+  Enabled: false
+Style/IfUnlessModifier:
+  Enabled: false
+Naming/MemoizedInstanceVariableName:
+  EnforcedStyleForLeadingUnderscores: required
+Style/MultilineBlockChain:
+  Enabled: false
+Lint/ConstantDefinitionInBlock:
+  Enabled: false
+Naming/VariableNumber:
+  Enabled: false

.ruby-version

@@ -1 +1 @@
-2.4.2
+3.2.2

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.4
+FROM ruby:3.2.2
 
 LABEL maintainer Travis CI GmbH <support+travis-web-docker-images@travis-ci.com>
 

Gemfile

@@ -1,28 +1,35 @@
-ruby "~> 2.4.2"
+# frozen_string_literal: true
+
+ruby '~> 3.2.2'
 
 source 'https://rubygems.org'
 
-gem 'travis-web', path: 'waiter'
-gem 'puma', '~> 3.12.4'
-gem 'rack-ssl', '~> 1.4'
-gem 'rack-protection', '~> 1.4'
-gem 'rack-mobile-detect'
-gem 'sinatra'
 gem 'hashr'
+gem 'puma', '~> 6'
+gem 'rack-mobile-detect'
+gem 'rack-protection', '~> 3.0'
+gem 'rack-ssl', '~> 1.4'
 gem 'sanitize'
+gem 'sinatra'
+gem 'travis-web', path: 'waiter'
 
 group :development, :test do
   gem 'rake'
 end
 
-
 group :development do
   # gem 'debugger'
   gem 'foreman'
+  gem 'rubocop'
+  gem 'rubocop-performance'
+  gem 'rubocop-rspec'
+  gem 'simplecov'
+  gem 'simplecov-console'
 end
 
 group :test do
-  gem 'rspec', '~> 2.11'
-  gem 'test-unit'
+  gem 'rspec', '~> 3.12'
+  gem 'rack-test'
   gem 'sinatra-contrib'
+  gem 'test-unit'
 end

Gemfile.lock

@@ -6,78 +6,138 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    backports (3.6.8)
+    ansi (1.5.0)
+    ast (2.4.2)
     crass (1.0.6)
-    diff-lcs (1.2.5)
-    foreman (0.82.0)
-      thor (~> 0.19.1)
-    hashr (2.0.0)
-    mini_portile2 (2.4.0)
-    multi_json (1.12.1)
-    nokogiri (1.10.9)
-      mini_portile2 (~> 2.4.0)
-    nokogumbo (2.0.2)
-      nokogiri (~> 1.8, >= 1.8.4)
-    power_assert (0.4.1)
-    puma (3.12.6)
-    rack (1.6.12)
+    diff-lcs (1.5.0)
+    docile (1.4.0)
+    foreman (0.87.2)
+    hashr (2.0.1)
+    json (2.6.3)
+    language_server-protocol (3.17.0.3)
+    multi_json (1.15.0)
+    mustermann (3.0.0)
+      ruby2_keywords (~> 0.0.1)
+    nio4r (2.5.9)
+    nokogiri (1.15.2-x86_64-linux)
+      racc (~> 1.4)
+    parallel (1.23.0)
+    parser (3.2.2.3)
+      ast (~> 2.4.1)
+      racc
+    power_assert (2.0.3)
+    puma (6.3.0)
+      nio4r (~> 2.0)
+    racc (1.7.1)
+    rack (2.2.7)
     rack-mobile-detect (0.4.0)
       rack
-    rack-protection (1.5.5)
+    rack-protection (3.0.6)
       rack
     rack-ssl (1.4.1)
       rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rake (12.3.3)
-    rspec (2.99.0)
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
-    rspec-core (2.99.2)
-    rspec-expectations (2.99.2)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.4)
-    sanitize (5.2.1)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.8.1)
+    rexml (3.2.5)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    rubocop (1.54.0)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
+      parallel (~> 1.10)
+      parser (>= 3.2.2.3)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.29.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.18.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.23.1)
+      rubocop (~> 1.33)
+    rubocop-performance (1.18.0)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rspec (2.22.0)
+      rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
+    ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
+    sanitize (6.0.1)
       crass (~> 1.0.2)
-      nokogiri (>= 1.8.0)
-      nokogumbo (~> 2.0)
-    sinatra (1.4.8)
-      rack (~> 1.5)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
-    sinatra-contrib (1.4.7)
-      backports (>= 2.0)
+      nokogiri (>= 1.12.0)
+    simplecov (0.22.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-console (0.9.1)
+      ansi
+      simplecov
+      terminal-table
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
+    sinatra (3.0.6)
+      mustermann (~> 3.0)
+      rack (~> 2.2, >= 2.2.4)
+      rack-protection (= 3.0.6)
+      tilt (~> 2.0)
+    sinatra-contrib (3.0.6)
       multi_json
-      rack-protection
-      rack-test
-      sinatra (~> 1.4.0)
-      tilt (>= 1.3, < 3)
-    test-unit (3.2.3)
+      mustermann (~> 3.0)
+      rack-protection (= 3.0.6)
+      sinatra (= 3.0.6)
+      tilt (~> 2.0)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    test-unit (3.6.1)
       power_assert
-    thor (0.19.1)
-    tilt (2.0.8)
+    tilt (2.2.0)
+    unicode-display_width (2.4.2)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
   foreman
   hashr
-  puma (~> 3.12.4)
+  puma (~> 6)
   rack-mobile-detect
-  rack-protection (~> 1.4)
+  rack-protection (~> 3.0)
   rack-ssl (~> 1.4)
+  rack-test
   rake
-  rspec (~> 2.11)
+  rspec (~> 3.12)
+  rubocop
+  rubocop-performance
+  rubocop-rspec
   sanitize
+  simplecov
+  simplecov-console
   sinatra
   sinatra-contrib
   test-unit
   travis-web!
 
 RUBY VERSION
-   ruby 2.4.2p198
+   ruby 3.2.2p53
 
 BUNDLED WITH
-   1.17.3
+   2.4.14

app/components/profile-nav.js

@@ -73,7 +73,7 @@ export default Component.extend({
   isOrganizationAdmin: and('isOrganization', 'hasAdminPermissions'),
   showOrganizationSettings: computed('isOrganizationAdmin', 'isProVersion', 'hasSettingsReadPermissions', function () {
     const forOrganization = !this.isOrganization || this.hasSettingsReadPermissions;
-    return this.isOrganizationAdmin && this.isProVersion && forOrganization;
+    return (this.isOrganizationAdmin || forOrganization) && this.isProVersion;
   }),
 
   showSubscriptionTab: computed('features.enterpriseVersion', 'hasPlanViewPermissions',

app/templates/components/multi-signin-button.hbs

@@ -72,4 +72,4 @@
       </div>
     </AnimatedIf>
   </div>
-{{/if}}
+{{/if}}

app/templates/components/profile-nav.hbs

@@ -167,7 +167,7 @@
               </LinkTo>
             </li>
           {{/if}}
-          {{#if (and this.showSubscriptionTab this.isOrganizationAdmin)}}
+          {{#if this.showSubscriptionTab}}
             <li data-test-billing-tab>
               <LinkTo @route="organization.billing" @model={{this.model}}>
                 Plan

config/environment.js

@@ -154,7 +154,7 @@ module.exports = function (environment) {
       hidePostalCode: true,
       style: {
         base: {
-          fontStyle: 'Source Sans Pro',
+          fontStyle: 'sans-serif',
           fontSize: '15px',
           color: '#666',
           '::placeholder': {

waiter/Rakefile

@@ -1,6 +1,10 @@
-$: << 'lib'
+# frozen_string_literal: true
+
+$LOAD_PATH << 'lib'
 task :update_emojis do
-  s = Dir.glob('assets/images/emoji/*.png').map {|png| png.split('/', 4)[3].gsub('.png', '')}.map{|png| "'#{png}'"}.join(", ")
+  s = Dir.glob('assets/images/emoji/*.png').map do |png|
+    png.split('/', 4)[3].gsub('.png', '')
+  end.map { |png| "'#{png}'" }.join(', ')
   e = "@EmojiDictionary = [#{s}]"
-  File.open("assets/scripts/config/emoij.coffee", "w") {|f| f.write(e) }
+  File.open('assets/scripts/config/emoij.coffee', 'w') { |f| f.write(e) }
 end