diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-12-15 21:25:23 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-12-15 21:25:23 +0000 |
| commit | 223cb3788a744f9b1b92959d3337000358db108b (patch) | |
| tree | 77858e7ec0e2a731ddb7791f99d75ef4c23b4b54 /spec/factories/user_agent_details.rb | |
| parent | b3606cff38b9defc764706ed6529a9e27dcf4847 (diff) | |
| parent | a1a323392d4f0cb59eab2e215fa4010b84fc122d (diff) | |
| download | gitlab-ce-223cb3788a744f9b1b92959d3337000358db108b.tar.gz | |
Merge branch 'master' into 41117-empty-state41117-empty-state
* master: (71 commits)
Update CHANGELOG.md for 10.2.5
Change CI config to use new base image
fix issue #39843 Incorrect guidance stating blocked users will be removed from groups and projects as members
Add changelog entry
Update tests for toggle design change
Update toggle styles to use icons
Use icons instead of string labels for toggles
Fix Rubocop offense in QA project specs
Add SAST docs
Fix UX issues in system info page
Update svg package version
Make sure user email is read only when synced with LDAP
Add note about automatic pipelines when enabling Auto DevOps
Backport changes from EE
Docs update documentation guidelines
Don't use Markdown cache for stubbed settings in specs
Fix remaining calls to GitLab QA factories
Rename QA scenarios to make factory concept explicit
Export JS classes as modules
Make rubocop happy
...
Diffstat (limited to 'spec/factories/user_agent_details.rb')
| -rw-r--r-- | spec/factories/user_agent_details.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/factories/user_agent_details.rb b/spec/factories/user_agent_details.rb index 9763cc0cf15..7183a8e1140 100644 --- a/spec/factories/user_agent_details.rb +++ b/spec/factories/user_agent_details.rb @@ -1,4 +1,4 @@ -FactoryGirl.define do +FactoryBot.define do factory :user_agent_detail do ip_address '127.0.0.1' user_agent 'AppleWebKit/537.36' |