diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-04 00:09:56 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-04 00:09:56 +0300 |
| commit | c1a50b8195f4e36fda9b233acbde57a449bcf6c3 (patch) | |
| tree | b24a10a7951e9a799397753d1badf6894fe03089 /app/views | |
| parent | b6847c621ff246e6abceb90545d5a608318762d6 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/profiles/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/import/jira/show.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml index 86e157ee042..da2b8c40191 100644 --- a/app/views/profiles/show.html.haml +++ b/app/views/profiles/show.html.haml @@ -101,7 +101,7 @@ - else = f.text_field :location, label: s_('Profiles|Location'), class: 'input-lg', placeholder: s_("Profiles|City, country") = f.text_field :job_title, class: 'input-md' - = f.text_field :organization, label: s_('Profiles|Organization'), class: 'input-md', help: s_("Profiles|Who you represent or work for") + = f.text_field :organization, readonly: @user.gitlab_employee?, label: s_('Profiles|Organization'), class: 'input-md', help: s_("Profiles|Who you represent or work for") = f.text_area :bio, label: s_('Profiles|Bio'), rows: 4, maxlength: 250, help: s_("Profiles|Tell us about yourself in fewer than 250 characters") %hr %h5= s_("Private profile") diff --git a/app/views/projects/import/jira/show.html.haml b/app/views/projects/import/jira/show.html.haml index f295a241113..c734297d7f3 100644 --- a/app/views/projects/import/jira/show.html.haml +++ b/app/views/projects/import/jira/show.html.haml @@ -9,7 +9,7 @@ %h3.page-title.d-flex.align-items-center = sprite_icon('issues', size: 16, css_class: 'mr-1') = _('Import in progress') -- else +- elsif @jira_projects.present? %h3.page-title.d-flex.align-items-center = sprite_icon('issues', size: 16, css_class: 'mr-1') = _('Import issues from Jira') |