summaryrefslogtreecommitdiff
path: root/db
Commit message (Collapse)AuthorAgeFilesLines
* Add email aliases for usersJason Hollingsworth2014-02-132-35/+62
| | | | | | | | Emails are used to associate commits with users. The emails are not verified and don't have to be valid email addresses. They are assigned on a first come, first serve basis. Notifications are sent when an email is added.
* Squash migrations for years 2011 and 2012Dmitriy Zaporozhets2014-02-0492-895/+306
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge pull request #6178 from Popl7/add_group_avatarsDmitriy Zaporozhets2014-01-282-1/+7
|\ | | | | added group avatars
| * added group avatarsSteven Thonus2014-01-282-1/+7
| |
* | Fix merge_request_diffs migrations for postgresqlskv-headless2014-01-272-5/+11
|/
* Merge branch 'development_seed_fix' into 'master'Dmitriy Zaporozhets2014-01-241-1/+1
|\ | | | | | | | | | | | | | | | | | | Development Project Seed Data Fix After this commit https://dev.gitlab.org/gitlab/gitlabhq/commit/1d2bdb4d5880bb1ad39b62c81ff2971aa0cb3798 Contexts were replaced with Services. One context remained in the seed data which means development seeding will fail. @dzaporozhets Do we want to backport this to 6.5 too? /cc @jacobvosmaer @sytse
| * Replace context with service in development seed data.Marin Jankovski2014-01-231-1/+1
| |
* | Merge branch 'improve/mr_diff'Dmitriy Zaporozhets2014-01-234-45/+84
|\ \ | |/ |/| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: features/steps/project/project_fork.rb features/steps/project/project_forked_merge_requests.rb features/steps/project/project_issue_tracker.rb features/steps/project/project_markdown_render.rb features/steps/shared/project.rb
| * Improve db schema for merge request diffsDmitriy Zaporozhets2014-01-223-10/+21
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Create separate table to store Merge request commits/diffsDmitriy Zaporozhets2014-01-223-39/+67
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge pull request #6075 from skv-headless/remove_deprecated_findersDmitriy Zaporozhets2014-01-222-2/+2
|\ \ | |/ |/| Remove deprecated finders
| * Remove deprecated findersskv2014-01-192-2/+2
| |
* | Add website url to userJerome Dalbert2014-01-182-1/+7
|/
* Improve dev fixturesDmitriy Zaporozhets2013-12-253-3/+3
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Customization and previewing of broadcast messagesAndrew Tomaka2013-12-182-0/+8
|
* Fix db schemaDmitriy Zaporozhets2013-12-171-16/+13
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Create EmailsOnPushService modelDmitriy Zaporozhets2013-12-172-14/+23
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Archiving old projects; archived projects aren't shown on dashboardSteven Thonus2013-12-162-0/+6
| | | | | | | | | | | | | | features for archive projects abilities for archived project other abilities for archive projects only limit commits and merges for archived projects ability changed to prohibited actions on archived projects added spec and feature tests for archive projects changed search bar not to include archived projects
* Fixed db schemaDmitriy Zaporozhets2013-12-161-180/+181
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Allow user to hide the message to add an ssh key permanentlyDrew Blessing2013-12-141-0/+5
| | | | | | | | Favor links instead of buttons Remove unnecessary class Remove extra space
* Add new fields to web_hooks table.Dmitriy Zaporozhets2013-12-042-4/+14
| | | | | | | | | | | | | Next fields were added: * push_events * issues_events * merge_requests_events Main goal is to create web hooks that can be triggered only for certain event types. For example you can have separate web hook for push events and another one for issues. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Adding authenticated public mode (internal).Jason Hollingsworth2013-11-262-2/+15
| | | | | | Added visibility_level icons to project view (rather than just text). Added public projects to search results. Added ability to restrict visibility levels standard users can set.
* Broadcast message model + migrationsDmitriy Zaporozhets2013-11-122-1/+22
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Project#default_branch use repo HEAD instead of DB value nowDmitriy Zaporozhets2013-11-062-2/+10
| | | | | | | | Drop default_branch field from projects table Use repository.root_ref as value for defautl_branch method Fixes issue with default_branch and HEAD getting out of sync Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add description to issues, projects in development fixturesDmitriy Zaporozhets2013-10-172-2/+5
|
* Fixing unsafe use of Thread.current variable :current_userAngus MacArthur2013-10-162-23/+32
|
* Confirm seed usersDmitriy Zaporozhets2013-10-152-0/+3
|
* Enable confirmable and reconfirmable modules for UserDmitriy Zaporozhets2013-10-152-1/+21
| | | | | | | | | Now when you want to signup or change existing email you will be forced to confirm that you really own this email. You get email with link to follow in order to confirm your email address Conflicts: app/models/user.rb
* avatar upload on profile pageSteven Thonus2013-10-092-1/+7
|
* Namespaces.owner_id can be nullDmitriy Zaporozhets2013-09-262-2/+11
|
* Add description to MergeRequest modelDmitriy Zaporozhets2013-09-092-1/+7
|
* Use original raphael-rails v2.1.2Dmitriy Zaporozhets2013-09-011-2/+2
|
* Set iid in fixtures. Add rake dev:setup for developmentDmitriy Zaporozhets2013-08-263-0/+15
|
* Mars theme for generated admin accountDmitriy Zaporozhets2013-08-262-1/+4
|
* Link issues from comments and automatically close themash wilson2013-08-252-0/+17
| | | | | | | | | | Any mention of Issues, MergeRequests, or Commits via GitLab-flavored markdown references in descriptions, titles, or attached Notes creates a back-reference Note that links to the original referencer. Furthermore, pushing commits with commit messages that match a (configurable) regexp to a project's default branch will close any issues mentioned by GFM in the matched closing phrase. If accepting a merge request would close any Issues in this way, a banner is appended to the merge request's main panel to indicate this.
* Update 20130419190306_allow_merges_for_forks.rbdsekretov2013-08-251-1/+2
| | | | Postgress db migrate fails.(5.4=>6.0)
* Add iids to milestones. Moved iids logic to separate concernDmitriy Zaporozhets2013-08-212-1/+7
|
* Drop deprecated tablesDmitriy Zaporozhets2013-08-212-27/+12
|
* Add iid field to issues and MRDmitriy Zaporozhets2013-08-192-1/+9
|
* Repository import during project creation often return timeout for medium ↵Dmitriy Zaporozhets2013-08-122-1/+7
| | | | | | | and large repos. So lets do it async. First create project, then import repo and create satellite with Sidekiq
* reset db schemaDmitriy Zaporozhets2013-08-081-32/+36
|
* Merge branch 'master' into karlhungus-mr-on-forkDmitriy Zaporozhets2013-08-082-1/+7
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: app/contexts/filter_context.rb app/contexts/search_context.rb app/models/merge_request.rb app/models/note.rb app/views/shared/_merge_requests.html.haml spec/controllers/commit_controller_spec.rb spec/services/notification_service_spec.rb
| * st_diff field for NoteDmitriy Zaporozhets2013-08-042-1/+7
| |
* | Remove ugly button and truncate too long project names. Remove unecessary ↵Dmitriy Zaporozhets2013-07-302-4/+2
| | | | | | | | newlines
* | Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into ↵Dmitriy Zaporozhets2013-07-304-5/+34
|\ \ | |/ |/| | | | | | | | | | | | | karlhungus-mr-on-fork Conflicts: app/views/projects/commit/show.html.haml app/views/projects/compare/show.html.haml app/views/projects/merge_requests/branch_from.js.haml
| * Style changes from review with @randxIzaak Alpert2013-07-171-1/+1
| | | | | | | | | | | | -Some changes around calling origional methods for !for_fork? merge requests. Other changes to follow Change-Id: I009c716ce2475b9efa3fd07aee9215fca7a1c150
| * MR on Fork multiple fixesIzaak Alpert2013-07-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Disable observers post test run -Allow db:seed_fu RAILS_ENV=test to be run more than once without error -fix diffs_in_between, was passing in the default_options for grit, but grit in this case doesn't take options, fixed the test to actually fail if the incorrect diffs are returned -make notes/commits render against proper project -MR discussion file links should reference note's project -Added tests for commit links on edit merge request -fixes edit issues (canceling an edited mr, updating an edited mr) -updates tests with checks for source code updates -still forked_merge_requests.feature (project_forked_merge_requests) test not passing (commented out -- "stable" not being set) MR API: error on bad target_project -If the target project id is specified and it is not the same as the project the request is being made on (the source), and the it isn't a fork of that project, error out, otherwise use it as the target -Fixes some busted (but hidden) test cases Conflicts: app/views/merge_requests/show/_diffs.html.haml spec/features/notes_on_merge_requests_spec.rb Change-Id: I20e595c156d0e8a63048baaead7be6330c738a05
| * Merge Request on forked projectsIzaak Alpert2013-07-174-5/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The good: - You can do a merge request for a forked commit and it will merge properly (i.e. it does work). - Push events take into account merge requests on forked projects - Tests around merge_actions now present, spinach, and other rspec tests - Satellites now clean themselves up rather then recreate The questionable: - Events only know about target projects - Project's merge requests only hold on to MR's where they are the target - All operations performed in the satellite The bad: - Duplication between project's repositories and satellites (e.g. commits_between) (for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos) Fixes: Make test repos/satellites only create when needed -Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap) -project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually -fixed remote removal -How to merge renders properly -Update emails to show project/branches -Edit MR doesn't set target branch -Fix some failures on editing/creating merge requests, added a test -Added back a test around merge request observer -Clean up project_transfer_spec, Remove duplicate enable/disable observers -Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well -Signifant speed ups for tests -Update formatting ordering in notes_on_merge_requests -Remove wiki schema update Fixes for search/search results -Search results was using by_project for a list of projects, updated this to use in_projects -updated search results to reference the correct (target) project -udpated search results to print both sides of the merge request Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8
* | Improve UI for project snippetsDmitriy Zaporozhets2013-07-181-1/+1
| |
* | Add seeds and improve ui. Remove snippet expires_atDmitriy Zaporozhets2013-07-181-0/+24
|/
View Lorry Controller Status