summaryrefslogtreecommitdiff
path: root/db
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'configurable-attachment-size' into 'master'Douwe Maan2015-04-032-1/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support configurable attachment size in Application Settings page ### What does this MR do? This MR provides the ability to configure the maximum size of an attachment inside a note. A parameter has been added to the Application Settings page. ### Are there points in the code the reviewer needs to double check? What should be done with the legacy note attachment validation? I added code to make the validation work with the configurable setting. I could see an issue where an admin lowers the limit from 10 megabytes to 5 megabytes, which could cause an existing model to be invalid. ### Why was this MR needed? We often have attachments that exceed 10 MB, and it would be nice to be able to override the defaults. ### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)? See Issue #1258 ### Screenshots Before: ![Screen_Shot_2015-03-29_at_3.06.53_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6013a1dbc8cf61a63e93744149937fa0/Screen_Shot_2015-03-29_at_3.06.53_PM.png) After: ![Screen_Shot_2015-03-29_at_3.12.34_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/f3518af7e8653ba40f0a3579456da6ad/Screen_Shot_2015-03-29_at_3.12.34_PM.png) See merge request !407
| * Support configurable attachment size via Application SettingsStan Hu2015-04-022-1/+7
| | | | | | | | | | | | Fix bug where error messages from Dropzone would not be displayed on the issues page Closes #1258
* | Fix migration SQL.username-periodDouwe Maan2015-03-311-1/+1
| |
* | Move files for moved namespaces.Douwe Maan2015-03-311-2/+39
| |
* | Don't allow username to end in period.Douwe Maan2015-03-271-0/+39
|/
* Add migration.unset-assigneeDouwe Maan2015-03-242-1/+7
|
* Add location to user profileDmitriy Zaporozhets2015-03-202-1/+7
|
* Extend the commit calendar to show the actual commits for a dateHannes Rosenögger2015-03-181-1/+1
|
* Merge branch 'issue_subscription' into 'master'Dmitriy Zaporozhets2015-03-172-2/+29
|\ | | | | | | | | | | | | | | | | | | | | | | Subscription to issue/mr Fixes #1911 and #1909 ![joxi_screenshot_1426601822159](https://dev.gitlab.org/gitlab/gitlabhq/uploads/53021bc5783271322ab2dfba7598eaa3/joxi_screenshot_1426601822159.png) ![joxi_screenshot_1426601836423](https://dev.gitlab.org/gitlab/gitlabhq/uploads/244ff360fbd6f30980f8dad699400814/joxi_screenshot_1426601836423.png) See merge request !1702
| * testsValery Sizov2015-03-161-1/+4
| |
| * fix specsValery Sizov2015-03-161-1/+1
| |
| * rename table subscribe; make it polymorficValery Sizov2015-03-163-22/+17
| |
| * code folding fixValery Sizov2015-03-162-0/+8
| |
| * SubscriptionValery Sizov2015-03-152-1/+22
| |
* | Merge branch 'master' into fix-restricted-visibilityVinnie Okada2015-03-144-17/+48
|\ \ | |/ | | | | | | Conflicts: db/schema.rb
| * remove duplicationValery Sizov2015-03-102-2/+23
| |
| * Fix importers with OCCValery Sizov2015-03-102-4/+13
| |
| * Fix user fixtures for developmentDmitriy Zaporozhets2015-03-081-13/+14
| |
* | Move restricted visibility settings to the UIVinnie Okada2015-03-072-3/+9
|/ | | | | Add checkboxes to the application settings page for restricted visibility levels, and remove those settings from gitlab.yml.
* Added comment notification events to HipChat and Slack services.Stan Hu2015-03-062-1/+7
| | | | | | | | | Supports four different event types all bundled under the "note" event type: - comments on a commit - comments on an issue - comments on a merge request - comments on a code snippet
* Issue #595: Support Slack notifications upon issue and merge request eventsStan Hu2015-03-032-2/+14
| | | | | | | | | | | 1) Adds a DB migration for all services to toggle on push, issue, and merge events. 2) Upon an issue or merge request event, fire service hooks. 3) Slack service supports custom messages for each of these events. Other services not supported at the moment. 4) Label merge request hooks with their corresponding actions.
* No need to block db:rollback for safe migrationDmitriy Zaporozhets2015-02-251-1/+0
|
* Merge branch 'fix-another-migration' into 'master'Dmitriy Zaporozhets2015-02-261-1/+1
|\ | | | | | | | | | | | | | | | | | | Prevent another migration from failing due to indirect use of model columns not yet created See https://github.com/gitlabhq/gitlabhq/issues/8817#issuecomment-76007077 cc @marin See merge request !1597
| * Prevent another migration from failing.Douwe Maan2015-02-251-1/+1
| |
* | Merge branch 'bitbucket-import'Dmitriy Zaporozhets2015-02-252-19/+27
|\ \ | |/ |/| | | | | | | Conflicts: app/views/import/gitorious/status.html.haml db/schema.rb
| * Add Bitbucket importer.Douwe Maan2015-02-242-19/+27
| |
* | Merge branch 'mwessel/gitlab-ce-set-last-activity-at' into 'master'Dmitriy Zaporozhets2015-02-242-2/+11
|\ \ | |/ |/| | | | | | | | | | | Give last_activity_at a default value so it will always be set For https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/345 See merge request !1589
| * Give last_activity_at a default value so it will always be setMarco Wessel2015-02-232-2/+11
| |
* | Make services migration more reliableDmitriy Zaporozhets2015-02-231-9/+15
|/
* Revert "Fix broken access control and refactor avatar upload"Dmitriy Zaporozhets2015-02-191-19/+0
| | | | This reverts commit 7d5f86f6cbd187e75a6ba164ad6bfd036977dd07.
* Merge branch 'fix_access_control_notes' into 'master'Dmitriy Zaporozhets2015-02-171-0/+19
|\ | | | | | | | | | | | | | | Fix broken access control for note attachments From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/332 by Hannes Rosenögger. See merge request !1528
| * Fix broken access control and refactor avatar uploadHannes Rosenögger2015-02-161-0/+19
| | | | | | | | | | | | | | | | | | | | | | This commit moves the note folder from /public/uploads/note to /uploads/note and changes the uploader accordingly. Now it's no longer possible to avoid the access control by modifing the url. The Avatar upload has been refactored to use an own uploader as well to cleanly seperate the two upload types.
* | Fix dev fixture for adminDmitriy Zaporozhets2015-02-171-0/+1
|/
* Merge branch 'tweet-new-project'Dmitriy Zaporozhets2015-02-151-0/+5
|\ | | | | | | | | Conflicts: db/schema.rb
| * Add link to share via twitter to "created project" event.Douwe Maan2015-02-132-3/+9
| |
* | Allow users that signed up via OAuth to set their password in order to use ↵Douwe Maan2015-02-133-19/+32
|/ | | | Git over HTTP(S).
* Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-02-121-1/+1
|\
| * Merge pull request #8445 from jvanbaarsen/project-spec-speed-upJeroen van Baarsen2015-02-121-1/+1
| |\ | | | | | | requests/api/project_spec.rb speed up
| | * Improved speed of the project_spec.rbJeroen van Baarsen2015-02-031-1/+1
| | | | | | | | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | | Remove not null constraint on project_id in services.Marin Jankovski2015-02-112-2/+7
| | |
* | | Add template boolean to services.Marin Jankovski2015-02-112-1/+7
|/ /
* | Add index on order columns for services tableDmitriy Zaporozhets2015-02-092-1/+7
| |
* | Merge branch 'notification_email'Dmitriy Zaporozhets2015-02-072-1/+13
|\ \ | | | | | | | | | | | | Conflicts: db/schema.rb
| * | Allow notification email to be set separately from primary email.Douwe Maan2015-02-072-1/+13
| | | | | | | | | | | | Closes #1932.
* | | Add index on order columnsDmitriy Zaporozhets2015-02-062-1/+29
| | |
* | | Add timestamps to identityDmitriy Zaporozhets2015-02-052-6/+13
|/ /
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Marco Wessel2015-01-302-0/+6
|\ \ | |/ | | | | | | | | | | | | configure-protection Conflicts: CHANGELOG db/schema.rb
| * an ability to clone project with oauth2 tokenValery Sizov2015-01-282-1/+7
| |
* | Fix indentationMarco Wessel2015-01-251-3/+3
| |
* | Allow configuring protection of the default branch upon first pushMarco Wessel2015-01-252-1/+7
|/
View Lorry Controller Status