Skip to content

GitLab

Why GitLab
Pricing
Contact Sales
Explore

Sign in
Get free trial

Primary navigation

Project

GitLab FOSS
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Jira
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

Admin message

Do not update/delete: Banner broadcast message test data

Admin message

Do not update/delete: Notification broadcast message test data

086700fa

Commit 086700fa authored 8 years ago by Ruben Davila

Downloads
- Plain Diff

Merge branch 'js-translations' into 28433-internationalise-cycle-analytics-page

Conflicts:
	config/webpack.config.js

parents 7ceb0efc 7d16537c

Branches

Tags

1 merge request!10669Internationalise Cycle Analytics page

Changes 27

Show whitespace changes

Inline Side-by-side

Showing

app/views/projects/cycle_analytics/_no_access.html.haml 2 additions, 2 deletions

app/views/projects/cycle_analytics/_no_access.html.haml
app/views/projects/cycle_analytics/show.html.haml 15 additions, 13 deletions

app/views/projects/cycle_analytics/show.html.haml
config/webpack.config.js 13 additions, 0 deletions

config/webpack.config.js
package.json 2 additions, 0 deletions

package.json
spec/javascripts/cycle_analytics/limit_warning_component_spec.js 3 additions, 0 deletions

...vascripts/cycle_analytics/limit_warning_component_spec.js
spec/javascripts/vue_shared/translate_spec.js 90 additions, 0 deletions

spec/javascripts/vue_shared/translate_spec.js
yarn.lock 15 additions, 4 deletions

yarn.lock

with 140 additions and 19 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment