diff options
| author | Lin Jen-Shin (godfat) <godfat@godfat.org> | 2017-05-26 19:18:07 +0000 |
|---|---|---|
| committer | Lin Jen-Shin (godfat) <godfat@godfat.org> | 2017-05-26 19:18:07 +0000 |
| commit | b5e8de5c4c202d10ef8b48248b12f49c1330d04a (patch) | |
| tree | e034bee79723e84eab1e9257c3848d4c991d5333 /spec/requests | |
| parent | 8f44bc4dc10caf3c9856a8e4bea5ac145a315131 (diff) | |
| parent | 3605e4307ddf373071c0353a066c50fcead01e45 (diff) | |
| download | gitlab-ce-b5e8de5c4c202d10ef8b48248b12f49c1330d04a.tar.gz | |
Merge branch 'master' into '24196-protected-variables'
# Conflicts:
# db/schema.rb
Diffstat (limited to 'spec/requests')
| -rw-r--r-- | spec/requests/api/users_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb index 4919ad19833..a2503dbeb69 100644 --- a/spec/requests/api/users_spec.rb +++ b/spec/requests/api/users_spec.rb @@ -287,7 +287,7 @@ describe API::Users do expect(json_response['message']['projects_limit']). to eq(['must be greater than or equal to 0']) expect(json_response['message']['username']). - to eq([Gitlab::Regex.namespace_regex_message]) + to eq([Gitlab::PathRegex.namespace_format_message]) end it "is not available for non admin users" do @@ -459,7 +459,7 @@ describe API::Users do expect(json_response['message']['projects_limit']). to eq(['must be greater than or equal to 0']) expect(json_response['message']['username']). - to eq([Gitlab::Regex.namespace_regex_message]) + to eq([Gitlab::PathRegex.namespace_format_message]) end it 'returns 400 if provider is missing for identity update' do |