diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-02-06 15:40:27 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-02-06 15:40:27 +0000 |
| commit | 54bafe87336e47c77ec80c9ab28749113c1395cc (patch) | |
| tree | df28787eb2f2b31fe2ceb9a75d20f8b43d930a83 /app/views/projects/pipelines/_head.html.haml | |
| parent | 6c873b11b5d0c582a9613008bc4f28600bbd6579 (diff) | |
| parent | e438b30a315e092e03afa9d84f8a9e57ded3b0a2 (diff) | |
| download | gitlab-ce-54bafe87336e47c77ec80c9ab28749113c1395cc.tar.gz | |
Merge branch 'master' into zj-create-mattermost-team
* master: (313 commits)
Introduce maximum session time for terminal websocket connection
add CHANGELOG entry for !8988
transpile all javascript files with babel
add npm run webpack command
lazy-load ace config so that we can ensure window.gon exists
fix ace editor modules to include asset digest in production
Ensure the right content is served for the build artifacts API
Add index to labels for `type` and project_id`
fix rack-proxy dependency in production
Fixed typo
fix failing test
fix Vue warnings for missing element
[ci skip] UX Guide: Button placement in groups
Change window size before visiting page, to get correct scroll position
Fix slash commands spec error
Move project services to new location under Integrations
Move webhooks to new a location under Integrations
Fixed eslint test failure
Fixed adding to list bug
Remove unnecessary queries for .atom and .json in Dashboard::ProjectsController#index
...
Diffstat (limited to 'app/views/projects/pipelines/_head.html.haml')
| -rw-r--r-- | app/views/projects/pipelines/_head.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/pipelines/_head.html.haml b/app/views/projects/pipelines/_head.html.haml index b10dd47709f..721a9b6beb5 100644 --- a/app/views/projects/pipelines/_head.html.haml +++ b/app/views/projects/pipelines/_head.html.haml @@ -11,9 +11,9 @@ - if project_nav_tab? :builds = nav_link(controller: %w(builds)) do - = link_to project_builds_path(@project), title: 'Builds', class: 'shortcuts-builds' do + = link_to project_builds_path(@project), title: 'Jobs', class: 'shortcuts-builds' do %span - Builds + Jobs - if project_nav_tab? :environments = nav_link(controller: %w(environments)) do |