summaryrefslogtreecommitdiff
path: root/db
Commit message (Collapse)AuthorAgeFilesLines
* Rename Tasks to TodosDouglas Barbosa Alexandre2016-02-202-8/+13
|
* Create a pending task when a user is mentioned on a noteDouglas Barbosa Alexandre2016-02-202-1/+8
|
* Add task modelDouglas Barbosa Alexandre2016-02-202-0/+32
|
* Merge branch 'visibletrap/gitlab-ce-label'Douwe Maan2016-02-192-2/+8
|\
| * Label description and Label rowTap2016-02-172-2/+8
| | | | | | | | | | - Add label description - Show label row when filtering issues or merge requests by label
* | Save merge commit id when MR is mergedRubén Dávila2016-02-191-0/+5
| |
* | Add merge_commit_sha column to merge_requests.Rubén Dávila2016-02-191-0/+1
| |
* | Fix name of build erasable, remove superfluous method from itGrzegorz Bizon2016-02-191-1/+1
| |
* | Remove boolean erase column from ci build and foreign keyGrzegorz Bizon2016-02-192-4/+0
| |
* | Add build eraseable columns to ci builds tableGrzegorz Bizon2016-02-192-0/+13
|/
* Add second build for each commit in build seedsGrzegorz Bizon2016-02-111-14/+25
|
* Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher2016-02-092-0/+6
|\
| * Merge branch 'master' into ci-permissionsKamil Trzcinski2016-02-051-0/+80
| |\ | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * \ Merge remote-tracking branch 'origin/master' into ci-permissionsKamil Trzcinski2016-02-043-0/+39
| |\ \ | | | | | | | | | | | | | | | | # Conflicts: # app/views/projects/builds/index.html.haml
| * | | Rename allow_guest_to_access_builds to public_buildsKamil Trzcinski2016-02-042-18/+18
| | | |
| * | | Add CI setting: allow_guest_to_access_buildsKamil Trzcinski2016-02-022-17/+23
| | | | | | | | | | | | | | | | Add the `read_build` ability if user is anonymous or guest and allow_guest_to_access_builds is enabled.
* | | | Merge branch 'index_snippet' into 'master' Douwe Maan2016-02-092-1/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add index for snippet's updated_at @DouweM We are ordering by `updated_at` but there is no index. cc @yorickpeterse See merge request !2768
| * | | | Add index for snippet's updated_atindex_snippetValery Sizov2016-02-092-1/+7
| | | | |
* | | | | Merge branch ↵Douwe Maan2016-02-092-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'huacnlee/gitlab-ce-feature/option-to-include-author-info-in-mail' into 'master' Add option to include the sender name in body of Notify email _Originally opened at !2495 by @huacnlee._ - - - Fixes #7824. See merge request !2767
| * | | | | Add option to include the sender name in body of Notify email. fix #7824huacnlee/gitlab-ce-feature/option-to-include-author-info-in-mailJason Lee2016-02-092-0/+6
| |/ / / /
* | | | | Merge branch '3kami3/gitlab-ce-root_email' into 'master' Douwe Maan2016-02-091-1/+3
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an option to supply root email through an environmental variable. _Originally opened at !2499 by @3kami3._ --- Add an option to supply root email through an environmental variable. See merge request !2751
| * | | | Add an option to supply root email through an environmental variable.3kami3/gitlab-ce-root_email3kami32016-02-081-1/+3
| | |_|/ | |/| |
* | | | Merge branch 'fix/atom-url-issue' into 'master' Douwe Maan2016-02-091-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | do not rename .aToM but only .atom projects in migration Sorry @DouweM forgot to add this. See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2651/diffs#bc35672f73f4ee025132aee428f383acdf0f755e_0_51 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3699 See merge request !2712
| * | | remove unnecessary lower function on SQLJames Lopez2016-02-041-1/+1
| | | |
* | | | Merge branch 'fix/atom-url-issue' into 'master' Douwe Maan2016-02-042-1/+81
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | Fix atom url issue on projects This MR adds prevents a project to have a path ending in .atom that conflicts with the feed and Adds a migration to migrate old .atom projects to a different path Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3699 See merge request !2651
| * | refactored migration based on feedbackJames Lopez2016-02-041-1/+5
| | |
| * | refactored migration and spec based on feedbackJames Lopez2016-02-041-6/+12
| | |
| * | fixed move project method in migrationJames Lopez2016-02-022-34/+14
| | |
| * | added TODO to not working methodJames Lopez2016-02-011-0/+1
| | |
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issueJames Lopez2016-02-014-5/+20
| |\ \ | | |/
| * | WIP - refactored migrationJames Lopez2016-02-011-7/+42
| | |
| * | WIP - add migrationJames Lopez2016-01-291-0/+54
| | |
* | | Support Akismet spam checking for creation of issues via APIStan Hu2016-02-023-0/+39
| |/ |/| | | | | | | | | | | Currently any spam detected by Akismet by non-members via API will be logged in a separate table in the admin page. Closes #5612
* | Merge remote-tracking branch 'origin/background-delete-process'Dmitriy Zaporozhets2016-01-302-0/+6
|\ \
| * | Update CHANGELOGbackground-delete-processJosh Frye2016-01-292-5/+5
| | |
| * | First pass at deleting projects in the background.Josh Frye2016-01-292-3/+9
| | |
* | | Increase LFS objects size columnDrew Blessing2016-01-292-3/+8
|/ /
* | Partially revert "Add IP check against DNSBLs at account sign-up"rs-remove-ip-blockingRobert Speicher2016-01-282-3/+7
|/ | | | | This partially reverts 6a5cd3ca - we keep the migration and add a new migration that reverts it in order to keep migration history intact.
* Merge branch 'master' into issue_3945issue_3945Rubén Dávila2016-01-202-0/+8
|\
| * Merge branch 'feature/check-against-rbl-only' into 'master'Robert Speicher2016-01-202-1/+9
| |\ | | | | | | | | | | | | | | | | | | | | | Split from !2455 References #9092 See merge request !2515
| | * Add IP blocking against DNSBL at sign-upfeature/check-against-rbl-onlyTomasz Maczukin2016-01-202-1/+9
| | |
* | | Merge branch 'master' into issue_3945Douwe Maan2016-01-202-0/+10
|\ \ \ | |/ /
| * | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Jeroen Nijhof2016-01-205-13/+108
| |\ \ | | |/ | | | | | | | | | | | | | | | sentry-integration Conflicts: db/schema.rb
| * | Add sentry integrationJeroen Nijhof2016-01-182-1/+11
| | |
* | | Save and use actual diff base commit for MR diff highlightingDouwe Maan2016-01-202-14/+20
| |/ |/|
* | Merge branch 'master' into user-ldap-emailDouwe Maan2016-01-193-12/+75
|\ \ | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | Greatly improve external_issue_tracker performanceimprove-project-external-issue-trackersYorick Peterse2016-01-193-13/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This greatly improves the performance of Project#external_issue_tracker by moving most of the fields queried in Ruby to the database and letting the database handle all logic. Prior to this change the process of finding an external issue tracker was along the lines of the following: 1. Load all project services into memory. 2. Reduce the list to only services where "issue_tracker?" returns true 3. Reduce the list from step 2 to service where "default?" returns false 4. Find the first service where "activated?" returns true This has to two big problems: 1. Loading all services into memory only to reduce the list down to a single item later on is a waste of memory (and slow timing wise). 2. Calling Array#select followed by Array#reject followed by Array#find allocates extra objects when this really isn't needed. To work around this the following service fields have been moved to the database (instead of being hardcoded): * category * default This in turn means we can get the external issue tracker using the following query: SELECT * FROM services WHERE active IS TRUE AND default IS FALSE AND category = 'issue_tracker' AND project_id = XXX LIMIT 1 This coupled with memoizing the result (just as before this commit) greatly reduces the time it takes for Project#external_issue_tracker to complete. The exact reduction depends on one's environment, but locally the execution time is reduced from roughly 230 ms to only 2 ms (= a reduction of almost 180x). Fixes gitlab-org/gitlab-ce#10771
* | | Allow LDAP users to change their email if it was not set by the LDAP serverDouwe Maan2016-01-192-1/+32
|/ /
* | Add limit change for 'data' column in 'events' when using MySQLTomasz Maczukin2016-01-181-0/+1
|/
* Raise hook url limitKirilll Zaycev2016-01-152-9/+14
|