summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Matyushentsev <amatyushentsev@gmail.com>2016-06-13 09:51:55 -0700
committerAlexander Matyushentsev <amatyushentsev@gmail.com>2016-06-13 09:51:55 -0700
commite8bf8ec40725a0af21677211f2d73d9b516c184a (patch)
tree5192fdb791452c2ad054fad62863c32a9685cb12
parentfcbb14f6b79ea4d97078ebae9df9a0fc4bba021e (diff)
downloadgitlab-ce-e8bf8ec40725a0af21677211f2d73d9b516c184a.tar.gz
Apply reviewer notes: update CHANGELOG, adjust code formatting
-rw-r--r--CHANGELOG3
-rw-r--r--spec/features/atom/dashboard_issues_spec.rb12
2 files changed, 7 insertions, 8 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 1e611ef481e..01c7f3c2ef3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,7 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date.
v 8.9.0 (unreleased)
- Fix Error 500 when using closes_issues API with an external issue tracker
- - Add more information into RSS feed for issues.
+ - Add more information into RSS feed for issues (Alexander Matyushentsev)
- Bulk assign/unassign labels to issues.
- Ability to prioritize labels !4009 / !3205 (Thijs Wouters)
- Fix endless redirections when accessing user OAuth applications when they are disabled
@@ -124,7 +124,6 @@ v 8.8.1
v 8.8.0
- Implement GFM references for milestones (Alejandro Rodríguez)
-v 8.8.0 (unreleased)
- Snippets tab under user profile. !4001 (Long Nguyen)
- Fix error when using link to uploads in global snippets
- Fix Error 500 when attempting to retrieve project license when HEAD points to non-existent ref
diff --git a/spec/features/atom/dashboard_issues_spec.rb b/spec/features/atom/dashboard_issues_spec.rb
index 9a4eb8f9504..4dd9548cfc5 100644
--- a/spec/features/atom/dashboard_issues_spec.rb
+++ b/spec/features/atom/dashboard_issues_spec.rb
@@ -2,9 +2,9 @@ require 'spec_helper'
describe "Dashboard Issues Feed", feature: true do
describe "GET /issues" do
- let!(:user) { create(:user) }
- let!(:project1) { create(:project) }
- let!(:project2) { create(:project) }
+ let!(:user) { create(:user) }
+ let!(:project1) { create(:project) }
+ let!(:project2) { create(:project) }
before do
project1.team << [user, :master]
@@ -12,7 +12,7 @@ describe "Dashboard Issues Feed", feature: true do
end
describe "atom feed" do
- it "should render atom feed via private token" do
+ it "renders atom feed via private token" do
visit issues_dashboard_path(:atom, private_token: user.private_token)
expect(response_headers['Content-Type']).to have_content('application/atom+xml')
@@ -22,7 +22,7 @@ describe "Dashboard Issues Feed", feature: true do
context "issue with basic fields" do
let!(:issue2) { create(:issue, author: user, assignee: user, project: project2, description: 'test desc') }
- it "should render issue fields" do
+ it "renders issue fields" do
visit issues_dashboard_path(:atom, private_token: user.private_token)
entry = find(:xpath, "//feed/entry[contains(summary/text(),'#{issue2.title}')]")
@@ -45,7 +45,7 @@ describe "Dashboard Issues Feed", feature: true do
issue1.labels << label1
end
- it "should render issue label and milestone info" do
+ it "renders issue label and milestone info" do
visit issues_dashboard_path(:atom, private_token: user.private_token)
entry = find(:xpath, "//feed/entry[contains(summary/text(),'#{issue1.title}')]")