diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-01-05 21:40:35 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-01-05 21:40:35 +0300 |
| commit | 8181f58d4407ee273cdf5792aa810d2b008f63d6 (patch) | |
| tree | feb96cdecf106abc4d0272641577191393360cf1 /app/models | |
| parent | e4da8b11a2222a4ef12025e08b250a5c78dfa2c9 (diff) | |
| parent | cd85baf5e363847ee1cca2e154e5fb47484e0fdf (diff) | |
Merge branch 'master' into auto-pipelines-vue
* master: (35 commits)
Adds back removed class in merge request pipelines table
Fix dropdown icon alignment
Simplify HTML of mini pipeline graph and dropdown Creates individual html for dropdown Adds simplified CSS for the new dropdown Removes old CSS Improves dropdown item in Chrome, Firefox and Safari Use SCSS variables for colors. Fix scss linter errors Adds animation when the stage is hovered. Adds back tooltip on dropdown toggle Fixes broken tests additional css changes to get more into direction of mockups
Adds CHANGELOG entry
Removes unneeded `window` declaration
Decreases font-size on login page
Ensure internal Gitlab::Git references use the namespace
Absorb gitlab_git
Fix review comments.
Add spec for note edit and fix one commented spec.
Review fixes.
Use gl.utils.isInViewport and improve gl.utils.animateToElement.
Make sure elements share the same scope
Hide edit warning element when form reverted.
Remove unnecessary styling came from merge conflicts.
Fix single note edit form specs.
Separate edit form in Changes and Discussions tab.
Fix warning styling for responsive design.
Fix task list for single edit note widget changes.
Fix notes spec.
...
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/merge_request_diff.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index b8f36a2c958..64dd586c9e0 100644 --- a/app/models/merge_request_diff.rb +++ b/app/models/merge_request_diff.rb @@ -1,7 +1,7 @@ class MergeRequestDiff < ActiveRecord::Base include Sortable include Importable - include EncodingHelper + include Gitlab::Git::EncodingHelper # Prevent store of diff if commits amount more then 500 COMMITS_SAFE_SIZE = 100 |