summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Import Google Code issue assignee when mapped.google-code-importDouwe Maan2015-04-141-0/+14
|
* Skip issue comment when its content, updates and attachments are empty.Douwe Maan2015-04-141-39/+61
|
* Allow user map to be specified.Douwe Maan2015-04-144-17/+56
|
* Add comment number to imported Google Code comments.Douwe Maan2015-04-141-3/+3
|
* Remove author link since all code.google.com links will be shut down.Douwe Maan2015-04-141-8/+6
|
* Show Google Code image attachments inline.Douwe Maan2015-04-041-2/+6
|
* Mask owner email when updated.Douwe Maan2015-04-031-14/+10
|
* Allow projects to be imported from Google Code.Douwe Maan2015-04-034-0/+429
|
* Merge branch 'configurable-attachment-size' into 'master'Douwe Maan2015-04-032-3/+12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-3/+12
| | | | | | | | | | | | 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-021-0/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Import GitHub, Bitbucket or GitLab.com projects owned by authenticated user ↵Douwe Maan2015-03-311-0/+4
| | | | | | | | | | | | into current namespace.
* | | Merge branch 'repository-archive-worker' into 'master'Dmitriy Zaporozhets2015-04-021-5/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Archive repositories in background worker.Douwe Maan2015-03-311-5/+6
| |/ /
* | | Merge branch 'username-period' into 'master'Dmitriy Zaporozhets2015-04-023-32/+38
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Don't allow username to end in period.Douwe Maan2015-03-272-3/+5
| | | |
| * | | Use more specific regexes.Douwe Maan2015-03-271-30/+34
| | | |
| * | | Move User.cleanup_username to Namespace.cleanup_path.Douwe Maan2015-03-271-1/+1
| | | |
* | | | ability to skip some items in backupbackup_skip_optionValery Sizov2015-04-022-15/+60
| |_|/ |/| |
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqMarin Jankovski2015-03-311-1/+1
|\ \ \
| * \ \ Merge branch 'no-chmod-r' into 'master'Dmitriy Zaporozhets2015-04-011-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-281-1/+1
| | |/ / | | | | | | | | | | | | | | | | 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-312-16/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: lib/gitlab/markdown.rb
| * \ \ \ Merge branch 'group-information-leak' into 'master'Dmitriy Zaporozhets2015-04-011-1/+1
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | Don't leak private group existence by redirecting from namespace controller to group controller. See merge request !440
| | * | | Don't leak private group existence by redirecting from namespace controller ↵Douwe Maan2015-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | to group controller.
| * | | | 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-311-37/+53
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use relative URL for Markdown references, except in mails.email-full-urlDouwe Maan2015-03-271-37/+53
| | |_|/ | |/| |
* | | | Merge branch 'events-paginate' into 'master'Douwe Maan2015-03-301-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Events paginate Updated the api method for /project/:id/events, to use the paginate method instead of limiting and offsetting the recent events in the method itself. This will also change the first page to be 1 instead of 0, but using 0 will still work and will give back the first page. This also add's the link headers (next/first/last). See merge request !267
| * | | | Updated api method GET /projects/:id/events to use paginate instead of a ↵Stephan van Leeuwen2015-03-241-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | self-implementation Also updated example request url Added changelog item
* | | | | Include brakeman in rake testDmitriy Zaporozhets2015-03-291-0/+1
| | | | |
* | | | | properly paginate project events in APINihad Abbasov2015-03-291-4/+1
| |/ / / |/| | |
* | | | Merge branch 'backup-chdir' into 'master'Dmitriy Zaporozhets2015-03-261-7/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change directory when removing old backups Fixes errors when deleting old backups in the `gitlab:backup:create` rake task. See #2177. See merge request !1740
| * | | | Change directory when removing old backupsVinnie Okada2015-03-241-7/+8
| | | | |
* | | | | Merge branch 'master' into 'master'Dmitriy Zaporozhets2015-03-261-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change ordering so that confirm is removed from attrs before attempting to User.build_user Possible fix gitlab-org/gitlab-ce#1296 See merge request !445
| * | | | | Change ordering so that confirm is removed from attrs before attempting to ↵RICKETTM@uk.ibm.com2015-03-241-2/+2
| | |/ / / | |/| | | | | | | | | | | | | User.build_user
* | | | | Merge pull request #9021 from nicklegr/faster_auto_mergeDmitriy Zaporozhets2015-03-251-5/+1
|\ \ \ \ \ | | | | | | | | | | | | Faster merge request processing for large repository
| * | | | | Reset parking branch to HEAD everytimenicklegr2015-03-251-5/+1
| | |_|/ / | |/| | | | | | | | | | | | | * Reduces overhead of git checkout
* | | | | Merge pull request #8007 from mr-vinn/markdown-tagsDmitriy Zaporozhets2015-03-251-9/+25
|\ \ \ \ \ | | | | | | | | | | | | Allow HTML tags in user Markdown input
| * \ \ \ \ Merge branch 'master' into markdown-tagsVinnie Okada2015-03-248-60/+124
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Merge branch 'master' into markdown-tagsVinnie Okada2015-03-226-24/+38
| |\ \ \ \ \
| * | | | | | Fix SanitizationFilter bugsVinnie Okada2015-03-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return a `SafeBuffer` instead of a `String` from the `#gfm_with_options` method so that Rails doesn't escape our markup. Also add `<span>` to the sanitization whitelist to avoid breaking syntax highlighting in code blocks.
| * | | | | | Merge branch 'master' into markdown-tagsVinnie Okada2015-03-218-33/+37
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge updated CHANGELOG entries
| * | | | | | | Don't allow style attributes in inline HTMLVinnie Okada2015-03-211-1/+1
| | | | | | | |
| * | | | | | | Change HTML sanitizationVinnie Okada2015-03-191-13/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the `SanitizationFilter` class from the html-pipeline gem for inline HTML instead of calling the Rails `sanitize` method.
| * | | | | | | Merge branch 'master' into markdown-tagsVinnie Okada2015-03-17111-786/+3129
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the latest HTML pipeline gem
| * | | | | | | | Allow HTML tags in user Markdown inputVinnie Okada2014-10-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow whitelisted tags to appear in rendered HTML output by disabling Redcarpet's `:filter_html` option.
* | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-255-6/+6
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
View Lorry Controller Status