Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
87452acf
Commit
87452acf
authored
Jan 13, 2020
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'cablett-fix-available-typo' into 'master'
Fix typo "available" See merge request gitlab-org/gitlab!22763
parents
e5d69077
94301977
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
app/graphql/mutations/snippets/create.rb
app/graphql/mutations/snippets/create.rb
+1
-1
ee/spec/helpers/ee/tree_helper_spec.rb
ee/spec/helpers/ee/tree_helper_spec.rb
+1
-1
lib/gitlab/graphql/authorize/authorize_resource.rb
lib/gitlab/graphql/authorize/authorize_resource.rb
+2
-2
No files found.
app/graphql/mutations/snippets/create.rb
View file @
87452acf
...
...
@@ -42,7 +42,7 @@ module Mutations
if
project_path
.
present?
project
=
find_project!
(
project_path:
project_path
)
elsif
!
can_create_personal_snippet?
raise_resource_not_avaiable_error!
raise_resource_not_avai
l
able_error!
end
snippet
=
CreateSnippetService
.
new
(
project
,
...
...
ee/spec/helpers/ee/tree_helper_spec.rb
View file @
87452acf
...
...
@@ -24,7 +24,7 @@ describe TreeHelper do
end
end
context
'when file lock is not avaiable'
do
context
'when file lock is not avai
l
able'
do
it
'returns the path information'
do
stub_licensed_features
(
file_locks:
false
)
...
...
lib/gitlab/graphql/authorize/authorize_resource.rb
View file @
87452acf
...
...
@@ -40,7 +40,7 @@ module Gitlab
def
authorize!
(
object
)
unless
authorized_resource?
(
object
)
raise_resource_not_avaiable_error!
raise_resource_not_avai
l
able_error!
end
end
...
...
@@ -63,7 +63,7 @@ module Gitlab
end
end
def
raise_resource_not_avaiable_error!
def
raise_resource_not_avai
l
able_error!
raise
Gitlab
::
Graphql
::
Errors
::
ResourceNotAvailable
,
RESOURCE_ACCESS_ERROR
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment