From c63e334950724e2d01beb41d3f69b7530b1dcc59 Mon Sep 17 00:00:00 2001 From: Matt Lee Date: Tue, 22 Nov 2016 17:24:59 -0500 Subject: [PATCH 1/3] Hides the email address from the atom feed when no public email address is shown on the user profile --- app/views/events/_event.atom.builder | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/events/_event.atom.builder b/app/views/events/_event.atom.builder index 7890e717aa7c..c26e0269fe40 100644 --- a/app/views/events/_event.atom.builder +++ b/app/views/events/_event.atom.builder @@ -9,7 +9,9 @@ xml.entry do xml.author do xml.name event.author_name - xml.email event.author_email + unless @user.public_email.blank? + xml.email event.author_email + end end xml.summary(type: "xhtml") do |summary| -- GitLab From 32ddadc02aa1ec3e06b38d8ba6859f992c0e1d57 Mon Sep 17 00:00:00 2001 From: mattl Date: Wed, 7 Dec 2016 12:44:41 -0500 Subject: [PATCH 2/3] WIP: Adding tests to the atom feed generation. --- spec/features/atom/dashboard_issues_spec.rb | 3 +++ spec/features/atom/dashboard_spec.rb | 3 +++ spec/features/atom/issues_spec.rb | 3 +++ spec/features/atom/users_spec.rb | 3 +++ 4 files changed, 12 insertions(+) diff --git a/spec/features/atom/dashboard_issues_spec.rb b/spec/features/atom/dashboard_issues_spec.rb index 21ee6cedbae2..4583ad20d179 100644 --- a/spec/features/atom/dashboard_issues_spec.rb +++ b/spec/features/atom/dashboard_issues_spec.rb @@ -6,6 +6,9 @@ let!(:project1) { create(:project) } let!(:project2) { create(:project) } + it_behaves_like 'public email is not shown in events feed' + it_behaves_like 'uri tag includes user page URL' + before do project1.team << [user, :master] project2.team << [user, :master] diff --git a/spec/features/atom/dashboard_spec.rb b/spec/features/atom/dashboard_spec.rb index 746df36bb258..57df2d95ba66 100644 --- a/spec/features/atom/dashboard_spec.rb +++ b/spec/features/atom/dashboard_spec.rb @@ -4,6 +4,9 @@ describe "GET /" do let!(:user) { create(:user, name: "Jonh") } + it_behaves_like 'public email is not shown in events feed' + it_behaves_like 'uri tag includes user page URL' + context "projects atom feed via private token" do it "renders projects atom feed" do visit dashboard_projects_path(:atom, private_token: user.private_token) diff --git a/spec/features/atom/issues_spec.rb b/spec/features/atom/issues_spec.rb index 863412d18eb7..bf0d206c3fb4 100644 --- a/spec/features/atom/issues_spec.rb +++ b/spec/features/atom/issues_spec.rb @@ -6,6 +6,9 @@ let!(:group) { create(:group) } let!(:project) { create(:project) } let!(:issue) { create(:issue, author: user, project: project) } + + it_behaves_like 'public email is not shown in events feed' + it_behaves_like 'uri tag includes user page URL' before do project.team << [user, :developer] diff --git a/spec/features/atom/users_spec.rb b/spec/features/atom/users_spec.rb index f8c3ccb416b0..3eb751e63e84 100644 --- a/spec/features/atom/users_spec.rb +++ b/spec/features/atom/users_spec.rb @@ -4,6 +4,9 @@ describe "GET /" do let!(:user) { create(:user) } + it_behaves_like 'public email is not shown in events feed' + it_behaves_like 'uri tag includes user page URL' + context 'user atom feed via private token' do it "renders user atom feed" do visit user_path(user, :atom, private_token: user.private_token) -- GitLab From c7d245bae0667751d4fc2c1cb398e8b49357c05f Mon Sep 17 00:00:00 2001 From: mattl Date: Mon, 12 Dec 2016 13:47:07 -0500 Subject: [PATCH 3/3] GitLab 8.14 requires GitLab shell 4.0.3 --- doc/update/8.13-to-8.14.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/update/8.13-to-8.14.md b/doc/update/8.13-to-8.14.md index a0e895773ce0..c64d34074616 100644 --- a/doc/update/8.13-to-8.14.md +++ b/doc/update/8.13-to-8.14.md @@ -72,7 +72,7 @@ sudo -u git -H git checkout 8-14-stable-ee ```bash cd /home/git/gitlab-shell sudo -u git -H git fetch --all --tags -sudo -u git -H git checkout v4.0.0 +sudo -u git -H git checkout v4.0.3 ``` ### 6. Update gitlab-workhorse -- GitLab