diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-06-14 13:44:03 +0200 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-06-14 13:44:03 +0200 |
| commit | ab9a8643d80c178d4d16c15f4f72deb65210074c (patch) | |
| tree | 9c0ff13c7aaaac4624389a640c1a5d45a40358bb /db/migrate/20150306023112_add_unique_index_to_namespace.rb | |
| parent | d8c4556d3c8623bf48e689f3734c9c35cda34c2f (diff) | |
| parent | 066020fcd015ca92397b794342a49a46dd02582c (diff) | |
| download | gitlab-ce-ab9a8643d80c178d4d16c15f4f72deb65210074c.tar.gz | |
Merge branch 'master' into fix/status-of-pipeline-without-builds
* master: (538 commits)
Fix broken URI joining for `teamcity_url` with suffixes
Factorize duplicated code into a method in BambooService and update specs
Fix broken URI joining for `bamboo_url` with suffixes
Honor credentials on calling Bamboo CI trigger
Update CHANGELOG
Use Issue.visible_to_user in Notes.search to avoid query duplication
Project members with guest role can't access confidential issues
Allow users to create confidential issues in private projects
Update CHANGELOG
Remove deprecated issues_tracker and issues_tracker_id from project
Schema doesn’t reflect the changes of the last 3 migrations
Apply reviewer notes: update CHANGELOG, adjust code formatting
Move issue rendering tests into separate contexts
Move change description to proper release and fix typo
Add more information into RSS fead for issues
Revert CHANGELOG
Also rename "find" in the specs
Change to new Notes styleguide
Add guide on changing a document's location
Change logs.md location in README
...
Conflicts:
app/services/ci/create_builds_service.rb
app/services/ci/create_pipeline_service.rb
app/services/create_commit_builds_service.rb
spec/models/ci/commit_spec.rb
spec/services/ci/create_builds_service_spec.rb
spec/services/create_commit_builds_service_spec.rb
Diffstat (limited to 'db/migrate/20150306023112_add_unique_index_to_namespace.rb')
| -rw-r--r-- | db/migrate/20150306023112_add_unique_index_to_namespace.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/db/migrate/20150306023112_add_unique_index_to_namespace.rb b/db/migrate/20150306023112_add_unique_index_to_namespace.rb index 6472138e3ef..f293a9b643f 100644 --- a/db/migrate/20150306023112_add_unique_index_to_namespace.rb +++ b/db/migrate/20150306023112_add_unique_index_to_namespace.rb @@ -1,3 +1,4 @@ +# rubocop:disable all class AddUniqueIndexToNamespace < ActiveRecord::Migration def change remove_index :namespaces, column: :name if index_exists?(:namespaces, :name) |