Commit 0261a17c authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab-ce master

parents 88435e41 68221f50
...@@ -49,7 +49,7 @@ class Projects::BranchesController < Projects::ApplicationController ...@@ -49,7 +49,7 @@ class Projects::BranchesController < Projects::ApplicationController
branches = BranchesFinder.new(repository, params.permit(names: [])).execute branches = BranchesFinder.new(repository, params.permit(names: [])).execute
Gitlab::GitalyClient.allow_n_plus_1_calls do 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 end
end end
......
...@@ -240,7 +240,7 @@ know how difficult the issue is. Additionally: ...@@ -240,7 +240,7 @@ know how difficult the issue is. Additionally:
as suitable for people that have never contributed to GitLab before on the as suitable for people that have never contributed to GitLab before on the
[Up For Grabs campaign](http://up-for-grabs.net) [Up For Grabs campaign](http://up-for-grabs.net)
- We encourage people that have never contributed to any open source project to - 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][first-timers]
If you've decided that you would like to work on an issue, please @-mention 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) 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 ...@@ -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 should update the issue description with a responsible product manager, inviting
any potential community contributor to @-mention per above. 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 [up-for-grabs]: https://gitlab.com/groups/gitlab-org/-/issues?state=opened&label_name[]=Accepting+merge+requests&assignee_id=None&sort=weight
[firt-timers]: https://gitlab.com/groups/gitlab-org/-/issues?state=opened&label_name[]=Accepting+merge+requests&assignee_id=0&sort=weight&weight=1 [first-timers]: https://gitlab.com/groups/gitlab-org/-/issues?state=opened&label_name[]=Accepting+merge+requests&assignee_id=None&sort=weight&weight=1
## Issue triaging ## Issue triaging
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment