gitlab-org--gitlab-foss/lib
Douwe Maan 2a0cccc13e Merge branch 'fix/reassign-secret-token-on-generate' into 'master'
Reassign secret token when regenerating one

## What does this MR do?

This is an attempt to fix intermittent errors in out test suite.

```text
Failures:

  1) Gitlab::Shell memoized secret_token creates and links the secret token file
     Failure/Error: expect(File.read(secret_file).chomp).to eq(secret_token)
     
       expected: "690f959e206ab91acc54e1c605c7ff90"
            got: "cccb4e8df9360600271e61114d4e6e68"
     
       (compared using ==)
     # ./spec/lib/gitlab/backend/shell_spec.rb:47:in `block (3 levels) in <top (required)>'
```

It appears that `spec/lib/gitlab/backend/shell_spec.rb` tries to change the file that stores secret token, but `Gitlab::Shell` memoizes `@secret_token` on class level, so when it was already created by other tests (`spec/requests/api/internal_spec.rb` in this case), memoized token is not reassigned even if it was generated again with `ensure_secret_token!`.

See merge request !6844
2016-10-14 10:57:18 +00:00
..
api Merge branch 'grapify-todos-api' into 'master' 2016-10-14 10:29:10 +00:00
assets
backup lib/backup: fix broken permissions when creating repo dir 2016-08-30 13:35:50 +02:00
banzai Convert UTF-8 Emoji to Gitlab emoji 2016-10-13 13:18:30 +02:00
ci Extract method that checks if ci runner needs update 2016-10-03 12:07:47 +02:00
constraints Make user constrainer lookup same as controller and add more constrainer tests 2016-10-06 19:50:48 +03:00
container_registry Make rubocop happy 2016-07-15 18:05:39 +02:00
gitlab Merge branch 'fix/reassign-secret-token-on-generate' into 'master' 2016-10-14 10:57:18 +00:00
json_web_token Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
omni_auth
rouge/formatters Trim extra displayed carriage returns in diffs and files with CRLFs 2016-08-01 13:24:06 +02:00
support Revert "Defend against 'Host' header injection" 2016-08-08 13:02:44 +02:00
tasks Improve the branch existence and merge checks 2016-10-13 17:42:06 +02:00
banzai.rb Add markdown cache columns to the database, but don't use them yet 2016-10-07 02:54:25 +01:00
disable_email_interceptor.rb Enable Style/EmptyLines cop, remove redundant ones 2016-07-01 21:56:17 +02:00
event_filter.rb Fix inconsistent highlighting of already selected activity nav-links 2016-10-05 15:38:18 -05:00
expand_variables.rb Update support for dynamic environments 2016-09-19 10:07:13 +02:00
extracts_path.rb Allow browsing branches that end with '.atom' 2016-10-11 13:31:12 +01:00
file_size_validator.rb
file_streamer.rb
gitlab.rb Update `Gitlab.com?` to support staging 2016-06-27 15:10:36 -04:00
gt_one_coercion.rb
repository_cache.rb Use project ID in repository cache to prevent stale data from persisting across projects 2016-07-25 05:09:28 -07:00
static_model.rb
unfold_form.rb
uploaded_file.rb Enable Style/EmptyLines cop, remove redundant ones 2016-07-01 21:56:17 +02:00
version_check.rb