Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge pull request #8756 from zaburt/force_utf8_on_oauth_properties | Dmitriy Zaporozhets | 2015-05-03 | 1 | -28/+83 | |
|\ | | | | | add common method to force utf8 and force oauth properties to be utf8 | |||||
| * | add common method to force utf8 and force oauth properties to be utf8 | Onur Küçük | 2015-05-03 | 1 | -28/+83 | |
| | | ||||||
* | | Add Project#get_issue | Robert Speicher | 2015-04-30 | 1 | -4/+4 | |
| | | ||||||
* | | Autolink short URLs | Robert Speicher | 2015-04-30 | 1 | -0/+8 | |
| | | ||||||
* | | Add jira_project project factory | Robert Speicher | 2015-04-30 | 1 | -18/+1 | |
| | | ||||||
* | | Add Gitlab::Markdown::SanitizationFilter | Robert Speicher | 2015-04-30 | 1 | -0/+81 | |
| | | | | | | | | | | This just extends the HTML::Pipeline::SanitizationFilter with our custom whitelist. | |||||
* | | Add Gitlab::Markdown::AutolinkFilter | Robert Speicher | 2015-04-30 | 1 | -0/+98 | |
| | | ||||||
* | | Add Gitlab::Markdown::TableOfContentsFilter | Robert Speicher | 2015-04-30 | 1 | -0/+101 | |
| | | | | | | | | Removes header and table of contents processing from Redcarpet renderer. | |||||
* | | Show incompatible projects in Google Code import status | Stan Hu | 2015-04-30 | 1 | -0/+1 | |
|/ | | | | | | | | Importing a JSON file with only one Subversion project lead to confusion over whether the system was working. Provide status why these projects could not be imported directly. Closes #1531 | |||||
* | Merge branch 'fix-commit-data-url-generation' into 'master' | Douwe Maan | 2015-04-28 | 1 | -0/+16 | |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug where commit data would not appear in some subdirectories Fix issue where commit data would not show up in some subdirectories due to escaped slashes. For example: https://gitlab.common-lisp.net/ecl/ecl/tree/develop/src/gc (now patched with fix) The upgrade from Rails v4.1.2 to v4.1.9 (76aad9b76ed) caused slashes in a tree to be escaped automatically. Using a wildcard glob in the route prevents this behavior. * Closes #1478, #1459 * Closes https://github.com/gitlabhq/gitlabhq/issues/9037 See merge request !581 | |||||
| * | Fix bug where commit data would not appear in some subdirectories | Stan Hu | 2015-04-26 | 1 | -0/+16 | |
| | | | | | | | | | | | | | | The upgrade from Rails v4.1.2 to v4.1.9 (76aad9b76ed) caused slashes in a tree to be escaped automatically. Using wildcard globs prevents this behavior. Closes #1478, #1459 | |||||
* | | Fix (project_)name_regex to accept non-ASCII letters and dash | Jakub Jirutka | 2015-04-27 | 1 | -0/+3 | |
| | | ||||||
* | | Fix NotificationService spec | Robert Speicher | 2015-04-25 | 1 | -2/+2 | |
| | | ||||||
* | | Add CommitRange directly to results Hash | Robert Speicher | 2015-04-25 | 1 | -4/+4 | |
| | | ||||||
* | | Update CommitRangeReferenceFilter to use CommitRange class | Robert Speicher | 2015-04-25 | 1 | -4/+10 | |
| | | | | | | | | | | Also matches CommitReferenceFilter's new behavior of always using short SHAs in the link text. | |||||
* | | Always use short SHAs as commit reference link text | Robert Speicher | 2015-04-25 | 1 | -4/+14 | |
| | | | | | | | | | | | | Now when a user pastes a full SHA like `d7f61affaf845f44b4cc995e34eb1606c47c8eff`, its link text will only show `d7f61aff` for brevity. | |||||
* | | Refactor ReferenceExtractor to use pipeline filters | Robert Speicher | 2015-04-25 | 1 | -74/+0 | |
| | | ||||||
* | | Add results to reference filters | Robert Speicher | 2015-04-25 | 7 | -16/+107 | |
|/ | ||||||
* | Use project.commit convenience method. | Douwe Maan | 2015-04-24 | 5 | -11/+11 | |
| | ||||||
* | Add Gitlab::Markdown::EmojiFilter | Robert Speicher | 2015-04-21 | 1 | -0/+97 | |
| | ||||||
* | Merge branch 'rs-reference-filters' into 'master' | Dmitriy Zaporozhets | 2015-04-21 | 10 | -1/+1026 | |
|\ | | | | | | | | | | | | | | | | | | | | | Convert GFM reference handling to html-pipeline filters - `Gitlab::Markdown` is now much cleaner - Better separation of concerns - Cleaner, less brittle, more maintainable specs for each reference type. - Label references actually work! See merge request !1753 | |||||
| * | Skip failing test until usernames can't end in periods again | Robert Speicher | 2015-04-20 | 1 | -0/+1 | |
| | | ||||||
| * | Tweak single-word label regex to fix pending spec. | Douwe Maan | 2015-04-20 | 1 | -1/+0 | |
| | | ||||||
| * | project_from_ref returns nil when reference doesn't exist. | Douwe Maan | 2015-04-20 | 1 | -2/+8 | |
| | | ||||||
| * | project_from_ref returns nil when reference can't be accessed | Robert Speicher | 2015-04-20 | 1 | -2/+2 | |
| | | | | | | | | | | Prior it would return the project from the current context, which wasn't the intended behavior. | |||||
| * | Add more tests for cross-project references | Robert Speicher | 2015-04-20 | 5 | -84/+129 | |
| | | ||||||
| * | Escape title attributes in references | Robert Speicher | 2015-04-20 | 5 | -0/+36 | |
| | | ||||||
| * | Add spec for ReferenceExtractor#labels | Robert Speicher | 2015-04-20 | 1 | -0/+9 | |
| | | ||||||
| * | Fix Issue and ExternalIssue reference specs | Robert Speicher | 2015-04-20 | 1 | -7/+15 | |
| | | ||||||
| * | Fix cross-project reference specs for new permission check | Robert Speicher | 2015-04-20 | 5 | -0/+25 | |
| | | | | | | | | | | For simplicity's sake, since we're testing the actual referencing, we just force the permission check to always be allowed. | |||||
| * | Check for project read permissions in cross-references | Robert Speicher | 2015-04-20 | 1 | -9/+36 | |
| | | ||||||
| * | Add permission checking to UserReferenceFilter | Robert Speicher | 2015-04-20 | 1 | -4/+14 | |
| | | ||||||
| * | Add name-based referencing to LabelReferenceFilter | Robert Speicher | 2015-04-20 | 1 | -18/+95 | |
| | | ||||||
| * | Fix ReferenceExtractor spec | Robert Speicher | 2015-04-20 | 1 | -1/+1 | |
| | | ||||||
| * | Make CommitRange and Snippets cross-referable | Robert Speicher | 2015-04-20 | 3 | -55/+82 | |
| | | ||||||
| * | Fix GitlabMarkdownHelper spec | Robert Speicher | 2015-04-20 | 1 | -0/+8 | |
| | | ||||||
| * | Reference filters :sparkles: | Robert Speicher | 2015-04-20 | 9 | -0/+747 | |
| | | | | | | | | | | Commit ranges, commits, external issues, issues, labels, merge requests, snippets, users. | |||||
* | | Update Google Code importer test.google-code-fixes | Douwe Maan | 2015-04-21 | 1 | -3/+4 | |
|/ | ||||||
* | Move import data out of project so it doesn't take ages to load. | Douwe Maan | 2015-04-17 | 1 | -1/+5 | |
| | ||||||
* | Make sure user has access to namespace in import tests. | Douwe Maan | 2015-04-15 | 5 | -5/+25 | |
| | ||||||
* | Merge branch 'sstanovnik-openssh_fix' into 'master' | Dmitriy Zaporozhets | 2015-04-15 | 1 | -0/+12 | |
|\ | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| * | Refactor key fingerprint generation. | Douwe Maan | 2015-04-14 | 1 | -0/+12 | |
| | | ||||||
* | | Merge branch 'ldap-block_auto_created_users' into 'master' | Dmitriy Zaporozhets | 2015-04-15 | 1 | -7/+60 | |
|\ \ | | | | | | | | | | | | | | | | | | | | | | 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 Maan | 2015-04-14 | 1 | -7/+60 | |
| | | | ||||||
* | | | Merge branch 'google-code-import' into 'master' | Douwe Maan | 2015-04-15 | 4 | -2/+138 | |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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  ### Imported issue  See merge request !471 | |||||
| * | | Import Google Code issue assignee when mapped.google-code-import | Douwe Maan | 2015-04-14 | 1 | -3/+7 | |
| | | | ||||||
| * | | Allow user map to be specified. | Douwe Maan | 2015-04-14 | 1 | -2/+9 | |
| | | | ||||||
| * | | Add comment number to imported Google Code comments. | Douwe Maan | 2015-04-14 | 1 | -0/+1 | |
| | | | ||||||
| * | | Remove author link since all code.google.com links will be shut down. | Douwe Maan | 2015-04-14 | 1 | -2/+0 | |
| | | | ||||||
| * | | Show Google Code image attachments inline. | Douwe Maan | 2015-04-04 | 1 | -1/+2 | |
| | | |