Merge branch 'main' into GL-1067

.circleci/config.yml

@@ -219,20 +219,13 @@ workflows:
           ssm_parameter: "/development/ADMIN_ECR_URL"
           <<: *filter-not-main
 
-      - confirm-deploy-for-qa?:
-          type: approval
-          requires:
-            - test
-            - plan-terraform-dev
-            - build-and-push-dev
-          <<: *filter-not-main
-
       - apply-terraform:
           name: apply-terraform-dev
           context: trade-tariff-terraform-aws-development
           environment: development
           requires:
-            - confirm-deploy-for-qa?
+            - write-docker-tag-dev
+            - build-and-push-dev
           <<: *filter-not-main
 
       - tariff/smoketests:

.envrc

@@ -0,0 +1,6 @@
+if ! has nix_direnv_version || ! nix_direnv_version 3.0.4; then
+    source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.4/direnvrc" "sha256-DzlYZ33mWF/Gs8DDeyjr8mnVmQGx7ASYqA5WlxwvBG4="
+fi
+
+watch_file gemset.nix
+use flake

.gitignore

@@ -25,3 +25,4 @@ vendor
 /node_modules
 yarn-error.log
 .byebug_history
+.direnv

.rubocop.yml

@@ -35,6 +35,8 @@ RSpec/MultipleExpectations:
   Enabled: false
 RSpec/NestedGroups:
   Enabled: false
+RSpec/NoExpectationExample:
+  Enabled: false
 Rails/SaveBang:
   Enabled: false
 RSpec/FilePath:
@@ -48,5 +50,7 @@ Style/FrozenStringLiteralComment:
   EnforcedStyle: never
 Style/GuardClause:
   MinBodyLength: 2
+Style/InverseMethods:
+  Enabled: false
 Style/StringLiterals:
   EnforcedStyle: single_quotes

Dockerfile

@@ -60,6 +60,8 @@ ENV RAILS_SERVE_STATIC_FILES=true \
 COPY --from=builder /app /app
 COPY --from=builder /usr/local/bundle/ /usr/local/bundle/
 
+
+RUN bundle config set without 'development test'
 RUN addgroup -S tariff && \
   adduser -S tariff -G tariff && \
   chown -R tariff:tariff /app && \

Gemfile

@@ -67,6 +67,7 @@ end
 
 group :development do
   gem 'rubocop-govuk'
+  gem 'solargraph'
 end
 
 group :test do