Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
516a3b78
Commit
516a3b78
authored
Jun 22, 2017
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Annotate" to "Blame"
parent
5cd1a48d
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
5 additions
and
10 deletions
+5
-10
app/assets/stylesheets/framework/files.scss
app/assets/stylesheets/framework/files.scss
+1
-1
app/views/projects/blame/show.html.haml
app/views/projects/blame/show.html.haml
+1
-1
app/views/projects/blob/_breadcrumb.html.haml
app/views/projects/blob/_breadcrumb.html.haml
+1
-1
changelogs/unreleased/10378-promote-blameless-culture.yml
changelogs/unreleased/10378-promote-blameless-culture.yml
+0
-4
features/steps/project/source/browse_files.rb
features/steps/project/source/browse_files.rb
+0
-1
spec/features/projects/blobs/blob_line_permalink_updater_spec.rb
...atures/projects/blobs/blob_line_permalink_updater_spec.rb
+1
-1
spec/features/projects/files/browse_files_spec.rb
spec/features/projects/files/browse_files_spec.rb
+1
-1
No files found.
app/assets/stylesheets/framework/files.scss
View file @
516a3b78
...
...
@@ -123,7 +123,7 @@
}
/**
*
Annotat
e file
*
Blam
e file
*/
&
.blame
{
table
{
...
...
app/views/projects/blame/show.html.haml
View file @
516a3b78
-
@no_container
=
true
-
project_duration
=
age_map_duration
(
@blame_groups
,
@project
)
-
page_title
"
Annotat
e"
,
@blob
.
path
,
@ref
-
page_title
"
Blam
e"
,
@blob
.
path
,
@ref
=
render
"projects/commits/head"
%div
{
class:
container_class
}
...
...
app/views/projects/blob/_breadcrumb.html.haml
View file @
516a3b78
...
...
@@ -27,7 +27,7 @@
=
link_to
'Normal view'
,
namespace_project_blob_path
(
@project
.
namespace
,
@project
,
@id
),
class:
'btn'
-
else
=
link_to
'
Annotat
e'
,
namespace_project_blame_path
(
@project
.
namespace
,
@project
,
@id
),
=
link_to
'
Blam
e'
,
namespace_project_blame_path
(
@project
.
namespace
,
@project
,
@id
),
class:
'btn js-blob-blame-link'
unless
blob
.
empty?
=
link_to
'History'
,
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
@id
),
...
...
changelogs/unreleased/10378-promote-blameless-culture.yml
deleted
100644 → 0
View file @
5cd1a48d
---
title
:
Changed Blame to Annotate in the UI to promote blameless culture
merge_request
:
10378
author
:
Ilya Vassilevsky
features/steps/project/source/browse_files.rb
View file @
516a3b78
...
...
@@ -369,7 +369,6 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
expect
(
page
).
to
have_content
'Permalink'
expect
(
page
).
not_to
have_content
'Edit'
expect
(
page
).
not_to
have_content
'Blame'
expect
(
page
).
not_to
have_content
'Annotate'
expect
(
page
).
to
have_content
'Delete'
expect
(
page
).
to
have_content
'Replace'
end
...
...
spec/features/projects/blobs/blob_line_permalink_updater_spec.rb
View file @
516a3b78
...
...
@@ -55,7 +55,7 @@ feature 'Blob button line permalinks (BlobLinePermalinkUpdater)', feature: true,
end
end
describe
'Click "
Annotat
e" button'
do
describe
'Click "
Blam
e" button'
do
it
'works with no initial line number fragment hash'
do
visit_blob
...
...
spec/features/projects/files/browse_files_spec.rb
View file @
516a3b78
...
...
@@ -12,7 +12,7 @@ feature 'user browses project', feature: true, js: true do
scenario
"can see blame of '.gitignore'"
do
click_link
".gitignore"
click_link
'
Annotat
e'
click_link
'
Blam
e'
expect
(
page
).
to
have_content
"*.rb"
expect
(
page
).
to
have_content
"Dmitriy Zaporozhets"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment