diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2016-11-22 13:59:07 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2016-11-22 13:59:07 +0800 |
| commit | 60fe975452f6781198188ae985bad7329d1aff05 (patch) | |
| tree | d75209d003ff3a3aadfef80a333ac80c28648a5f /app/serializers/deployment_entity.rb | |
| parent | 428061678eda85a65ce6a9ee15ac520af45f021a (diff) | |
| parent | 56b420ae10aa91807b5be2b8e4c18d67313d27dc (diff) | |
| download | gitlab-ce-60fe975452f6781198188ae985bad7329d1aff05.tar.gz | |
Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-access-deploy-keys
* upstream/master: (497 commits)
Use single quote for strings
Ue svg from SVGs object
Dont trigger CI builds [ci skip]
Revert "Test only migrations"
Add custom copy for each empty stage
Fetch only one revision
Highlight nav item on hover
Test only migrations
Fix migration paths tests
Scroll CA stage panel on mobile
Fix CSS declaration
administer to administrator
Move SVGs to JS objects for easy reuse
Improve deploy command message
No enough data to Not enough data
Keep the cookie name as before
Fix variable usage
Evalute time_ago method instead of printing it
Removed button styling from restricted visibility levels and added checkboxes with icons
Do not show overview message if there’s already CA data
...
Diffstat (limited to 'app/serializers/deployment_entity.rb')
| -rw-r--r-- | app/serializers/deployment_entity.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/serializers/deployment_entity.rb b/app/serializers/deployment_entity.rb index ad6fc8d665b..d610fbe0c8a 100644 --- a/app/serializers/deployment_entity.rb +++ b/app/serializers/deployment_entity.rb @@ -10,8 +10,8 @@ class DeploymentEntity < Grape::Entity deployment.ref end - expose :ref_url do |deployment| - namespace_project_tree_url( + expose :ref_path do |deployment| + namespace_project_tree_path( deployment.project.namespace, deployment.project, id: deployment.ref) |