app/views/projects/merge_requests · 012c126d570120b52eea8692e135bd67435c19d3 · Forest Godfrey / gitlab-ce

Merge branch 'bvl-missing-translations' into 'master' · 2a7deae1

authored Jun 16, 2017

Missing translations for the project & repository pages.

Closes #33420

See merge request !12052
Conflicts:
	app/assets/javascripts/locale/en/app.js
	app/assets/javascripts/locale/es/app.js
	app/views/projects/pipeline_schedules/_form.html.haml
	locale/en/gitlab.po
	locale/es/gitlab.po
	locale/gitlab.pot

2a7deae1

Name	Last commit	Last update
..
conflicts		Loading commit data...
dropdowns		Loading commit data...
show		Loading commit data...
widget		Loading commit data...
_discussion.html.haml		Loading commit data...
_form.html.haml		Loading commit data...
_head.html.haml		Loading commit data...
_merge_request.html.haml		Loading commit data...
_merge_requests.html.haml		Loading commit data...
_new_compare.html.haml		Loading commit data...
_new_diffs.html.haml		Loading commit data...
_new_submit.html.haml		Loading commit data...
_show.html.haml		Loading commit data...
branch_from.html.haml		Loading commit data...
branch_to.html.haml		Loading commit data...
conflicts.html.haml		Loading commit data...
diffs.html.haml		Loading commit data...
edit.html.haml		Loading commit data...
index.html.haml		Loading commit data...
invalid.html.haml		Loading commit data...
new.html.haml		Loading commit data...
show.html.haml		Loading commit data...
update_branches.html.haml		Loading commit data...