diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-06-16 16:16:35 +0000 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2017-06-16 19:00:27 -0500 |
| commit | 2a7deae183a73c24bea135d75956918815a655fb (patch) | |
| tree | facc4ee1fb1b0538b77837eddcea66ac391b8434 /spec | |
| parent | 999926075d82552f630d4e9d8b1128f5f2e131af (diff) | |
| download | gitlab-ce-2a7deae183a73c24bea135d75956918815a655fb.tar.gz | |
Merge branch 'bvl-missing-translations' into 'master'9-3-stable-rc3-i18n
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
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/features/dashboard/datetime_on_tooltips_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/dashboard/datetime_on_tooltips_spec.rb b/spec/features/dashboard/datetime_on_tooltips_spec.rb index 1793e323588..5296297304e 100644 --- a/spec/features/dashboard/datetime_on_tooltips_spec.rb +++ b/spec/features/dashboard/datetime_on_tooltips_spec.rb @@ -4,7 +4,7 @@ feature 'Tooltips on .timeago dates', feature: true, js: true do let(:user) { create(:user) } let(:project) { create(:project, name: 'test', namespace: user.namespace) } let(:created_date) { Date.yesterday.to_time } - let(:expected_format) { created_date.strftime('%b %-d, %Y %l:%M%P') } + let(:expected_format) { created_date.in_time_zone.strftime('%b %-d, %Y %l:%M%P') } context 'on the activity tab' do before do |