summaryrefslogtreecommitdiff
path: root/db
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-117-21/+30
|\
| * Use false/true mixin in migration from !3640Stan Hu2016-04-101-4/+6
| |
| * Merge branch 'fix-raw-sql-migrations' into 'master' Stan Hu2016-04-114-12/+18
| |\ | | | | | | | | | | | | | | | | | | Fix more SQL migrations to use raw commands gitlab-org/gitlab-development-kit#109 See merge request !3640
| | * Fix more SQL migrations to use raw commandsStan Hu2016-04-104-12/+18
| | | | | | | | | | | | gitlab-org/gitlab-development-kit#109
| * | Fix seed_fu failure with inserting milestones into test DBStan Hu2016-04-101-1/+1
| |/ | | | | | | Milestones were not being saved due to "invalid state" validation errors
| * Use raw SQL instead of Rails models in 20130403003950 migrationStan Hu2016-04-091-7/+9
| | | | | | | | | | | | Closes gitlab-org/gitlab-development-kit#109 Closes https://github.com/gitlabhq/gitlabhq/issues/10123
| * Apparently I missed updating the schema.rb when removing the Twitter ↵connorshea2016-04-091-2/+1
| | | | | | | | | | | | "Congrats" button From commit 85cc1729596ac1e5b31d8cfa1daa07477db6033d
* | Fix schema.rbDouglas Barbosa Alexandre2016-04-081-4/+4
| |
* | Use query instead of model on migrationsDouglas Barbosa Alexandre2016-04-081-1/+1
| |
* | Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-085-2/+48
|\ \ | |/
| * Remove "Congratulations!" tweet button on newly-created project.connorshea2016-03-311-0/+5
| | | | | | | | | | | | | | I’ve removed everything related to the feature based on this commit: ce08f919f34fd8849834365 Resolves #10857.
| * Exclude projects pending deletion from all resultsZeger-Jan van de Weg2016-03-312-1/+8
| |
| * Remove todos for deleted merge requestsDouglas Barbosa Alexandre2016-03-312-1/+18
| |
| * Destroy related todos when an issue is deletedDouglas Barbosa Alexandre2016-03-302-1/+18
| |
* | Update migration commentDmitriy Zaporozhets2016-03-301-2/+6
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Improve db migrations for notification settingsDmitriy Zaporozhets2016-03-303-14/+13
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Migrate notification setting from members tableDmitriy Zaporozhets2016-03-303-1/+23
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Introduce NotificationSetting modelDmitriy Zaporozhets2016-03-302-3/+24
|/ | | | | | | It will hold notification setting per group or per project. It will allow get rid of notification level stored in Member model Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Use raw SQL instead of Rails models in migrations where appropriaters-fix-migrationsRobert Speicher2016-03-285-34/+54
| | | | Closes #14694.
* Check if index exists before adding it. [ci skip]Rubén Dávila2016-03-211-1/+3
| | | | * I got an error when updating GDK because it already exists.
* Fix specsissue_12658Douwe Maan2016-03-222-1/+2
|
* Address feedbackDouwe Maan2016-03-223-5/+51
|
* Merge branch 'master' into issue_12658Douwe Maan2016-03-214-1/+23
|\ | | | | | | | | | | | | | | | | # Conflicts: # app/models/issue.rb # app/views/projects/_home_panel.html.haml # app/views/shared/projects/_project.html.haml # db/schema.rb # spec/models/project_spec.rb
| * Merge branch 'master' into 2489-soft-delete-issuesZeger-Jan van de Weg2016-03-212-1/+7
| |\
| | * Merge branch 'master' into feature/issue-moveGrzegorz Bizon2016-03-195-1/+28
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (121 commits) Dedupe labels in labels selector in Dashboard pages Refactor colors and lists Add a safeguard in MergeRequest#compute_diverged_commits_count Fix an issue when the target branch of a MR had been deleted Add avatar to issue and MR pages header Cleanup somce css colors Re-group scss variables Refactor `Todo#target` Fixes issue with filter label missing on labels & milestones Rename `Todo#to_reference` to `Todo#target_reference` Fixed failing tests Updated controller with before_action Fixed other issues based on feedback Fixes issue on dashboard issues Full labels data in JSON Fixed issue with labels dropdown getting wrong labels Update CHANGELOG Use `Note#for_project_snippet?` to skip notes on project snippet Use `Commit#short_id` instead of `Commit.truncate_sha` Reuse `for_commit?` on conditional validations Update schema info comment on todo related files ... Conflicts: app/models/issue.rb db/schema.rb spec/models/issue_spec.rb
| | * | Improvements in issue move feaure (refactoring)Grzegorz Bizon2016-03-192-2/+1
| | | | | | | | | | | | | | | | According to endbosses' suggestions.
| | * | Add field that references issue this issue has been moved toGrzegorz Bizon2016-03-172-1/+8
| | | |
| * | | Minor improvements on IssuableActionsZeger-Jan van de Weg2016-03-211-0/+1
| | | |
| * | | Hide delete botton on edit pageZeger-Jan van de Weg2016-03-191-1/+0
| | | |
| * | | Soft delete issuablesZeger-Jan van de Weg2016-03-193-0/+16
| | |/ | |/|
* | | Add specs and add visibility level to admin groupsFelipe Artur2016-03-213-25/+8
| | |
* | | Fix more specsDouwe Maan2016-03-201-1/+1
| | |
* | | Fix some specsDouwe Maan2016-03-202-0/+6
| | |
* | | Tweaks, refactoring, and specsDouwe Maan2016-03-202-2/+3
| | |
* | | Merge branch 'master' into issue_12658Douwe Maan2016-03-205-2/+37
|\ \ \ | |/ /
| * | Add commit_id to todosDouglas Barbosa Alexandre2016-03-182-0/+8
| | |
| * | Change target_id to null on todosDouglas Barbosa Alexandre2016-03-182-1/+6
| | |
| * | Add a confidential flag to issuesDouglas Barbosa Alexandre2016-03-172-1/+9
| | |
| * | Merge branch '4009-external-users' into 'master' Douwe Maan2016-03-172-0/+6
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | External Users The user has the rights of a public user execpt it can never create a project, group, or team. Also it cant view internal projects. Partially fix for both #4009 and #13938 (except the LDAP sync or a pattern to detect external users) ![Screen_Shot_2016-03-14_at_22.02.52](/uploads/486a84ab3acb98c6cfb71a4ec7d268e2/Screen_Shot_2016-03-14_at_22.02.52.png) See merge request !3171
| * | Added an index on ci_runners.tokenYorick Peterse2016-03-162-4/+18
| | | | | | | | | | | | | | | | | | On PostgreSQL the index is created concurrently. Fixes gitlab-org/gitlab-ce#14325
* | | Code fixesFelipe Artur2016-03-171-9/+3
| | |
* | | Block internal groups/projects visibility to external usersFelipe Artur2016-03-161-3/+3
| | |
* | | Merge 4009-external-users into issue_12658Felipe Artur2016-03-168-8/+132
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' into 4009-external-users4009-external-usersZeger-Jan van de Weg2016-03-152-1/+7
| |\ \ | | |/
| | * Merge branch 'auto-gc' into 'master' revert-01160fc0Douwe Maan2016-03-152-1/+7
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run 'git gc' every 10 pushes Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14250 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12620 Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/254 Associated gitlab-shell MR: https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/44 See merge request !3206
| | | * Run 'git gc' every 10 pushesJacob Vosmaer2016-03-142-1/+7
| | | |
| * | | Merge branch 'master' into 4009-external-usersZeger-Jan van de Weg2016-03-144-6/+35
| |\ \ \ | | |/ /
| | * | Merge branch 'share-project-ce' into 'master' Dmitriy Zaporozhets2016-03-144-6/+35
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring from EE: Share Project with Group - [x] Models and migrations - [x] Logic, UI - [x] Tests - [x] Documentation - [x] Share with group lock - [x] Api feature - [x] Api docs - [x] Api tests Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> For #12831 cc @DouweM @rspeicher @vsizov See merge request !3186
| | | * Add share project from group lockDmitriy Zaporozhets2016-03-112-3/+9
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | | * Bring ProjectGroupLink model and migrations from EEDmitriy Zaporozhets2016-03-113-3/+26
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status