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
0261a17c
Commit
0261a17c
authored
Aug 06, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
88435e41
68221f50
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
app/controllers/projects/branches_controller.rb
app/controllers/projects/branches_controller.rb
+1
-1
doc/development/contributing/issue_workflow.md
doc/development/contributing/issue_workflow.md
+3
-3
No files found.
app/controllers/projects/branches_controller.rb
View file @
0261a17c
...
...
@@ -49,7 +49,7 @@ class Projects::BranchesController < Projects::ApplicationController
branches
=
BranchesFinder
.
new
(
repository
,
params
.
permit
(
names:
[])).
execute
Gitlab
::
GitalyClient
.
allow_n_plus_1_calls
do
render
json:
branches
.
to_h
{
|
branch
|
[
branch
.
name
,
service
.
call
(
branch
)]
}
render
json:
branches
.
map
{
|
branch
|
[
branch
.
name
,
service
.
call
(
branch
)]
}.
to_h
end
end
end
...
...
doc/development/contributing/issue_workflow.md
View file @
0261a17c
...
...
@@ -240,7 +240,7 @@ know how difficult the issue is. Additionally:
as suitable for people that have never contributed to GitLab before on the
[
Up For Grabs campaign
](
http://up-for-grabs.net
)
-
We encourage people that have never contributed to any open source project to
look for
[
`Accepting merge requests` issues with a weight of 1
][
firt-timers
]
look for
[
`Accepting merge requests` issues with a weight of 1
][
fir
s
t-timers
]
If you've decided that you would like to work on an issue, please @-mention
the
[
appropriate product manager
](
https://about.gitlab.com/handbook/product/#who-to-talk-to-for-what
)
...
...
@@ -253,8 +253,8 @@ GitLab team members who apply the ~"Accepting merge requests" label to an issue
should update the issue description with a responsible product manager, inviting
any potential community contributor to @-mention per above.
[
up-for-grabs
]:
https://gitlab.com/groups/gitlab-org/-/issues?state=opened&label_name[]=Accepting+merge+requests&assignee_id=
0
&sort=weight
[
fir
t-timers
]:
https://gitlab.com/groups/gitlab-org/-/issues?state=opened&label_name[]=Accepting+merge+requests&assignee_id=0
&sort=weight&weight=1
[
up-for-grabs
]:
https://gitlab.com/groups/gitlab-org/-/issues?state=opened&label_name[]=Accepting+merge+requests&assignee_id=
None
&sort=weight
[
fir
st-timers
]:
https://gitlab.com/groups/gitlab-org/-/issues?state=opened&label_name[]=Accepting+merge+requests&assignee_id=None
&sort=weight&weight=1
## Issue triaging
...
...
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