diff options
7 files changed, 13 insertions, 26 deletions
diff --git a/app/views/projects/services/mattermost_slash_commands/_help.html.haml b/app/views/projects/services/mattermost_slash_commands/_help.html.haml index f13a5491a23..a26ff6ad631 100644 --- a/app/views/projects/services/mattermost_slash_commands/_help.html.haml +++ b/app/views/projects/services/mattermost_slash_commands/_help.html.haml @@ -1,5 +1,4 @@ - enabled = Gitlab.config.mattermost.enabled - .well %p This service allows users to perform common operations on this diff --git a/app/views/projects/services/slack_slash_commands/_help.html.haml b/app/views/projects/services/slack_slash_commands/_help.html.haml index bfe1ac2cbd1..521ae66dd9b 100644 --- a/app/views/projects/services/slack_slash_commands/_help.html.haml +++ b/app/views/projects/services/slack_slash_commands/_help.html.haml @@ -52,11 +52,11 @@ .input-group-btn = clipboard_button(clipboard_target: '#customize_name') - .form-group - = label_tag nil, 'Customize icon', class: 'col-sm-2 col-xs-12 control-label' - .col-sm-10.col-xs-12.text-block - = image_tag(asset_url('slash-command-logo.png'), width: 36, height: 36) - = link_to('Download image', asset_url('gitlab_logo.png'), class: 'btn btn-sm', target: '_blank', rel: 'noopener noreferrer') + .form-group + = label_tag nil, 'Customize icon', class: 'col-sm-2 col-xs-12 control-label' + .col-sm-10.col-xs-12.text-block + = image_tag(asset_url('slash-command-logo.png'), width: 36, height: 36) + = link_to('Download image', asset_url('gitlab_logo.png'), class: 'btn btn-sm', target: '_blank', rel: 'noopener noreferrer') .form-group = label_tag nil, 'Autocomplete', class: 'col-sm-2 col-xs-12 control-label' diff --git a/db/migrate/20160610201627_migrate_users_notification_level.rb b/db/migrate/20160610201627_migrate_users_notification_level.rb index 760b766828e..bc84baf7f4a 100644 --- a/db/migrate/20160610201627_migrate_users_notification_level.rb +++ b/db/migrate/20160610201627_migrate_users_notification_level.rb @@ -1,4 +1,6 @@ class MigrateUsersNotificationLevel < ActiveRecord::Migration + DOWNTIME = false + # Migrates only users who changed their default notification level :participating # creating a new record on notification settings table diff --git a/db/migrate/20160615142710_add_index_on_requested_at_to_members.rb b/db/migrate/20160615142710_add_index_on_requested_at_to_members.rb index 63f7392e54f..eb271f2e18d 100644 --- a/db/migrate/20160615142710_add_index_on_requested_at_to_members.rb +++ b/db/migrate/20160615142710_add_index_on_requested_at_to_members.rb @@ -1,4 +1,6 @@ class AddIndexOnRequestedAtToMembers < ActiveRecord::Migration + DOWNTIME = false + include Gitlab::Database::MigrationHelpers disable_ddl_transaction! diff --git a/db/migrate/20160620115026_add_index_on_runners_locked.rb b/db/migrate/20160620115026_add_index_on_runners_locked.rb index dfa5110dea4..30cc40247a6 100644 --- a/db/migrate/20160620115026_add_index_on_runners_locked.rb +++ b/db/migrate/20160620115026_add_index_on_runners_locked.rb @@ -2,6 +2,8 @@ # for more information on how to write migrations for GitLab. class AddIndexOnRunnersLocked < ActiveRecord::Migration + DOWNTIME = false + include Gitlab::Database::MigrationHelpers disable_ddl_transaction! diff --git a/db/migrate/20160715134306_add_index_for_pipeline_user_id.rb b/db/migrate/20160715134306_add_index_for_pipeline_user_id.rb index 7c991c6d998..b251038b2fb 100644 --- a/db/migrate/20160715134306_add_index_for_pipeline_user_id.rb +++ b/db/migrate/20160715134306_add_index_for_pipeline_user_id.rb @@ -1,4 +1,6 @@ class AddIndexForPipelineUserId < ActiveRecord::Migration + DOWNTIME = false + include Gitlab::Database::MigrationHelpers disable_ddl_transaction! diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index a975d560b09..4ca5eca4c82 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -231,26 +231,6 @@ describe Project, models: true do expect(project2).to be_invalid expect(project2.errors[:import_url]).to include('imports are not allowed from that URL') end - - describe 'project pending deletion' do - let!(:project_pending_deletion) do - create(:empty_project, - pending_delete: true) - end - let(:new_project) do - build(:empty_project, - name: project_pending_deletion.name, - namespace: project_pending_deletion.namespace) - end - - before do - new_project.validate - end - - it 'contains errors related to the project being deleted' do - expect(new_project.errors.full_messages.first).to eq('The project is still being deleted. Please try again later.') - end - end end describe 'default_scope' do |