| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into developer_can_push_to_protected_branches_option | Marin Jankovski | 2014-12-29 | 3 | -0/+92 |
| |\ | | | | | | | | | Conflicts: db/schema.rb | ||||
| | * | Doorkeeper integration | Valery Sizov | 2014-12-24 | 3 | -1/+93 |
| | | | |||||
| * | | Add migration for developers can push to protected branches flag. | Marin Jankovski | 2014-12-26 | 2 | -4/+10 |
| |/ | |||||
| * | Merge branch 'fix-mysql-migration' into 'master' | Dmitriy Zaporozhets | 2014-12-23 | 1 | -0/+8 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix mysql migration Fixes exception noted in https://gitlab.com/gitlab-org/gitlab-ce/issues/913 ``` ** Invoke db:migrate (first_time) ** Invoke environment (first_time) ** Execute environment ** Invoke db:load_config (first_time) ** Execute db:load_config ** Execute db:migrate == 20141121161704 AddIdentityTable: migrating ================================= -- create_table(:identities) -> 0.1214s -- add_index(:identities, :user_id) -> 0.1660s -- execute("INSERT INTO identities (provider, extern_uid, user_id)\nSELECT provider, extern_uid, id FROM users\nWHERE provider IS NOT NULL\n") -> 0.0518s -- remove_column(:users, :extern_uid) rake aborted! StandardError: An error has occurred, all later migrations canceled: Mysql2::Error: Duplicate entry 'ldap' for key 'index_users_on_extern_uid_and_provider': ALTER TABLE `users` DROP `extern_uid`/home/git/gitlab/vendor/bundle/ruby/2.1.0/gems/activerecord-4.1.1/lib/active_record/connection_adapters/abstract_mysql_adapter.rb:301:in `query' /home/git/gitlab/vendor/bundle/ruby/2.1.0/gems/activerecord-4.1.1/lib/active_record/connection_adapters/abstract_mysql_adapter.rb:301:in `block in execute' ``` See merge request !1344 | ||||
| | * | Remove index only if exists | Dmitriy Zaporozhets | 2014-12-23 | 1 | -2/+8 |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | Fix migration issue for mysql with index not being removed | Dmitriy Zaporozhets | 2014-12-23 | 1 | -0/+2 |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Merge pull request #7894 from cirosantilli/fix-dev-user-seed | Dmitriy Zaporozhets | 2014-12-20 | 1 | -8/+7 |
| |\ \ | |/ |/| | Fix dev user seed: ID was used twice. | ||||
| | * | Fix dev user seed: multiple ID was used twice. | Ciro Santilli | 2014-09-30 | 1 | -8/+7 |
| | | | |||||
| * | | speed up migration to identities | Valery Sizov | 2014-12-08 | 1 | -9/+15 |
| | | | |||||
| * | | Add locked_at to merge request | Dmitriy Zaporozhets | 2014-12-05 | 2 | -1/+7 |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Supporting for multiple omniauth provider for the same user | Valery Sizov | 2014-12-04 | 2 | -78/+41 |
| | | | |||||
| * | | Multi-provider auth. LDAP is not reworked | Valery Sizov | 2014-12-04 | 2 | -27/+101 |
| | | | |||||
| * | | Add missing timestamps to the 'members' table | Jacob Vosmaer | 2014-11-21 | 2 | -1/+16 |
| | | | |||||
| * | | Revert "Create dev fixture projects with fixed visibility" | Dmitriy Zaporozhets | 2014-11-10 | 4 | -91/+49 |
| | | | | | | | | | This reverts commit a9fadce361163e97eb1de0ec62e4235ff0fa3daa. | ||||
| * | | Merge pull request #8168 from cirosantilli/dev-fixtures-visibility | Marin Jankovski | 2014-11-07 | 4 | -49/+91 |
| |\ \ | | | | | | | Create dev fixture projects with fixed visibility | ||||
| | * | | Create dev fixture projects with fixed visibility | Ciro Santilli | 2014-10-26 | 4 | -49/+91 |
| | | | | |||||
| * | | | Remove unnecessary lines. | Don Luchini | 2014-11-05 | 1 | -2/+0 |
| | | | | |||||
| * | | | Do not require immediate password reset if specifying one when seeding database. | Don Luchini | 2014-11-04 | 1 | -6/+10 |
| | | | | |||||
| * | | | Save only valid record in service migrations | Dmitriy Zaporozhets | 2014-10-31 | 2 | -2/+2 |
| | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | Fix serialize migration | Drew Blessing | 2014-10-30 | 1 | -1/+1 |
| |/ / | |||||
| * | | Fix snippets seeds | Dmitriy Zaporozhets | 2014-10-16 | 1 | -8/+26 |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Snippets: public/internal/private | Valery Sizov | 2014-10-09 | 2 | -3/+25 |
| | | | |||||
| * | | Use double quotes because we are inserting password now. | Marin Jankovski | 2014-10-07 | 1 | -1/+1 |
| | | | |||||
| * | | Add slack service migration. | Marin Jankovski | 2014-10-06 | 2 | -1/+18 |
| | | | |||||
| * | | Fix dev merge seed: update testme to gitlab-test. | Ciro Santilli | 2014-09-30 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #7873 from cirosantilli/testme-to-gitlabtest | Dmitriy Zaporozhets | 2014-09-29 | 1 | -1/+1 |
| |\ | | | | | Replace testme with gitlab-test. | ||||
| | * | Replace testme with gitlab-test. | Ciro Santilli | 2014-09-27 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #7897 from cirosantilli/predictable-merge-requests-dev-seed | Dmitriy Zaporozhets | 2014-09-29 | 1 | -0/+18 |
| |\ \ | | | | | | | Add predictable merge requests on dev seed. | ||||
| | * | | Add predictable merge requests on dev seed. | Ciro Santilli | 2014-09-29 | 1 | -0/+18 |
| | | | | |||||
| * | | | Prevent email sending on admin dev seed. | Ciro Santilli | 2014-09-29 | 1 | -10/+12 |
| |/ / | |||||
| * | | Replace empty? || nil? with blank?. | Ciro Santilli | 2014-09-27 | 1 | -1/+1 |
| |/ | |||||
| * | Fix dev fixtures | Dmitriy Zaporozhets | 2014-09-18 | 1 | -2/+2 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Fix STI+polymorphic for Group <-> GroupMember | Dmitriy Zaporozhets | 2014-09-14 | 1 | -1/+1 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Fix migration and association for new members table | Dmitriy Zaporozhets | 2014-09-14 | 5 | -56/+48 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Migrate old membership objects to new Member model | Dmitriy Zaporozhets | 2014-09-14 | 2 | -1/+32 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Add members table migration | Dmitriy Zaporozhets | 2014-09-14 | 2 | -1/+26 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Fix serialize migration. Fixes #7734 | Drew Blessing | 2014-09-11 | 1 | -1/+2 |
| | | |||||
| * | Add an option to supply root password through an environmental variable. | Marin Jankovski | 2014-09-11 | 1 | -3/+9 |
| | | |||||
| * | Merge pull request #7705 from dblessing/serialize_service_properties | Dmitriy Zaporozhets | 2014-09-10 | 2 | -9/+39 |
| |\ | | | | | Serialize service properties | ||||
| | * | Serialize services properties | Drew Blessing | 2014-09-10 | 2 | -9/+39 |
| | | | |||||
| * | | Link to the canonical repos. | Sytse Sijbrandij | 2014-09-10 | 1 | -3/+3 |
| | | | |||||
| * | | Fetch the testme repository from gitlab.com | Jacob Vosmaer | 2014-09-10 | 1 | -1/+1 |
| | | | | | | | | | The repository was removed from github.com/gitlabhq. | ||||
| * | | Use create-hooks instead of rewrite-hooks.sh | Jacob Vosmaer | 2014-09-08 | 1 | -1/+1 |
| |/ | | | | | The rewrite-hooks.sh script is a deprecated wrapper for gitlab-shell's create-hooks script. | ||||
| * | Update repos hooks in migration | Dmitriy Zaporozhets | 2014-09-03 | 2 | -1/+11 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Add users with predictable username and password | Ciro Santilli | 2014-09-01 | 1 | -0/+16 |
| | | | | | to development seed. | ||||
| * | Fixes #7571 | James Brooks | 2014-08-27 | 1 | -0/+6 |
| | | |||||
| * | Document characters being stripped from labels | Jacob Vosmaer | 2014-08-20 | 1 | -1/+3 |
| | | |||||
| * | Use the default color when migrating labels | Jacob Vosmaer | 2014-08-19 | 1 | -1/+1 |
| | | |||||
| * | Remove invalid characters from the label name | Jacob Vosmaer | 2014-08-19 | 1 | -1/+1 |
| | | |||||
| * | Test if the label is valid before creating link | Jacob Vosmaer | 2014-08-19 | 1 | -1/+1 |
| | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |