diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-08-07 15:20:09 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-08-07 15:20:09 -0500 |
| commit | 7767ceef47a57baf2bc03f609e3dbf77ed44c9aa (patch) | |
| tree | 0d057168bfba56bff88f2bf1b4e8f19af0aa2204 /app/views/profiles/preferences | |
| parent | 1d5a306596e56398c3f6f46feafd1f4ce23c3c2c (diff) | |
| parent | b12107a0b953b566cd58db30ae880800a4a695a6 (diff) | |
| download | gitlab-ce-7767ceef47a57baf2bc03f609e3dbf77ed44c9aa.tar.gz | |
Merge branch 'master' into ide
* master: (177 commits)
Add changelog
Bump gitlab-shell version to 5.8.0 to fix Git for Windows 2.14
Make contextual sidebar collapsible
Fixed sidebar context header hover colors
Use correct `Environment`-class within `Gitlab` namespace
Remove gl.Activities from Commits page
Move `let` calls inside the `describe` block using them
Add `/assign me` alias support for assigning issuables to oneself
GRPC::Unavailable (< GRPC::BadStatus) is wrapped in a CommandError
Use `broken_storage` in the fs_shards_spec.
Eager load project creators for project dashboards
Memoize a user's personal projects count
Remove redundant query from User#recent_push
Improve checking if projects would be returned
Change spelling of gitlab-shell
Remove unused #tree-holder
Add custom linter for inline JavaScript to haml_lint
Rename user_can_admin? because it's more accurate
Synchronous zanata community contribution translation
Add Korean translation to i18n
...
Diffstat (limited to 'app/views/profiles/preferences')
| -rw-r--r-- | app/views/profiles/preferences/show.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml index 8809ed3b82b..9bd8bf91d1c 100644 --- a/app/views/profiles/preferences/show.html.haml +++ b/app/views/profiles/preferences/show.html.haml @@ -84,9 +84,9 @@ = f.select :dashboard, dashboard_choices, {}, class: 'form-control' .form-group = f.label :project_view, class: 'label-light' do - Project home page content + Project overview content = f.select :project_view, project_view_choices, {}, class: 'form-control' .help-block - Choose what content you want to see on a project’s home page + Choose what content you want to see on a project’s overview page .form-group = f.submit 'Save changes', class: 'btn btn-save' |