Commit 74a4879a authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Rename group statistics to contribution analytics

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent e5fad914
...@@ -4,7 +4,7 @@ v 8.3.0 ...@@ -4,7 +4,7 @@ v 8.3.0
- License information can now be retrieved via the API - License information can now be retrieved via the API
- Show Kerberos clone url when Kerberos enabled and url different than HTTP url (Borja Aparicio) - Show Kerberos clone url when Kerberos enabled and url different than HTTP url (Borja Aparicio)
- Fix bug with negative approvals required - Fix bug with negative approvals required
- Add group contribution statistics page - Add group contribution analytics page
- Add GitLab Pages - Add GitLab Pages
v 8.2.3 v 8.2.3
......
class Groups::StatsController < Groups::ApplicationController class Groups::AnalyticsController < Groups::ApplicationController
before_action :group before_action :group
layout 'group' layout 'group'
......
- page_title "Statistics" - page_title "Contribution Analytics"
- header_title group_title(@group, "Statistics", group_stats_path(@group)) - header_title group_title(@group, "Contribution Analytics", group_analytics_path(@group))
.gray-content-block .gray-content-block
.pull-right .pull-right
...@@ -9,16 +9,16 @@ ...@@ -9,16 +9,16 @@
%b.caret %b.caret
%ul.dropdown-menu %ul.dropdown-menu
%li %li
= link_to group_stats_path(@group, start_date: Date.today - 1.week) do = link_to group_analytics_path(@group, start_date: Date.today - 1.week) do
Last week Last week
%li %li
= link_to group_stats_path(@group, start_date: Date.today - 1.month) do = link_to group_analytics_path(@group, start_date: Date.today - 1.month) do
Last month Last month
%li %li
= link_to group_stats_path(@group, start_date: Date.today - 3.months) do = link_to group_analytics_path(@group, start_date: Date.today - 3.months) do
Last 3 months Last 3 months
.oneline .oneline
Contribution statistics for issues, merge requests and push events since #{@start_date} Contribution analytics for issues, merge requests and push events since #{@start_date}
%h3 Push %h3 Push
......
...@@ -39,10 +39,10 @@ ...@@ -39,10 +39,10 @@
%span %span
Members Members
= nav_link(controller: [:stats]) do = nav_link(controller: [:stats]) do
= link_to group_stats_path(@group), title: 'Stats', data: {placement: 'right'} do = link_to group_analytics_path(@group), title: 'Contribution Analytics', data: {placement: 'right'} do
= icon('table fw') = icon('bar-chart fw')
%span %span
Statistics Contribution Analytics
- if can?(current_user, :admin_group, @group) - if can?(current_user, :admin_group, @group)
= nav_link(html_options: { class: "separate-item" }) do = nav_link(html_options: { class: "separate-item" }) do
= link_to edit_group_path(@group), title: 'Settings' do = link_to edit_group_path(@group), title: 'Settings' do
......
...@@ -369,7 +369,7 @@ Rails.application.routes.draw do ...@@ -369,7 +369,7 @@ Rails.application.routes.draw do
end end
scope module: :groups do scope module: :groups do
resource :stats, only: [:show] resource :analytics, only: [:show]
resource :ldap, only: [] do resource :ldap, only: [] do
member do member do
put :reset_access put :reset_access
......
Feature: Group Statistics Feature: Group Analytics
Background: Background:
Given I sign in as "John Doe" Given I sign in as "John Doe"
And "John Doe" is owner of group "Owned" And "John Doe" is owner of group "Owned"
Scenario: I should see group "Owned" statistics page Scenario: I should see group "Owned" analytics page
When I visit group "Owned" page When I visit group "Owned" page
And I click on group statistics And I click on group analytics
Then I should see group statistics page Then I should see group analytics page
class Spinach::Features::GroupAnalytics < Spinach::FeatureSteps
include SharedAuthentication
include SharedPaths
include SharedGroup
include SharedUser
step 'I click on group analytics' do
click_link 'Contribution Analytics'
end
step 'I should see group analytics page' do
expect(page).to have_content "Contribution analytics for issues, merge requests and push"
end
end
class Spinach::Features::GroupStatistics < Spinach::FeatureSteps
include SharedAuthentication
include SharedPaths
include SharedGroup
include SharedUser
step 'I click on group statistics' do
click_link 'Statistics'
end
step 'I should see group statistics page' do
expect(page).to have_content "Contribution statistics for issues, merge requests and push"
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment