summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Fix bug causing `@whatever` inside code blocks to sometimes be picked up as ↵issue-body-code-mentionsDouwe Maan2015-04-211-2/+2
| | | | a user mention.
* Revert disallowing usernames to end in period.revert-username-periodDouwe Maan2015-04-201-2/+2
|
* Merge branch 'fix-label-color' into 'master'Dmitriy Zaporozhets2015-04-201-16/+16
|\ | | | | | | | | | | | | | | Parse GFM references after sanitizing Parse GFM references - labels, issues, MRs, etc. - after calling the HTML Pipeline `SanitizationFilter` so that we can use non-whitelisted attributes like `style`. See #2188. See merge request !1745
| * Fix GFM extractionsVinnie Okada2015-04-171-13/+13
| | | | | | | | Extract and re-insert links after sanitizing user markup.
| * Parse GFM references after sanitizingVinnie Okada2015-03-281-3/+3
| | | | | | | | | | | | Parse GFM references - labels, issues, MRs, etc. - after calling the HTML Pipeline `SanitizationFilter` so that we can use non-whitelisted attributes like `style`.
* | Decrease memory use and increase performance of Google Code importer.Douwe Maan2015-04-171-47/+38
| |
* | Move import data out of project so it doesn't take ages to load.Douwe Maan2015-04-172-22/+17
| |
* | Make sure user has access to namespace in import tests.Douwe Maan2015-04-152-32/+37
| |
* | Merge branch 'sstanovnik-openssh_fix' into 'master'Dmitriy Zaporozhets2015-04-151-0/+55
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix generating SSH key fingerprints with OpenSSH 6.8. Replaces https://github.com/gitlabhq/gitlabhq/pull/9008. Fixes gitlab-org/gitlab-ce#1289. cc @jacobvosmaer See merge request !519
| * | Simplify regex.sstanovnik-openssh_fixDouwe Maan2015-04-141-3/+3
| | |
| * | Refactor key fingerprint generation.Douwe Maan2015-04-141-0/+55
| | |
* | | Merge branch 'ldap-block_auto_created_users' into 'master'Dmitriy Zaporozhets2015-04-152-2/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add config var to block auto-created LDAP users. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2110. See merge request !522
| * | | Add config var to block auto-created LDAP users.Douwe Maan2015-04-142-2/+10
| | | |
| * | | Non-persisted users already have the identity by way of build_new_user.Douwe Maan2015-04-141-0/+2
| | | |
* | | | Merge branch 'google-code-import' into 'master'Douwe Maan2015-04-154-0/+502
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import projects from Google Code. Resolves #1257. Issue import logic almost entirely taken from https://gitlab.com/o9000/google-code-to-gitlab ( :hearts: @o9000). ### To do - [x] List projects from Google Takeout file - [x] Import Git repository - [x] Import issues - [x] Link to correct attachment URL (https://code.google.com/p/support-tools/issues/detail?id=50) - [x] Handle deleted attachments - [x] Handle blockedOn attribute - [x] Add directions on how to get data from Google Takeout ### Import instructions ![Screen_Shot_2015-04-03_at_16.02.21](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4a87038035fbad9441cf613b8cdcc690/Screen_Shot_2015-04-03_at_16.02.21.png) ### Imported issue ![Screen_Shot_2015-04-03_at_16.25.49](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b2c2eaf5ecfcf57b3c48511eb5d26db4/Screen_Shot_2015-04-03_at_16.25.49.png) See merge request !471
| * | | 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 'ldap_migration'Dmitriy Zaporozhets2015-04-132-3/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: db/schema.rb
| * | | | Remove special cases for the 'ldap' providerJacob Vosmaer2015-04-132-3/+1
| | | | |
* | | | | Merge branch 'reference-access-control' into 'master'Dmitriy Zaporozhets2015-04-133-65/+66
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only allow users to reference groups, projects, issues, MRs, commits they have access to. Addresses https://dev.gitlab.org/gitlab/gitlabhq/issues/2183. See merge request !1742
| * | | | | Refactor ClosingIssueExtractor.Douwe Maan2015-04-031-12/+11
| | | | | |
| * | | | | Refactor ReferenceExtractor.Douwe Maan2015-04-031-29/+28
| | | | | |
| * | | | | Don't require user to every gfm call.Douwe Maan2015-04-031-21/+21
| | | | | |
| * | | | | Fix errors.Douwe Maan2015-04-022-20/+8
| | | | | |
| * | | | | Only allow users to cross-reference and close issues they have access to.Douwe Maan2015-04-021-2/+2
| | | | | |
| * | | | | Don't allow full access to guests in ReferenceExtractorDouwe Maan2015-04-021-3/+0
| | | | | |
| * | | | | Refactor Mentionable mentioned users to use ReferenceExtractor.Douwe Maan2015-04-021-2/+10
| | | | | |
| * | | | | Only allow user to reference objects they have access to.Douwe Maan2015-04-022-21/+31
| | | | | |
| * | | | | Slightly refactor ReferenceExtractor.Douwe Maan2015-04-022-38/+38
| | | | | |
* | | | | | Merge branch 'skip-email-reconfirmation' into 'master'Dmitriy Zaporozhets2015-04-131-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip email confirmation when set by admin or via LDAP. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2203. See merge request !494
| * | | | | | Skip email confirmation when set by admin or via LDAP.skip-email-reconfirmationDouwe Maan2015-04-061-0/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'shell-version-warning' into 'master'Dmitriy Zaporozhets2015-04-131-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Warn when gitlab-shell version doesn't match requirement. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/1791. See merge request !495
| * | | | | Warn when gitlab-shell version doesn't match requirement.shell-version-warningDouwe Maan2015-04-061-1/+1
| |/ / / /
* | | | | Merge branch 'rs-revert-preload-lib' into 'master'Dmitriy Zaporozhets2015-04-105-1/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Preload lib/" This reverts commit 5511a731bcc05034abacd4ec01ff7d5a2a3b89d3. The original commit added this because it also enabled threadsafety, a change which was itself later reverted in 66d6c809662980041fce66d182489c025475e7a7, but this got left behind. I don't fully understand the reasoning behind it so if I'm wrong, please tell me. My reasoning for reverting it is that it messes with Rails' (and by extension Spring's) class reloading during development. When I was working in `lib/gitlab/markdown` and had to stop and restart the server every time I made a change, I didn't know it at the time, but this was why. That was a huge pain point. If it's needed for production perhaps we could add a `if Rails.env.production?` clause around it so that it doesn't mess with development. See merge request !1758
| * | | | | Move lib/gitlab/contributors to its correct pathRobert Speicher2015-04-091-0/+0
| | | | | |
| * | | | | Add autoloads for lib/gitlab/satellite/files/*Robert Speicher2015-04-091-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These files don't match their naming convention, but for organizational purposes it makes sense.
| * | | | | Move lib/gitlab/oauth to lib/gitlab/o_authRobert Speicher2015-04-093-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Lets Rails autoload these files by name
* | | | | | Be more explicit about which "Markdown" ReferenceExtractor includesRobert Speicher2015-04-091-1/+1
|/ / / / /
* | | | | Use Projects::CreateService to create imported projects so hooks are executed.Douwe Maan2015-04-064-64/+12
|/ / / /
* | | | Merge branch 'configurable-attachment-size' into 'master'Douwe Maan2015-04-031-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-021-1/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | 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 '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
View Lorry Controller Status