Check environment for experiment first

lib/gitlab/experimentation.rb

@@ -201,7 +201,7 @@ module Gitlab
         return false unless EXPERIMENTS.key?(experiment_key)
 
         experiment = experiment(experiment_key)
-        experiment.enabled? && experiment.enabled_for_environment?
+        experiment.enabled_for_environment? && experiment.enabled?
       end
 
       def enabled_for_attribute?(experiment_key, attribute)

spec/lib/gitlab/experimentation_spec.rb

@@ -442,6 +442,14 @@ RSpec.describe Gitlab::Experimentation, :snowplow do
       let(:environment) { ::Gitlab.com? }
 
       it { is_expected.to be_falsey }
+
+      it 'ensures the typically less expensive environment is checked before the more expensive call to database for Feature' do
+        expect_next_instance_of(described_class::Experiment) do |experiment|
+          expect(experiment).not_to receive(:enabled?)
+        end
+
+        subject
+      end
     end
   end