summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'configurable-attachment-size' into 'master'Douwe Maan2015-04-0318-15/+117
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0218-15/+117
| | | | | | | | | | | | Fix bug where error messages from Dropzone would not be displayed on the issues page Closes #1258
* | Merge branch 'import-current-user' into 'master'Dmitriy Zaporozhets2015-04-028-37/+298
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Import GitHub, Bitbucket or GitLab.com projects owned by authenticated user into current namespace. Addresses #1347. Untested since I'm in a bit of a hurry. Will definitely have time to test and add unit tests before the 7.10 release :) See merge request !481
| * | Add tests.import-current-userDouwe Maan2015-04-013-34/+281
| | |
| * | Import GitHub, Bitbucket or GitLab.com projects owned by authenticated user ↵Douwe Maan2015-03-315-3/+17
| | | | | | | | | | | | into current namespace.
* | | Merge branch 'repository-archive-worker' into 'master'Dmitriy Zaporozhets2015-04-0214-20/+360
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Archive repositories in background worker. Depends on https://gitlab.com/gitlab-org/gitlab_git/merge_requests/17 being merged, a new `gitlab_git` being released and this MR's `Gemfile.lock` being updated.. See private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2173. To do after this is merged: Update https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/sv-sidekiq-run.erb in omnibus. See merge request !436
| * | | Make sure Sidekiq picks up archive_repo queue in production.repository-archive-workerDouwe Maan2015-04-011-1/+1
| | | |
| * | | Add tests.Douwe Maan2015-03-316-7/+244
| | | |
| * | | Add item to changelog.Douwe Maan2015-03-311-0/+1
| | | |
| * | | Small code cleanup.Douwe Maan2015-03-312-17/+8
| | | |
| * | | Limit number of concurrent archive_repo jobs to 2.Douwe Maan2015-03-313-0/+6
| | | |
| * | | Archive repositories in background worker.Douwe Maan2015-03-316-16/+121
| |/ /
* | | Merge branch 'username-period' into 'master'Dmitriy Zaporozhets2015-04-0216-98/+179
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't allow username to end in period. The current behavior doesn't do username referencing and mentioning in sentences like "I discussed with with @douwe." since `douwe.` is matched as a username. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2174. See merge request !438
| * | | Fix migration SQL.username-periodDouwe Maan2015-03-311-1/+1
| | | |
| * | | Move files for moved namespaces.Douwe Maan2015-03-313-8/+39
| | | |
| * | | Fix tests.Douwe Maan2015-03-274-12/+12
| | | |
| * | | Don't allow username to end in period.Douwe Maan2015-03-275-4/+47
| | | |
| * | | Use more specific regexes.Douwe Maan2015-03-277-44/+48
| | | |
| * | | Move User.cleanup_username to Namespace.cleanup_path.Douwe Maan2015-03-275-39/+42
| | | |
* | | | Merge branch 'backup_skip_option' into 'master'Dmitriy Zaporozhets2015-04-025-15/+119
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ability to skip some items in backup https://dev.gitlab.org/gitlab/gitlabhq/issues/1936 Now it is possible to run ``` sudo gitlab-rake gitlab:backup:create SKIP=repositories,uploads ``` available options: repositories,uploads,db See merge request !470
| * | | | ability to skip some items in backupbackup_skip_optionValery Sizov2015-04-025-15/+119
|/ / / /
* | | | Merge branch 'rs-icon-symlink' into 'master'Douwe Maan2015-04-022-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check symlink mode as a String for file_type_icon_class The file mode for a symlink just got changed in `gitlab_git`, see https://gitlab.com/gitlab-org/gitlab_git/commit/8ae14bb84b94a2ec15f8a639fb82f0f55c77ad69 See merge request !487
| * | | | Check symlink mode as a String for file_type_icon_classRobert Speicher2015-04-012-2/+2
| | |_|/ | |/| | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab_git/commit/8ae14bb84b94a2ec15f8a639fb82f0f55c77ad69
* | | | Update CHANGELOG.Marin Jankovski2015-04-021-5/+4
| | | |
* | | | Update changelog for 7.9.2.Marin Jankovski2015-04-021-0/+2
|/ / /
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqMarin Jankovski2015-03-312-2/+2
|\ \ \
| * \ \ Merge branch 'no-chmod-r' into 'master'Dmitriy Zaporozhets2015-04-012-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use chmod_R for backup tars When creating backup tar files, only change permissions on the `db`, `uploads`, and `repositories` directories, not their contents. See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1716#note_40472 See merge request !1744
| | * | | Don't use chmod_R for backup tarsVinnie Okada2015-03-282-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | When creating backup tar files, only change permissions on the `db`, `uploads`, and `repositories` directories, not their contents.
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-03-3121-101/+263
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/gitlab/markdown.rb
| * \ \ \ \ Merge branch 'rs-issue-1340' into 'master'Dmitriy Zaporozhets2015-04-012-12/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unbind task item checkbox events and then rebind them Fixes #1340 This issue was caused by this line: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/views/projects/issues/update.js.haml#L17 `new Issue()` gets called on every JS-based issue update, and all the binds in the constructor get re-applied without first unbinding the existing ones. Right now my fix is *only* for the checkbox events, and I suspect there are similar issues still present for other events. See merge request !478
| | * | | | | Unbind task item checkbox events and then rebind themRobert Speicher2015-03-312-12/+4
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | Fixes #1340
| * | | | | Merge branch 'group-information-leak' into 'master'Dmitriy Zaporozhets2015-04-015-7/+137
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't leak private group existence by redirecting from namespace controller to group controller. See merge request !440
| | * | | | | Add tests.group-information-leakDouwe Maan2015-03-271-0/+121
| | | | | | |
| | * | | | | Don't leak private group existence by redirecting from namespace controller ↵Douwe Maan2015-03-244-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | to group controller.
| * | | | | | Merge branch 'admin-user-projects' into 'master'Dmitriy Zaporozhets2015-04-014-5/+9
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix admin user projects lists. The admin user personal projects lists wasn't being rendered anymore. cc @marin See merge request !442
| | * | | | | | Fix admin user projects lists.admin-user-projectsDouwe Maan2015-03-314-5/+8
| | |/ / / / /
| * | | | | | Merge branch 'refactor-milestones' into 'master'Dmitriy Zaporozhets2015-04-017-57/+62
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better looking milestone lists ### Before ![milestone-before](https://gitlab.com/gitlab-org/gitlab-ce/uploads/1366ade74d76b067fdc8707d31d2bffc/milestone-before.png) ### After ![milestone-after](https://gitlab.com/gitlab-org/gitlab-ce/uploads/80ae1c1f77eae5dff8ee61c4271bec17/milestone-after.png) See merge request !484
| | * | | | | Better looking milestone listsDmitriy Zaporozhets2015-04-017-57/+62
| | | | | | |
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-013-5/+36
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge branch 'file-commit-list' into 'master'Douwe Maan2015-03-311-1/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue where only 25 commits would load in file listings Fixes #1310 See https://gitlab.com/gitlab-org/gitlab-ce/tree/master and it will only show the first 25 files commit messages. See merge request !477
| | | * | | | | Fixed issue where only 25 commits would load in file listingsPhil Hughes2015-03-301-1/+1
| | | | | | | |
| | * | | | | | Merge branch 'doc_issue_closing' into 'master'Robert Schilling2015-03-312-4/+35
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update documentation on issue closing pattern. See merge request !475
| | | * | | | | Missing dot.Achilleas Pipinellis2015-03-301-1/+1
| | | | | | | |
| | | * | | | | Update documentation on issue closing pattern.Achilleas Pipinellis2015-03-302-3/+34
| | | | | | | |
| * | | | | | | Merge pull request #9023 from dantudor/patch-1Dmitriy Zaporozhets2015-03-311-3/+3
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | Allow ability to delete branches with '/` in name
| | * | | | | | Added the missing commaDan Tudor2015-03-311-1/+1
| | | | | | | |
| | * | | | | | Allow ability to delete branches with '/` in nameDan Tudor2015-03-251-3/+3
| | | | | | | |
* | | | | | | | Merge branch 'email-full-url'Marin Jankovski2015-03-3112-64/+117
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Use relative URL for Markdown references, except in mails.email-full-urlDouwe Maan2015-03-2711-58/+111
| | | | | | | |
| * | | | | | | Return full URLs from GitLabIssueTrackerService.Douwe Maan2015-03-274-19/+19
| | |_|_|_|_|/ | |/| | | | |
View Lorry Controller Status