Merge branch 'develop' into tasks/my-tasks

dradis · Sep 23, 2024 · 42cd66a · 42cd66a
2 parents f60c9b4 + a83fb02
commit 42cd66a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -32,6 +32,7 @@ jobs:
       IS_MERGE: ${{ github.base_ref == '' }}
       PREV_SHA: ${{ github.event.before }}
       TARGET_BRANCH: ${{ github.base_ref }}
+      FALLBACK_BRANCH: 'origin/develop'
     steps:
       - name: Checkout code
         uses: actions/checkout@v1
@@ -40,7 +41,7 @@ jobs:
         with:
           bundler-cache: true
       - name: Lint changed files
-        run: bin/rubocop-ci ${{ env.TARGET_BRANCH || env.PREV_SHA }} ${{ env.IS_MERGE }}
+        run: bin/rubocop-ci ${{ env.TARGET_BRANCH || env.PREV_SHA || env.FALLBACK_BRANCH }} ${{ env.IS_MERGE }}
   rspec:
     name: RSpec
     needs: [audits, rubocop]

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -25,7 +25,7 @@
               <%= yield %>
             </div>
             <footer>
-              <p>Dradis Community Edition - <a href="http://drad.is">http://drad.is</a></p>
+              <p>Dradis Community Edition - <a href="https://dradis.com/ce/?utm_source=ce&utm_medium=app&utm_campaign=layout">https://dradis.com/ce/</a></p>
             </footer>
           </div>
         </div>

diff --git a/app/views/layouts/setup.html.erb b/app/views/layouts/setup.html.erb
@@ -23,7 +23,7 @@
             <%= yield %>
           </div>
 
-          <p class="copyright">Dradis Community Edition - <a href="http://drad.is">http://drad.is</a></p>
+          <p class="copyright">Dradis Community Edition - <a href="https://dradis.com/ce/?utm_source=ce&utm_medium=app&utm_campaign=layout">https://dradis.com/ce/</a></p>
         </div>
       </div>
     </div>

diff --git a/app/views/layouts/tylium/navbar/_help.html.erb b/app/views/layouts/tylium/navbar/_help.html.erb
@@ -5,8 +5,8 @@
 
   <div class="dropdown-menu dropdown-menu-end">
     <a href="javascript:void(0)" class="js-try-pro dropdown-item" data-term="training-course" data-url="https://dradis.com/academy/dradis-course/?utm_source=ce&utm_medium=app&utm_campaign=try-pro&utm_term=training-course">Free training course</a>
-    <a href="https://dradis.com/support/guides/projects/?utm_source=ce&utm_medium=app" target="_blank" class="dropdown-item">Projects 101</a>
-    <a href="https://dradis.com/support/guides/troubleshooting/?utm_source=ce&utm_medium=app" target="_blank" class="dropdown-item">Troubleshooting</a>
+    <a href="https://dradis.com/support/guides/projects/?utm_source=ce&utm_medium=app&utm_campaign=support&utm_term=projects101" target="_blank" class="dropdown-item">Projects 101</a>
+    <a href="https://dradis.com/support/guides/troubleshooting/?utm_source=ce&utm_medium=app&utm_campaign=support&utm_term=troubleshooting" target="_blank" class="dropdown-item">Troubleshooting</a>
     <div class="divider"></div>
 
     <% if defined?(Dradis::Pro) %>
@@ -18,10 +18,10 @@
     <% end %>
 
     <a href="https://github.com/dradis/dradis-ce/issues" target="_blank" class="dropdown-item">Report an issue</a>
-    <a href="http://dradis.com/support/" target="_blank" class="dropdown-item">Support website</a>
-    <a href="https://discuss.dradisframework.org" target="_blank" class="dropdown-item">Community forums</a>
+    <a href="https://dradis.com/support/?utm_source=ce&utm_medium=app&utm_campaign=support&utm_term=support" target="_blank" class="dropdown-item">Support website</a>
+    <a href="https://discuss.dradis.com?utm_source=ce&utm_medium=app&utm_campaign=forum" target="_blank" class="dropdown-item">Community forums</a>
     <div class="divider"></div>
-    <a href="https://dradis.com/careers/" target="_blank" class="dropdown-item">We're hiring</a>
+    <a href="https://dradis.com/careers/?utm_source=ce&utm_medium=app&utm_campaign=careers" target="_blank" class="dropdown-item">We're hiring</a>
 
     <% unless defined?(Dradis::Pro) %>
     <div class="divider"></div>