Skip to content

G
gitlab-ce
Commit 2c8e9ac1 authored by Lin Jen-Shin's avatar Lin Jen-Shin
Browse files
Options

Resolve conflicts

parent eb2bcce2
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 364 deletions
Gemfile.lock
View file @ 2c8e9ac1
......@@ -1067,12 +1067,8 @@ DEPENDENCIES
gpgme
grape (~> 1.0)
grape-entity (~> 0.6.0)
<<<<<<< HEAD
grape-route-helpers (~> 2.0.0)
gssapi
=======
grape-route-helpers (~> 2.1.0)
>>>>>>> upstream/master
gssapi
haml_lint (~> 0.26.0)
hamlit (~> 2.6.1)
hashie-forbidden_attributes
......
app/assets/javascripts/main.js
View file @ 2c8e9ac1
......@@ -142,7 +142,6 @@ import './smart_interval';
import './star';
import './subscription';
import './subscription_select';
<<<<<<< HEAD
// EE-only scripts
import './admin_email_select';
......@@ -152,8 +151,6 @@ import './ee_trial_banner';
import './ldap_groups_select';
import './path_locks';
import './weight_select';
=======
>>>>>>> upstream/master
import './dispatcher';
......
app/assets/javascripts/vue_shared/components/popup_dialog.vue
View file @ 2c8e9ac1
......@@ -51,13 +51,7 @@ export default {
class="modal popup-dialog"
role="dialog"
tabindex="-1">
<<<<<<< HEAD
<div
class="modal-dialog"
role="document">
=======
<div class="modal-dialog" role="document">
>>>>>>> upstream/master
<div class="modal-content">
<div class="modal-header">
<button type="button"
......@@ -78,12 +72,7 @@ export default {
@click="emitSubmit(false)">
{{closeButtonLabel}}
</button>
<<<<<<< HEAD
<button
type="button"
=======
<button type="button"
>>>>>>> upstream/master
class="btn"
:class="btnKindClass"
@click="emitSubmit(true)">
......
app/views/layouts/nav/_new_admin_sidebar.html.haml
View file @ 2c8e9ac1
......@@ -13,44 +13,6 @@
%span.nav-item-name
Overview
<<<<<<< HEAD
= nav_link(controller: %w(conversational_development_index system_info background_jobs logs health_check requests_profiles audit_logs)) do
= link_to admin_conversational_development_index_path, title: 'Monitoring' do
.nav-icon-container
= custom_icon('monitoring')
%span.nav-item-name
Monitoring
%ul.sidebar-sub-level-items
= nav_link(controller: :conversational_development_index) do
= link_to admin_conversational_development_index_path, title: 'ConvDev Index' do
%span
ConvDev Index
= nav_link(controller: :system_info) do
= link_to admin_system_info_path, title: 'System Info' do
%span
System Info
= nav_link(controller: :background_jobs) do
= link_to admin_background_jobs_path, title: 'Background Jobs' do
%span
Background Jobs
= nav_link(controller: :logs) do
= link_to admin_logs_path, title: 'Logs' do
%span
Logs
= nav_link(controller: :health_check) do
= link_to admin_health_check_path, title: 'Health Check' do
%span
Health Check
= nav_link(controller: :requests_profiles) do
= link_to admin_requests_profiles_path, title: 'Requests Profiles' do
%span
Requests Profiles
= nav_link path: 'audit_logs#index' do
= link_to admin_audit_logs_path, title: 'Audit Log' do
%span
Audit Log
=======
%ul.sidebar-sub-level-items
= nav_link(controller: :dashboard, html_options: {class: 'home'}) do
= link_to admin_root_path, title: 'Overview' do
......@@ -81,13 +43,12 @@
%span
Cohorts
= nav_link(controller: %w(conversational_development_index system_info background_jobs logs health_check requests_profiles)) do
= nav_link(controller: %w(conversational_development_index system_info background_jobs logs health_check requests_profiles audit_logs)) do
= link_to admin_conversational_development_index_path, title: 'Monitoring' do
.nav-icon-container
= custom_icon('monitoring')
%span.nav-item-name
Monitoring
>>>>>>> upstream/master
%ul.sidebar-sub-level-items
= nav_link(controller: :conversational_development_index) do
......@@ -114,6 +75,10 @@
= link_to admin_requests_profiles_path, title: 'Requests Profiles' do
%span
Requests Profiles
= nav_link(path: 'audit_logs#index') do
= link_to admin_audit_logs_path, title: 'Audit Log' do
%span
Audit Log
= nav_link(controller: :broadcast_messages) do
= link_to admin_broadcast_messages_path, title: 'Messages' do
......@@ -135,49 +100,21 @@
%span.nav-item-name
Applications
<<<<<<< HEAD
= nav_link(controller: :licenses) do
= link_to admin_license_path, title: 'License' do
.nav-icon-container
= custom_icon('license')
%span.nav-item-name
License
- if akismet_enabled?
= nav_link(controller: :spam_logs) do
= link_to admin_spam_logs_path, title: "Spam Logs" do
=======
= nav_link(controller: :abuse_reports) do
= link_to admin_abuse_reports_path, title: "Abuse Reports" do
>>>>>>> upstream/master
.nav-icon-container
= custom_icon('abuse_reports')
%span.nav-item-name
Abuse Reports
%span.badge.count= number_with_delimiter(AbuseReport.count(:all))
<<<<<<< HEAD
= nav_link(controller: :push_rules) do
= link_to admin_push_rule_path, title: 'Push Rules' do
.nav-icon-container
= custom_icon('push_rules')
%span.nav-item-name
Push Rules
= nav_link(controller: :geo_nodes) do
= link_to admin_geo_nodes_path, title: 'Geo Nodes' do
.nav-icon-container
= custom_icon('geo_nodes')
%span.nav-item-name
Geo Nodes
= nav_link(controller: :deploy_keys) do
= link_to admin_deploy_keys_path, title: 'Deploy Keys' do
.nav-icon-container
= custom_icon('key')
%span.nav-item-name
Deploy Keys
=======
= nav_link(controller: :licenses) do
= link_to admin_license_path, title: 'License' do
.nav-icon-container
= custom_icon('license')
%span.nav-item-name
License
- if akismet_enabled?
= nav_link(controller: :spam_logs) do
= link_to admin_spam_logs_path, title: "Spam Logs" do
......@@ -185,7 +122,20 @@
= custom_icon('spam_logs')
%span.nav-item-name
Spam Logs
>>>>>>> upstream/master
= nav_link(controller: :push_rules) do
= link_to admin_push_rule_path, title: 'Push Rules' do
.nav-icon-container
= custom_icon('push_rules')
%span.nav-item-name
Push Rules
= nav_link(controller: :geo_nodes) do
= link_to admin_geo_nodes_path, title: 'Geo Nodes' do
.nav-icon-container
= custom_icon('geo_nodes')
%span.nav-item-name
Geo Nodes
= nav_link(controller: :deploy_keys) do
= link_to admin_deploy_keys_path, title: 'Deploy Keys' do
......
app/views/layouts/nav/_new_group_sidebar.html.haml
View file @ 2c8e9ac1
.nav-sidebar{ class: ("sidebar-icons-only" if collapsed_sidebar?) }
<<<<<<< HEAD
.context-header
= link_to group_path(@group), title: @group.name do
.avatar-container.s40.group-avatar
= image_tag group_icon(@group), class: "avatar s40 avatar-tile"
.group-title
= @group.name
%ul.sidebar-top-level-items
= nav_link(path: ['groups#show', 'groups#activity', 'groups#subgroups', 'analytics#show'], html_options: { class: 'home' }) do
= link_to group_path(@group), title: 'Group overview' do
.nav-icon-container
= custom_icon('project')
%span.nav-item-name
Overview
%ul.sidebar-sub-level-items
= nav_link(path: ['groups#show', 'groups#subgroups'], html_options: { class: 'home' }) do
= link_to group_path(@group), title: 'Group details' do
%span
Details
= nav_link(path: 'groups#activity') do
= link_to activity_group_path(@group), title: 'Activity' do
%span
Activity
- if @group.feature_available?(:contribution_analytics)
= nav_link(path: 'analytics#show') do
= link_to group_analytics_path(@group), title: 'Contribution Analytics', data: {placement: 'right'} do
%span
Contribution Analytics
= nav_link(path: ['groups#issues', 'labels#index', 'milestones#index']) do
= link_to issues_group_path(@group), title: 'Issues' do
.nav-icon-container
= custom_icon('issues')
%span.nav-item-name
- issues = IssuesFinder.new(current_user, group_id: @group.id, state: 'opened').execute
Issues
%span.badge.count= number_with_delimiter(issues.count)
%ul.sidebar-sub-level-items
= nav_link(path: 'groups#issues', html_options: { class: 'home' }) do
= link_to issues_group_path(@group), title: 'List' do
%span
List
=======
.nav-sidebar-inner-scroll
.context-header
= link_to group_path(@group), title: @group.name do
......@@ -54,13 +7,12 @@
.group-title
= @group.name
%ul.sidebar-top-level-items
= nav_link(path: ['groups#show', 'groups#activity', 'groups#subgroups'], html_options: { class: 'home' }) do
= nav_link(path: ['groups#show', 'groups#activity', 'groups#subgroups', 'analytics#show'], html_options: { class: 'home' }) do
= link_to group_path(@group), title: 'Group overview' do
.nav-icon-container
= custom_icon('project')
%span.nav-item-name
Overview
>>>>>>> upstream/master
%ul.sidebar-sub-level-items
= nav_link(path: ['groups#show', 'groups#subgroups'], html_options: { class: 'home' }) do
......@@ -73,28 +25,14 @@
%span
Activity
<<<<<<< HEAD
= nav_link(path: 'groups#merge_requests') do
= link_to merge_requests_group_path(@group), title: 'Merge Requests' do
.nav-icon-container
= custom_icon('mr_bold')
%span.nav-item-name
- merge_requests = MergeRequestsFinder.new(current_user, group_id: @group.id, state: 'opened', non_archived: true).execute
Merge Requests
%span.badge.count= number_with_delimiter(merge_requests.count)
= nav_link(path: 'group_members#index') do
= link_to group_group_members_path(@group), title: 'Members' do
.nav-icon-container
= custom_icon('members')
%span.nav-item-name
Members
- if current_user && can?(current_user, :admin_group, @group)
= nav_link(path: %w[groups#projects groups#edit ci_cd#show ldap_group_links#index hooks#index audit_events#index pipeline_quota#index]) do
= link_to edit_group_path(@group), title: 'Settings' do
=======
- if @group.feature_available?(:contribution_analytics)
= nav_link(path: 'analytics#show') do
= link_to group_analytics_path(@group), title: 'Contribution Analytics', data: {placement: 'right'} do
%span
Contribution Analytics
= nav_link(path: ['groups#issues', 'labels#index', 'milestones#index']) do
= link_to issues_group_path(@group), title: 'Issues' do
>>>>>>> upstream/master
.nav-icon-container
= custom_icon('issues')
%span.nav-item-name
......@@ -133,7 +71,7 @@
%span.nav-item-name
Members
- if current_user && can?(current_user, :admin_group, @group)
= nav_link(path: %w[groups#projects groups#edit ci_cd#show]) do
= nav_link(path: %w[groups#projects groups#edit ci_cd#show ldap_group_links#index hooks#index audit_events#index pipeline_quota#index]) do
= link_to edit_group_path(@group), title: 'Settings' do
.nav-icon-container
= custom_icon('settings')
......@@ -155,10 +93,6 @@
%span
CI / CD
<<<<<<< HEAD
= render "groups/ee/settings_nav"
= render "groups/ee/settings_nav"
= render 'shared/sidebar_toggle_button'
=======
= render 'shared/sidebar_toggle_button'
>>>>>>> upstream/master
app/views/layouts/nav/_new_profile_sidebar.html.haml
View file @ 2c8e9ac1
......@@ -2,33 +2,12 @@
.nav-sidebar-inner-scroll
.context-header
= link_to profile_path, title: 'Profile Settings' do
<<<<<<< HEAD
.nav-icon-container
= custom_icon('profile')
%span.nav-item-name
Profile
= nav_link(controller: [:accounts, :two_factor_auths]) do
= link_to profile_account_path, title: 'Account' do
.nav-icon-container
= custom_icon('account')
%span.nav-item-name
Account
- if current_application_settings.should_check_namespace_plan?
= nav_link(controller: :billings) do
= link_to profile_billings_path, title: 'Billing' do
%span
Billing
- if current_application_settings.user_oauth_applications?
= nav_link(controller: 'oauth/applications') do
= link_to applications_profile_path, title: 'Applications' do
=======
.avatar-container.s40.settings-avatar
= icon('user')
.project-title User Settings
%ul.sidebar-top-level-items
= nav_link(path: 'profiles#show', html_options: {class: 'home'}) do
= link_to profile_path, title: 'Profile Settings' do
>>>>>>> upstream/master
.nav-icon-container
= custom_icon('profile')
%span.nav-item-name
......@@ -39,6 +18,11 @@
= custom_icon('account')
%span.nav-item-name
Account
- if current_application_settings.should_check_namespace_plan?
= nav_link(controller: :billings) do
= link_to profile_billings_path, title: 'Billing' do
%span
Billing
- if current_application_settings.user_oauth_applications?
= nav_link(controller: 'oauth/applications') do
= link_to applications_profile_path, title: 'Applications' do
......@@ -77,39 +61,6 @@
= custom_icon('notifications')
%span.nav-item-name
Notifications
<<<<<<< HEAD
= nav_link(controller: :keys) do
= link_to profile_keys_path, title: 'SSH Keys' do
.nav-icon-container
= custom_icon('key')
%span.nav-item-name
SSH Keys
= nav_link(controller: :gpg_keys) do
= link_to profile_gpg_keys_path, title: 'GPG Keys' do
.nav-icon-container
= custom_icon('key_2')
%span.nav-item-name
GPG Keys
= nav_link(controller: :preferences) do
= link_to profile_preferences_path, title: 'Preferences' do
.nav-icon-container
= custom_icon('preferences')
%span.nav-item-name
Preferences
= nav_link(path: 'profiles#audit_log') do
= link_to audit_log_profile_path, title: 'Authentication log' do
.nav-icon-container
= custom_icon('authentication_log')
%span.nav-item-name
Authentication log
= nav_link(path: 'profiles#pipeline_quota') do
= link_to profile_pipeline_quota_path, title: 'Pipeline quota' do
.nav-icon-container
= custom_icon('pipeline')
%span.nav-item-name
Pipeline quota
=======
= nav_link(controller: :keys) do
= link_to profile_keys_path, title: 'SSH Keys' do
.nav-icon-container
......@@ -134,6 +85,11 @@
= custom_icon('authentication_log')
%span.nav-item-name
Authentication log
>>>>>>> upstream/master
= nav_link(path: 'profiles#pipeline_quota') do
= link_to profile_pipeline_quota_path, title: 'Pipeline quota' do
.nav-icon-container
= custom_icon('pipeline')
%span.nav-item-name
Pipeline quota
= render 'shared/sidebar_toggle_button'
app/views/layouts/nav/_new_project_sidebar.html.haml
View file @ 2c8e9ac1
......@@ -16,106 +16,6 @@
Overview
%ul.sidebar-sub-level-items
<<<<<<< HEAD
= nav_link(controller: %w(tree blob blame edit_tree new_tree find_file)) do
= link_to project_tree_path(@project) do
#{ _('Files') }
= nav_link(controller: [:commit, :commits]) do
= link_to project_commits_path(@project, current_ref) do
#{ _('Commits') }
= nav_link(html_options: {class: branches_tab_class}) do
= link_to project_branches_path(@project) do
#{ _('Branches') }
= nav_link(controller: [:tags, :releases]) do
= link_to project_tags_path(@project) do
#{ _('Tags') }
= nav_link(path: 'graphs#show') do
= link_to project_graph_path(@project, current_ref) do
#{ _('Contributors') }
= nav_link(controller: %w(network)) do
= link_to project_network_path(@project, current_ref) do
#{ s_('ProjectNetworkGraph|Graph') }
= nav_link(controller: :compare) do
= link_to project_compare_index_path(@project, from: @repository.root_ref, to: current_ref) do
#{ _('Compare') }
= nav_link(path: 'graphs#charts') do
= link_to charts_project_graph_path(@project, current_ref) do
#{ _('Charts') }
- if project_nav_tab? :container_registry
= nav_link(controller: %w[projects/registry/repositories]) do
= link_to project_container_registry_index_path(@project), title: 'Container Registry', class: 'shortcuts-container-registry' do
.nav-icon-container
= custom_icon('container_registry')
%span.nav-item-name
Registry
- if project_nav_tab? :issues
= nav_link(controller: @project.issues_enabled? ? [:issues, :labels, :milestones, :boards] : :issues) do
= link_to project_issues_path(@project), title: 'Issues', class: 'shortcuts-issues' do
.nav-icon-container
= custom_icon('issues')
%span.nav-item-name
Issues
- if @project.issues_enabled?
%span.badge.count.issue_counter= number_with_delimiter(IssuesFinder.new(current_user, project_id: @project.id).execute.opened.count)
%ul.sidebar-sub-level-items
= nav_link(controller: :issues) do
= link_to project_issues_path(@project), title: 'Issues' do
%span
List
= nav_link(controller: :boards) do
= link_to project_boards_path(@project), title: 'Boards' do
%span
Boards
= nav_link(controller: :labels) do
= link_to project_labels_path(@project), title: 'Labels' do
%span
Labels
= nav_link(controller: :milestones) do
= link_to project_milestones_path(@project), title: 'Milestones' do
%span
Milestones
- if project_nav_tab? :merge_requests
= nav_link(controller: @project.issues_enabled? ? :merge_requests : [:merge_requests, :labels, :milestones]) do
= link_to project_merge_requests_path(@project), title: 'Merge Requests', class: 'shortcuts-merge_requests' do
.nav-icon-container
= custom_icon('mr_bold')
%span.nav-item-name
Merge Requests
%span.badge.count.merge_counter.js-merge-counter= number_with_delimiter(MergeRequestsFinder.new(current_user, project_id: @project.id).execute.opened.count)
- if project_nav_tab? :pipelines
= nav_link(controller: [:pipelines, :builds, :jobs, :pipeline_schedules, :environments, :artifacts]) do
= link_to project_pipelines_path(@project), title: 'CI / CD', class: 'shortcuts-pipelines' do
.nav-icon-container
= custom_icon('pipeline')
%span.nav-item-name
CI / CD
%ul.sidebar-sub-level-items
- if project_nav_tab? :pipelines
= nav_link(path: ['pipelines#index', 'pipelines#show']) do
= link_to project_pipelines_path(@project), title: 'Pipelines', class: 'shortcuts-pipelines' do
%span
Pipelines
- if project_nav_tab? :builds
= nav_link(controller: [:jobs, :artifacts]) do
= link_to project_jobs_path(@project), title: 'Jobs', class: 'shortcuts-builds' do
=======
= nav_link(path: 'projects#show') do
= link_to project_path(@project), title: _('Project details'), class: 'shortcuts-project' do
%span= _('Details')
......@@ -191,7 +91,6 @@
%ul.sidebar-sub-level-items
= nav_link(controller: :issues) do
= link_to project_issues_path(@project), title: 'Issues' do
>>>>>>> upstream/master
%span
List
......
app/views/shared/_import_form.html.haml
View file @ 2c8e9ac1
......@@ -14,7 +14,6 @@
The import will time out after 15 minutes. For repositories that take longer, use a clone/push combination.
%li
To migrate an SVN repository, check out #{link_to "this document", help_page_path('user/project/import/svn')}.
<<<<<<< HEAD
%li
The Git LFS objects will <strong>not</strong> be imported.
%li
......@@ -31,5 +30,3 @@
repository every hour. The Git LFS objects will not be synced.
= f.hidden_field :mirror_user_id, value: current_user.id
=======
>>>>>>> upstream/master
app/workers/stuck_import_jobs_worker.rb
View file @ 2c8e9ac1
......@@ -9,13 +9,8 @@ class StuckImportJobsWorker
projects_with_jid_count = mark_projects_with_jid_as_failed!
Gitlab::Metrics.add_event(:stuck_import_jobs,
<<<<<<< HEAD
projects_without_jid_count: projects_without_jid_count,
projects_with_jid_count: projects_with_jid_count)
=======
projects_without_jid_count: projects_without_jid_count,
projects_with_jid_count: projects_with_jid_count)
>>>>>>> upstream/master
end
private
......
db/schema.rb
View file @ 2c8e9ac1
......@@ -11,11 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
<<<<<<< HEAD
ActiveRecord::Schema.define(version: 20170811203342) do
=======
ActiveRecord::Schema.define(version: 20170815060945) do
>>>>>>> upstream/master
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
......
doc/user/group/index.md
View file @ 2c8e9ac1
......@@ -243,8 +243,5 @@ for the group (GitLab admins only, available in [GitLab Enterprise Edition Start
[pipeline quota](../admin_area/settings/continuous_integration.md) for the group
[permissions]: ../permissions.md#permissions
[ee]: https://about.gitlab.com/products/
<<<<<<< HEAD
=======
[reserved]: ../reserved_names.md
>>>>>>> upstream/master
[ee]: https://about.gitlab.com/products/
doc/user/permissions.md
View file @ 2c8e9ac1
......@@ -144,9 +144,6 @@ group.
| Remove group | | | | | ✓ |
| Manage group labels | | ✓ | ✓ | ✓ | ✓ |
<<<<<<< HEAD
## External users
=======
### Subgroup permissions
When you add a member to a subgroup, they inherit the membership and
......@@ -157,7 +154,6 @@ To learn more, read through the documentation on
[subgroups memberships](group/subgroups/index.md#membership).
## External users permissions
>>>>>>> upstream/master
In cases where it is desired that a user has access only to some internal or
private projects, there is the option of creating **External Users**. This
......@@ -181,7 +177,6 @@ will find the option to flag the user as external.
By default new users are not set as external users. This behavior can be changed
by an administrator under **Admin > Application Settings**.
<<<<<<< HEAD
## Auditor users
>[Introduced][ee-998] in [GitLab Enterprise Edition Premium][eep] 8.17.
......@@ -200,10 +195,7 @@ which visibility level you select on project settings.
- Only team members: only team members will see even if your project is public or internal
- Everyone with access: everyone can see depending on your project visibility level
## GitLab CI
=======
## GitLab CI/CD permissions
>>>>>>> upstream/master
GitLab CI/CD permissions rely on the role the user has in GitLab. There are four
permission levels in total:
......
spec/models/project_spec.rb
View file @ 2c8e9ac1
......@@ -2053,11 +2053,7 @@ describe Project do
end
describe '#add_import_job' do
<<<<<<< HEAD
let!(:import_jid) { '123' }
=======
let(:import_jid) { '123' }
>>>>>>> upstream/master
context 'forked' do
let(:forked_project_link) { create(:forked_project_link, :forked_to_empty_project) }
......@@ -2070,7 +2066,6 @@ describe Project do
forked_from_project.repository_storage_path,
forked_from_project.disk_path,
project.namespace.full_path).and_return(import_jid)
<<<<<<< HEAD
expect(project.add_import_job).to eq(import_jid)
end
......@@ -2099,10 +2094,6 @@ describe Project do
expect(RepositoryUpdateMirrorWorker).to receive(:perform_async).with(project.id).and_return(import_jid)
expect(project.add_import_job).to eq(import_jid)
end
=======
expect(project.add_import_job).to eq(import_jid)
>>>>>>> upstream/master
end
end
......
spec/requests/api/settings_spec.rb
View file @ 2c8e9ac1
......@@ -45,13 +45,8 @@ describe API::Settings, 'Settings' do
default_artifacts_expire_in: '2 days',
help_page_text: 'custom help text',
help_page_hide_commercial_content: true,
<<<<<<< HEAD
project_export_enabled: false,
help_page_support_url: 'http://example.com/help'
=======
help_page_support_url: 'http://example.com/help',
project_export_enabled: false
>>>>>>> upstream/master
expect(response).to have_http_status(200)
expect(json_response['default_projects_limit']).to eq(3)
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7