diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-09-12 18:31:54 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-09-12 18:31:54 +0000 |
| commit | e21c12375a1c636f58b1630c6906f702dbd56830 (patch) | |
| tree | de205413552c00e8b028fd610eada33df607b758 /spec/support | |
| parent | c9e11a884ebe6db94ab997058281bb1ab829f612 (diff) | |
| parent | 9b177bb7c94df6c7d3868235f75939a41acf8718 (diff) | |
| download | gitlab-ce-e21c12375a1c636f58b1630c6906f702dbd56830.tar.gz | |
Merge branch 'revert-2f46c3a8' into 'master'
Revert "Merge branch 'revert-f2421b2b' into 'master'"
See merge request !14190
Diffstat (limited to 'spec/support')
| -rw-r--r-- | spec/support/gitlab_stubs/session.json | 2 | ||||
| -rw-r--r-- | spec/support/gitlab_stubs/user.json | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/support/gitlab_stubs/session.json b/spec/support/gitlab_stubs/session.json index cd55d63125e..688175369ae 100644 --- a/spec/support/gitlab_stubs/session.json +++ b/spec/support/gitlab_stubs/session.json @@ -7,7 +7,7 @@ "skype":"aertert", "linkedin":"", "twitter":"", - "color_scheme_id":2, + "theme_id":2,"color_scheme_id":2, "state":"active", "created_at":"2012-12-21T13:02:20Z", "extern_uid":null, diff --git a/spec/support/gitlab_stubs/user.json b/spec/support/gitlab_stubs/user.json index cd55d63125e..ce8dfe5ae75 100644 --- a/spec/support/gitlab_stubs/user.json +++ b/spec/support/gitlab_stubs/user.json @@ -7,7 +7,7 @@ "skype":"aertert", "linkedin":"", "twitter":"", - "color_scheme_id":2, + "theme_id":2,"color_scheme_id":2, "state":"active", "created_at":"2012-12-21T13:02:20Z", "extern_uid":null, @@ -17,4 +17,4 @@ "can_create_project":false, "private_token":"Wvjy2Krpb7y8xi93owUz", "access_token":"Wvjy2Krpb7y8xi93owUz" -} +}
\ No newline at end of file |