Skip to content

Commit 2acfa63

Browse files
committed
Merge branch 'develop' into sidebar/collapse-conditionally
2 parents 53d6df2 + 0abc9be commit 2acfa63

File tree

45 files changed

+2277
-765
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+2277
-765
lines changed

CHANGELOG

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,20 @@
1010
- Rename addon upload/parent nodes and add icons
1111
- Update associated evidence, notes and child nodes' updated_at columns on node merge
1212
- Warn on node merge that methodology will not be copied
13+
- Show don't gate:
14+
- Issue Library
15+
- Ticketing integrations
16+
- Word/Excel templates
1317
- Sidebar:
1418
- Add resize functionality
19+
- Textile:
20+
- Add support for paragraph alignment
21+
- Add support for image resizing, alignment, and borders
1522
- Keep sidebar open when editing issues in large viewports
1623
- Wizard:
1724
- Add analytics sharing step
1825
- Mark as done after Kit step, without waiting for the background job.
26+
- Update Welcome kit with OWASP Top 10:2025 methodology
1927
- [entity]:
2028
- [future tense verb] [feature]
2129
- Upgraded gems:
@@ -47,7 +55,6 @@ v4.19.0 (November 2025)
4755
- Editor: Add inline code, and highlight code buttons to the toolbar
4856
- Layout: Improve primary action visibility for Evidence, Issues, Methodologies, Notes, and Node Properties
4957
- Navigation: Move Trash and Project Configurations in main navigation bar
50-
- Textile: Add support for paragraph alignment
5158
- [entity]:
5259
- [future tense verb] [feature]
5360
- Upgraded gems:

Dockerfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,12 @@ apt-get install --no-install-recommends -y curl git libjemalloc2 libvips && \
1010
apt-get install --no-install-recommends -y redis-server sqlite3 && \
1111
rm -rf /var/lib/apt/lists /var/cache/apt/archives
1212

13-
# Set production environment
13+
# This can be overriden to build the Sandbox image
14+
ARG BUNDLE_GEMFILE="Gemfile"
15+
1416
ENV RAILS_ENV="production" \
1517
BUNDLE_DEPLOYMENT="1" \
18+
BUNDLE_GEMFILE=$BUNDLE_GEMFILE \
1619
BUNDLE_PATH="/usr/local/bundle" \
1720
BUNDLE_WITHOUT="development test" \
1821
# RAILS_SERVE_STATIC_FILES is enabled to let Rails serve static files since we're not using Nginx
@@ -28,7 +31,7 @@ RUN apt-get update -qq && \
2831
# Copy files to build layer that are needed to run `bundle install` & install app gems
2932
# engines/ is needed to resolve built-in engines in Gemfile
3033
# version.rb is needed to resolve built-in engine versions in their respective .gemspecs
31-
COPY Gemfile Gemfile.lock Gemfile.plugins ./
34+
COPY Gemfile Gemfile.lock Gemfile.plugins Gemfile.sandbox Gemfile.sandbox.lock ./
3235
COPY engines ./engines
3336
COPY lib/dradis/ce/version.rb ./lib/dradis/ce/version.rb
3437

@@ -50,7 +53,7 @@ RUN mkdir -p app/views/tmp \
5053
storage
5154

5255
# Precompile bootsnap code for faster boot times
53-
RUN bundle exec bootsnap precompile app/ lib/
56+
RUN bundle exec bootsnap precompile app/ engines/ lib/
5457

5558
# Precompile assets for production without requiring secret RAILS_MASTER_KEY
5659
RUN SECRET_KEY_BASE_DUMMY=1 ./bin/rails assets:precompile

Gemfile.sandbox

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# This Gemfile extends the base Gemfile with Sandbox-specific dependencies
2+
eval_gemfile 'Gemfile'
3+
4+
gem 'dradis-sandbox', path: 'engines/dradis-sandbox'
5+
6+
# Telemetry
7+
gem 'sentry-ruby'
8+
gem 'sentry-rails'
9+
gem 'stackprof'

0 commit comments

Comments
 (0)