diff options
| author | Vinnie Okada <vokada@mrvinn.com> | 2015-02-19 20:53:05 -0700 |
|---|---|---|
| committer | Vinnie Okada <vokada@mrvinn.com> | 2015-02-19 20:53:05 -0700 |
| commit | 9e9ce95d62ec4feb76c3ec238dd3189c781f40ce (patch) | |
| tree | 28939e566ce29a278cd7ae15e37266aa6a16a17c /app/assets/javascripts/merge_request.js.coffee | |
| parent | 76aad9b76ed756ca9ba2cbcdb399c815e542b3ae (diff) | |
| parent | de040ffaaef4ad5ebd93b3f7a237add438dbddd5 (diff) | |
| download | gitlab-ce-9e9ce95d62ec4feb76c3ec238dd3189c781f40ce.tar.gz | |
Merge branch 'master' into rails-4.1.9
Conflicts:
app/views/dashboard/_project.html.haml
app/views/events/event/_common.html.haml
app/views/explore/projects/_project.html.haml
app/views/groups/_projects.html.haml
app/views/projects/_home_panel.html.haml
app/views/projects/_issues_nav.html.haml
app/views/projects/issues/_discussion.html.haml
app/views/projects/issues/_issues.html.haml
app/views/projects/issues/show.html.haml
app/views/projects/merge_requests/_discussion.html.haml
app/views/projects/merge_requests/_show.html.haml
app/views/projects/milestones/index.html.haml
app/views/projects/notes/_edit_form.html.haml
app/views/shared/_issuable_filter.html.haml
Diffstat (limited to 'app/assets/javascripts/merge_request.js.coffee')
| -rw-r--r-- | app/assets/javascripts/merge_request.js.coffee | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/javascripts/merge_request.js.coffee b/app/assets/javascripts/merge_request.js.coffee index 5bcbd56852d..757592842eb 100644 --- a/app/assets/javascripts/merge_request.js.coffee +++ b/app/assets/javascripts/merge_request.js.coffee @@ -20,6 +20,12 @@ class @MergeRequest if $("a.btn-close").length $("li.task-list-item input:checkbox").prop("disabled", false) + $('.issuable-affix').affix offset: + top: -> + @top = $('.merge-request-details').outerHeight(true) + 70 + bottom: -> + @bottom = $('.footer').outerHeight(true) + # Local jQuery finder $: (selector) -> this.$el.find(selector) |