diff options
| author | Gokmen Goksel <gokmen@goksel.me> | 2016-08-02 22:26:07 +0300 |
|---|---|---|
| committer | Mark Pundsack <markpundsack@users.noreply.github.com> | 2016-08-03 22:12:42 +0300 |
| commit | ed3d03893e8aa6b49de5b505f55d63149bc9b748 (patch) | |
| tree | 0f05d7174eb6e194c8e52c61afbb4423ebdfeeb0 | |
| parent | a6a21f4ebd1d66a4e4c6db5bf63bf891bf0a48d4 (diff) | |
rename: /get_koding_link/koding_project_url/g
| -rw-r--r-- | app/helpers/projects_helper.rb | 3 | ||||
| -rw-r--r-- | app/views/koding/index.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/_show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/show.html.haml | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 562fbce844b..a6ecf48fd18 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -274,8 +274,7 @@ resource: end - def get_koding_link(project = nil, branch = nil) - + def koding_project_url(project = nil, branch = nil) if project route = "/Home/Stacks/run/#{project.path_with_namespace}" if branch diff --git a/app/views/koding/index.html.haml b/app/views/koding/index.html.haml index 4cb45b7e4a0..6afa22b96d2 100644 --- a/app/views/koding/index.html.haml +++ b/app/views/koding/index.html.haml @@ -6,7 +6,7 @@ %p = icon('circle', class: 'cgreen') Integration is active for - = link_to get_koding_link(), target: '_blank' do + = link_to koding_project_url, target: '_blank' do #{Gitlab.config.koding.url} - else %p diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index 7d3e5ffce15..32bba9ba9cd 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -15,7 +15,7 @@ .pull-right - if @merge_request.source_branch_exists? - if Gitlab.config.koding.enabled && @repository.koding_yml - = link_to get_koding_link(@project, @merge_request.source_branch), class: "btn inline btn-grouped btn-sm btn-create", target: '_blank' do + = link_to koding_project_url(@project, @merge_request.source_branch), class: "btn inline btn-grouped btn-sm btn-create", target: '_blank' do Try on Koding = link_to "#modal_merge_info", class: "btn inline btn-grouped btn-sm", "data-toggle" => "modal" do Check out branch diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index d4e8ef2cc68..9b0cf80231a 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -67,7 +67,7 @@ - if Gitlab.config.koding.enabled - if @repository.koding_yml %li.koding - = link_to get_koding_link(@project), target: '_blank' do + = link_to koding_project_url(@project), target: '_blank' do Run On Koding - else %li.missing |