Commit 0ff6f13e authored by Lin Jen-Shin's avatar Lin Jen-Shin

Resolve conflicts

parent 0e00c169
......@@ -456,7 +456,6 @@
margin: 5px;
}
<<<<<<< HEAD
.boards-title-holder {
padding: 25px 13px $gl-padding;
......@@ -477,8 +476,6 @@
border-top: 1px solid $border-color;
}
=======
>>>>>>> upstream/master
.page-with-contextual-sidebar.page-with-sidebar .issue-boards-sidebar {
.issuable-sidebar-header {
position: relative;
......
......@@ -9,15 +9,10 @@
Enterprise Edition
- if user_signed_in?
%span= Gitlab::VERSION
<<<<<<< HEAD
%small= link_to Gitlab::REVISION, Gitlab::COM_URL + namespace_project_commits_path('gitlab-org', 'gitlab-ee', Gitlab::REVISION)
- if current_application_settings.version_check_enabled
= version_status_badge
=======
%small= link_to Gitlab::REVISION, Gitlab::COM_URL + namespace_project_commits_path('gitlab-org', 'gitlab-ce', Gitlab::REVISION)
= version_status_badge
>>>>>>> upstream/master
%p.slead
GitLab is open source software to collaborate on code.
%br
......
......@@ -161,7 +161,6 @@ ActiveRecord::Schema.define(version: 20171017145932) do
t.integer "circuitbreaker_failure_wait_time", default: 30
t.integer "circuitbreaker_failure_reset_time", default: 1800
t.integer "circuitbreaker_storage_timeout", default: 30
<<<<<<< HEAD
t.boolean "remote_mirror_available", default: true, null: false
t.integer "circuitbreaker_access_retries", default: 3
t.integer "circuitbreaker_backoff_threshold", default: 80
......@@ -182,10 +181,6 @@ ActiveRecord::Schema.define(version: 20171017145932) do
t.integer "group_id", null: false
t.datetime "created_at"
t.datetime "updated_at"
=======
t.integer "circuitbreaker_access_retries", default: 3
t.integer "circuitbreaker_backoff_threshold", default: 80
>>>>>>> upstream/master
end
add_index "approver_groups", ["group_id"], name: "index_approver_groups_on_group_id", using: :btree
......
......@@ -70,11 +70,8 @@ PUT /application/settings
| `after_sign_up_text` | string | no | Text shown to the user after signing up |
| `akismet_api_key` | string | no | API key for akismet spam protection |
| `akismet_enabled` | boolean | no | Enable or disable akismet spam protection |
<<<<<<< HEAD
| `allow_group_owners_to_manage_ldap` | boolean | no | Set to `true` to allow group owners to manage LDAP |
| `authorized_keys_enabled` | boolean | no | By default, we write to the "authorized_keys" file to support Git over SSH without additional configuration. GitLab can be optimized to authenticate SSH keys via the database file. Only disable this if you have configured your OpenSSH server to use the AuthorizedKeysCommand. |
=======
>>>>>>> upstream/master
| `circuitbreaker_access_retries | integer | no | The number of attempts GitLab will make to access a storage. |
| `circuitbreaker_backoff_threshold | integer | no | The number of failures after which GitLab will start temporarily disabling access to a storage shard on a host. |
| `circuitbreaker_failure_count_threshold` | integer | no | The number of failures of after which GitLab will completely prevent access to the storage. |
......
......@@ -30,17 +30,10 @@ With GitLab merge requests, you can:
With **[GitLab Enterprise Edition][ee]**, you can also:
<<<<<<< HEAD
- View the deployment process across projects with [Multi-Project Pipeline Graphs](../../../ci/multi_project_pipeline_graphs.md) (available only in GitLab Enterprise Edition Premium)
- Request [approvals](#merge-request-approvals) from your managers (available in GitLab Enterprise Edition Starter)
- [Squash and merge](#squash-and-merge) for a cleaner commit history (available in GitLab Enterprise Edition Starter)
- Analyze the impact of your changes with [Code Quality reports](#code-quality-reports) (available in GitLab Enterprise Edition Starter)
=======
- View the deployment process across projects with [Multi-Project Pipeline Graphs](https://docs.gitlab.com/ee/ci/multi_project_pipeline_graphs.html#multi-project-pipeline-graphs) (available only in GitLab Enterprise Edition Premium)
- Request [approvals](https://docs.gitlab.com/ee/user/project/merge_requests/merge_request_approvals.html) from your managers (available in GitLab Enterprise Edition Starter)
- [Squash and merge](https://docs.gitlab.com/ee/user/project/merge_requests/squash_and_merge.html) for a cleaner commit history (available in GitLab Enterprise Edition Starter)
- Analise the impact of your changes with [Code Quality reports](https://docs.gitlab.com/ee/user/project/merge_requests/code_quality_diff.html) (available in GitLab Enterprise Edition Starter)
>>>>>>> upstream/master
## Use cases
......
......@@ -8,13 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gitlab 1.0.0\n"
"Report-Msgid-Bugs-To: \n"
<<<<<<< HEAD
"POT-Creation-Date: 2017-10-18 11:13+0200\n"
"PO-Revision-Date: 2017-10-18 11:13+0200\n"
=======
"POT-Creation-Date: 2017-10-22 16:40+0300\n"
"PO-Revision-Date: 2017-10-22 16:40+0300\n"
>>>>>>> upstream/master
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
......@@ -120,12 +115,9 @@ msgstr ""
msgid "AdminHealthPageLink|health page"
msgstr ""
<<<<<<< HEAD
=======
msgid "Advanced settings"
msgstr ""
>>>>>>> upstream/master
msgid "All"
msgstr ""
......@@ -198,7 +190,6 @@ msgstr ""
msgid "AutoDevOps|You can activate %{link_to_settings} for this project."
msgstr ""
<<<<<<< HEAD
msgid "Billing"
msgstr ""
......@@ -253,8 +244,6 @@ msgstr ""
msgid "BillingPlans|per user"
msgstr ""
=======
>>>>>>> upstream/master
msgid "Branch"
msgid_plural "Branches"
msgstr[0] ""
......@@ -491,12 +480,9 @@ msgstr ""
msgid "ClusterIntegration|A %{link_to_container_project} must have been created under this account"
msgstr ""
<<<<<<< HEAD
msgid "ClusterIntegration|Advanced settings"
msgstr ""
=======
>>>>>>> upstream/master
msgid "ClusterIntegration|Cluster details"
msgstr ""
......@@ -2250,15 +2236,12 @@ msgstr ""
msgid "We don't have enough data to show this stage."
msgstr ""
<<<<<<< HEAD
msgid "Webhooks allow you to trigger a URL if, for example, new code is pushed or a new issue is created. You can configure webhooks to listen for specific events like pushes, issues or merge requests. Group webhooks will apply to all projects in a group, allowing you to standardize webhook functionality across your entire group."
msgstr ""
msgid "Weight"
msgstr ""
=======
>>>>>>> upstream/master
msgid "When access to a storage fails. GitLab will prevent access to the storage for the time specified here. This allows the filesystem to recover. Repositories on failing shards are temporarly unavailable"
msgstr ""
......
......@@ -27,7 +27,6 @@ shared_examples 'update invalid issuable' do |klass|
it 'renders edit when format is html' do
put :update, params
<<<<<<< HEAD
expect(response).to render_template(:edit)
expect(assigns[:conflict]).to be_truthy
......@@ -35,11 +34,6 @@ shared_examples 'update invalid issuable' do |klass|
if klass == MergeRequest && issuable.requires_approve?
expect(assigns[:suggested_approvers]).to be_an(Array)
end
=======
expect(response).to render_template(:edit)
expect(assigns[:conflict]).to be_truthy
>>>>>>> upstream/master
end
it 'renders json error message when format is json' do
......
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