diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-08-08 16:15:16 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-08-08 16:15:16 +0100 |
| commit | 23334ac0a151a60ada07b643f703dd0a75223094 (patch) | |
| tree | c4e5271de7a5d4842b83179eb7899f9da479b39e /lib/tasks/haml-lint.rake | |
| parent | 15441f0ef564e87f2ffb672452b0fb9d7bd1d44e (diff) | |
| parent | 6a6a1e5b9e0a82735f786ffedeacc7cbc33ed7cd (diff) | |
| download | gitlab-ce-23334ac0a151a60ada07b643f703dd0a75223094.tar.gz | |
Merge branch 'master' into issue-discussions-refactor
* master: (481 commits)
Make sure that we have author and committer
disable file upload button while uploading
Fix bar chart does not display label at hour 0
Fixed activity not loading on project homepage
Expose noteable_iid in Note
Fix fly-out width when it has long items
Add a test to show that threshold 40 would corrupt
Add changelog entry
Raise encoding confidence threshold to 50
Fix the /projects/:id/repository/commits endpoint to handle dots in the ref name when the project full path contains a `/`
Fix the /projects/:id/repository/tags endpoint to handle dots in the tag name when the project full path contains a `/`
Add Italian translations of Pipeline Schedules
Restrict InlineJavaScript for haml_lint to dev and test environment
Incorporate Gitaly's CommitService.FindCommit RPC
Move `deltas` and `diff_from_parents` logic to Gitlab::Git::Commit
fix repo_edit_button_spec.js
fix test failures in repo_preview_spec.js
fix repo_loading_file_spec tests
Refactor Gitlab::Git::Commit to include a repository
use 100vh instead of flip flopping between the two - works on all suported browsers
...
Diffstat (limited to 'lib/tasks/haml-lint.rake')
| -rw-r--r-- | lib/tasks/haml-lint.rake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/tasks/haml-lint.rake b/lib/tasks/haml-lint.rake index 609dfaa48e3..ad2d034b0b4 100644 --- a/lib/tasks/haml-lint.rake +++ b/lib/tasks/haml-lint.rake @@ -1,5 +1,6 @@ unless Rails.env.production? require 'haml_lint/rake_task' + require 'haml_lint/inline_javascript' HamlLint::RakeTask.new end |