diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-06-01 11:42:36 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-06-01 11:42:36 +0300 |
| commit | 46ac3107a4d0eaf12be8700bd33df90508e052c0 (patch) | |
| tree | b2bffbc8561667474653dd96761f97247f54e026 /spec/models | |
| parent | cb261abee199cef178a89146afb2a3d831a391a6 (diff) | |
| parent | 56f3b243ce08d105758a9b6edf96792627fa423c (diff) | |
Merge branch 'issue_15557' into 'master'
Fix error 500 when sorting issues by milestone due date and filtering by labels
fixes #15557
See merge request !4327
Diffstat (limited to 'spec/models')
| -rw-r--r-- | spec/models/concerns/issuable_spec.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/models/concerns/issuable_spec.rb b/spec/models/concerns/issuable_spec.rb index 70bbe633269..fb20578d8d3 100644 --- a/spec/models/concerns/issuable_spec.rb +++ b/spec/models/concerns/issuable_spec.rb @@ -118,10 +118,10 @@ describe Issue, "Issuable" do let(:project) { build_stubbed(:empty_project) } context "by milestone due date" do - #Correct order is: - #Issues/MRs with milestones ordered by date - #Issues/MRs with milestones without dates - #Issues/MRs without milestones + # Correct order is: + # Issues/MRs with milestones ordered by date + # Issues/MRs with milestones without dates + # Issues/MRs without milestones let!(:issue) { create(:issue, project: project) } let!(:early_milestone) { create(:milestone, project: project, due_date: 10.days.from_now) } |