diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-05 23:26:14 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-05 23:26:14 +0200 |
| commit | 891bc414b13a1c6e2a9a09261de1ba3e36270f2f (patch) | |
| tree | 8f51389367d69d9779591842894bec745ce4ba51 /app | |
| parent | fed9a3d5c8941dc50ba711d1dd64263bf8d02ae1 (diff) | |
| download | gitlab-ce-891bc414b13a1c6e2a9a09261de1ba3e36270f2f.tar.gz | |
Fix merge_request js -> ci_path
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/merge_requests.js.coffee | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/merge_requests.js.coffee b/app/assets/javascripts/merge_requests.js.coffee index a73d04580af..cdc685f2c09 100644 --- a/app/assets/javascripts/merge_requests.js.coffee +++ b/app/assets/javascripts/merge_requests.js.coffee @@ -35,7 +35,7 @@ class MergeRequest , 'json' if @opts.ci_enable - $.get self.opts.url_to_ci_check, (data) => + $.get @opts.url_to_ci_check, (data) => this.showCiState data.status , 'json' @@ -94,4 +94,4 @@ class MergeRequest this.$('.merge-in-progress').hide() this.$('.automerge_widget.already_cannot_be_merged').show() -this.MergeRequest = MergeRequest
\ No newline at end of file +this.MergeRequest = MergeRequest |