Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pr/upgrade docs slate gems take 2 #3091

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/jasmine-tests
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -eu -o pipefail

UAA_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"

pushd "${UAA_DIR}"
pushd "${UAA_DIR}/uaa"
npm install
npm test
popd
8 changes: 5 additions & 3 deletions uaa/slate/Gemfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
ruby '>= 3.0'
ruby '>= 3.3'
source 'https://rubygems.org'

gem 'bundler', '~> 2.2'
# Middleman
gem 'middleman', '~> 4.4'
gem 'middleman-syntax', '~> 3.2'
gem 'middleman-syntax', '~> 3.4'
gem 'middleman-autoprefixer', '~> 3.0'
gem 'middleman-sprockets', '~> 4.1'
gem 'rouge', '~> 3.21'
gem 'redcarpet', '~> 3.6.0'
gem 'nokogiri', '~> 1.16.5'
gem 'sass'
gem 'webrick'
gem 'mini_racer', '~> 0.4.0', :platform => :ruby
gem 'opal'
gem 'opal-sprockets'

90 changes: 48 additions & 42 deletions uaa/slate/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,31 +1,32 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (6.1.7.6)
activesupport (7.0.8.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
autoprefixer-rails (10.2.5.0)
execjs (< 2.8.0)
backports (3.24.1)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
ast (2.4.2)
autoprefixer-rails (10.4.19.0)
execjs (~> 2)
backports (3.25.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.2.3)
contracts (0.17)
dotenv (2.8.1)
concurrent-ruby (1.3.4)
contracts (0.16.1)
dotenv (3.1.4)
erubis (2.7.0)
execjs (2.7.0)
execjs (2.9.1)
fast_blank (1.0.1)
fastimage (2.3.0)
ffi (1.16.3)
haml (5.2.2)
temple (>= 0.8.0)
fastimage (2.3.1)
ffi (1.17.0)
haml (6.3.0)
temple (>= 0.8.2)
thor
tilt
hamster (3.0.0)
concurrent-ruby (~> 1.0)
Expand All @@ -34,28 +35,27 @@ GEM
concurrent-ruby (~> 1.0)
kramdown (2.4.0)
rexml
libv8-node (15.14.0.1)
listen (3.8.0)
listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
memoist (0.16.2)
middleman (4.5.0)
middleman (4.5.1)
coffee-script (~> 2.2)
haml (>= 4.0.5)
kramdown (>= 2.3.0)
middleman-cli (= 4.5.0)
middleman-core (= 4.5.0)
middleman-cli (= 4.5.1)
middleman-core (= 4.5.1)
middleman-autoprefixer (3.0.0)
autoprefixer-rails (~> 10.0)
middleman-core (>= 4.0.0)
middleman-cli (4.5.0)
thor (>= 0.17.0, < 2.0)
middleman-core (4.5.0)
middleman-cli (4.5.1)
thor (>= 0.17.0, < 1.3.0)
middleman-core (4.5.1)
activesupport (>= 6.1, < 7.1)
addressable (~> 2.4)
backports (~> 3.6)
bundler (~> 2.0)
contracts (~> 0.13)
contracts (~> 0.13, < 0.17)
dotenv
erubis
execjs (~> 2.0)
Expand All @@ -82,28 +82,35 @@ GEM
middleman-core (>= 3.2)
rouge (~> 3.2)
mini_portile2 (2.8.7)
mini_racer (0.4.0)
libv8-node (~> 15.14.0.0)
minitest (5.21.2)
minitest (5.25.1)
nokogiri (1.16.7)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
opal (1.8.2)
ast (>= 2.3.0)
parser (~> 3.0, >= 3.0.3.2)
opal-sprockets (1.0.4)
opal (>= 1.0, < 2.0)
sprockets (~> 4.0)
tilt (>= 1.4)
padrino-helpers (0.15.3)
i18n (>= 0.6.7, < 2)
padrino-support (= 0.15.3)
tilt (>= 1.4.1, < 3)
padrino-support (0.15.3)
parallel (1.24.0)
parallel (1.26.3)
parser (3.3.5.0)
ast (~> 2.4.1)
racc
parslet (2.0.0)
public_suffix (5.0.4)
racc (1.7.3)
rack (2.2.8.1)
public_suffix (6.0.1)
racc (1.8.1)
rack (2.2.9)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
rb-inotify (0.11.1)
ffi (~> 1.0)
redcarpet (3.6.0)
rexml (3.3.6)
strscan
rexml (3.3.8)
rouge (3.30.0)
sass (3.7.4)
sass-listen (~> 4.0.0)
Expand All @@ -113,12 +120,11 @@ GEM
sassc (2.4.0)
ffi (~> 1.9)
servolux (0.13.0)
sprockets (3.7.2)
sprockets (4.2.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
strscan (3.1.0)
rack (>= 2.2.4, < 4)
temple (0.10.3)
thor (1.3.0)
thor (1.2.2)
tilt (2.0.11)
toml (0.3.0)
parslet (>= 1.8.0, < 3.0.0)
Expand All @@ -127,7 +133,6 @@ GEM
uglifier (3.2.0)
execjs (>= 0.3.0, < 3)
webrick (1.8.2)
zeitwerk (2.6.12)

PLATFORMS
ruby
Expand All @@ -137,16 +142,17 @@ DEPENDENCIES
middleman (~> 4.4)
middleman-autoprefixer (~> 3.0)
middleman-sprockets (~> 4.1)
middleman-syntax (~> 3.2)
mini_racer (~> 0.4.0)
middleman-syntax (~> 3.4)
nokogiri (~> 1.16.5)
opal
opal-sprockets
redcarpet (~> 3.6.0)
rouge (~> 3.21)
sass
webrick

RUBY VERSION
ruby 3.0
ruby 3.3.5

BUNDLED WITH
2.2.22
2 changes: 1 addition & 1 deletion uaa/slate/config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
require './lib/multilang.rb'
end

activate :sprockets
#activate :sprockets

activate :autoprefixer do |config|
config.browsers = ['last 2 version', 'Firefox ESR']
Expand Down
2 changes: 1 addition & 1 deletion uaa/slate/source/layouts/layout.erb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ under the License.
<% page_content = yield %>
<%
def self.get_version
version = File.exists?('source/versionfile') ? File.read('source/versionfile') : 'local'
version = File.exist?('source/versionfile') ? File.read('source/versionfile') : 'local'
if version =~ /release-candidate/
"Release Candidate"
else
Expand Down
Loading