diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2018-01-02 21:06:06 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2018-01-02 21:06:06 +0000 |
commit | 6db6856d8dee1810a25f1a4c5a665329c5ad598b (patch) | |
tree | f8b12c884b42deb3254873ec5c9c0580fb95bac2 /spec/requests/api/files_spec.rb | |
parent | 7c636732fba98935922ffaadc49b328417e9036c (diff) | |
parent | 2cbb2d0eceaed0f31c92d4eed8932e98f4f74559 (diff) | |
download | gitlab-ce-6db6856d8dee1810a25f1a4c5a665329c5ad598b.tar.gz |
Merge branch 'master' into 41120-performance-bar-auto-scroll
* master: (120 commits)
Update CHANGELOG.md for 10.3.3
Fix user membership destroy relation
Use heredoc so it's more clear
Put all menus under menu module
Introduce common project settings and just put
Introduce Factory::Resource::DeployKey
Introduce expand_deploy_keys
Introduce Menu::Side
Add documents for GitLab utilities
Clears visual token on second backspace
Update prometheus gem to version that adds inf+ bucket in accordance with Prometheus docs.
Add breadcrumbs to User Settings sub-views
Rename asset sync related AWS variables
Allow logged in user to change his password
Fix 404 error after a user edits an issue description and solves the reCAPTCHA
Fix links to old commits in merge requests
Typos correction on the advise of @smcgivern
Documenting that resolved JIRA tickets are not automatically transitioned
Forking a project to a namespace with lower visibility.
Keep typographic hierarchy in User Settings
...
Diffstat (limited to 'spec/requests/api/files_spec.rb')
-rw-r--r-- | spec/requests/api/files_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/requests/api/files_spec.rb b/spec/requests/api/files_spec.rb index 5d8338a3fb7..d8fdfd6dee1 100644 --- a/spec/requests/api/files_spec.rb +++ b/spec/requests/api/files_spec.rb @@ -14,7 +14,7 @@ describe API::Files do let(:author_name) { 'John Doe' } before do - project.team << [user, :developer] + project.add_developer(user) end def route(file_path = nil) |