| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | No HTML-only email please | Douwe Maan | 2015-08-21 | 2 | -153/+6 | |
| | | | | ||||||
| | * | | Block blocked users from replying to threads by email.reply-by-email | Douwe Maan | 2015-08-21 | 1 | -0/+3 | |
| | | | | ||||||
| | * | | Memoize address_regex locally. | Douwe Maan | 2015-08-20 | 1 | -2/+3 | |
| | | | | ||||||
| | * | | Fix spec by removing global state. | Douwe Maan | 2015-08-20 | 1 | -8/+6 | |
| | | | | ||||||
| | * | | Fix markdown specs. | Douwe Maan | 2015-08-20 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Fix indentation | Douwe Maan | 2015-08-20 | 1 | -2/+2 | |
| | | | | ||||||
| | * | | Add gitlab:reply_by_email:check rake task. | Douwe Maan | 2015-08-20 | 1 | -3/+6 | |
| | | | | ||||||
| | * | | Merge branch 'master' into reply-by-email | Douwe Maan | 2015-08-20 | 13 | -635/+90 | |
| | |\ \ | | |/ | ||||||
| | * | | Test Gitlab::Email::Receiver. | Douwe Maan | 2015-08-20 | 1 | -9/+9 | |
| | | | | ||||||
| | * | | Make error class names more consistent. | Douwe Maan | 2015-08-20 | 1 | -5/+5 | |
| | | | | ||||||
| | * | | Fix a couple of whoopsy daisies. | Douwe Maan | 2015-08-20 | 2 | -2/+4 | |
| | | | | ||||||
| | * | | Extract ReplyParser and AttachmentUploader from Receiver. | Douwe Maan | 2015-08-20 | 6 | -325/+362 | |
| | | | | ||||||
| | * | | Start on tests. | Douwe Maan | 2015-08-19 | 1 | -19/+18 | |
| | | | | ||||||
| | * | | Send a rejection email when the incoming email couldn't be processed. | Douwe Maan | 2015-08-19 | 1 | -6/+10 | |
| | | | | ||||||
| | * | | Turn reply-by-email attachments into uploads. | Douwe Maan | 2015-08-19 | 1 | -0/+33 | |
| | | | | ||||||
| | * | | Changes and stuff. | Douwe Maan | 2015-08-18 | 3 | -19/+305 | |
| | | | | ||||||
| | * | | Reply by email POC | Douwe Maan | 2015-08-18 | 1 | -0/+50 | |
| | | | | ||||||
| * | | | Remove trailing HTML entities from non-Rinku autolinks as well.rs-dev-issue-2550 | Robert Speicher | 2015-08-20 | 1 | -1/+7 | |
| | |/ |/| | ||||||
| * | | Import sources: settings in the admin interface | Artem Sidorenko | 2015-08-20 | 2 | -1/+31 | |
| | | | ||||||
| * | | Merge branch 'remove-satellites' | Dmitriy Zaporozhets | 2015-08-19 | 11 | -634/+59 | |
| |\ \ | |/ |/| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| | * | Merge branch 'master' into remove-satellites | Dmitriy Zaporozhets | 2015-08-17 | 1 | -1/+1 | |
| | |\ | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| | * | | Refactor pre/post receive commit services into one class | Dmitriy Zaporozhets | 2015-08-14 | 1 | -0/+59 | |
| | | | | ||||||
| | * | | Revert "Merge branch 'revert-satellites' into 'master' " | Dmitriy Zaporozhets | 2015-08-11 | 10 | -633/+0 | |
| | | | | | | | | | | | | | | | | This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c. | |||||
| * | | | Merge branch 'fix-authhash-infinite-loop' into 'master' | Robert Speicher | 2015-08-18 | 1 | -16/+30 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Fix infinite loop when SAML was incorrectly configured. See merge request !1170 | |||||
| | * | | | Fix infinite loop when SAML was incorrectly configured.fix-authhash-infinite-loop | Douwe Maan | 2015-08-17 | 1 | -16/+30 | |
| | | |/ | |/| | ||||||
| * | | | Merge branch 'mr-source-branch-clear-cache' into 'master' | Dmitriy Zaporozhets | 2015-08-18 | 1 | -0/+1 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clear cache to prevent listing deleted branches after MR removes source branch Closes #2272 See merge request !1160 | |||||
| | * | | | Clear cache to prevent listing deleted branches after MR removes source branch | Stan Hu | 2015-08-14 | 1 | -0/+1 | |
| | |/ / | | | | | | | | | | Closes #2272 | |||||
| * | | | Merge branch 'rs-remove-gfm_with_options' into 'master' | Douwe Maan | 2015-08-17 | 1 | -11/+1 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the `gfm_with_options` helper It was redundant because `gfm` also took options. See merge request !1152 | |||||
| | * | | | Remove the `gfm_with_options` helperrs-remove-gfm_with_options | Robert Speicher | 2015-08-12 | 1 | -11/+1 | |
| | |/ / | | | | | | | | | | It was redundant because `gfm` also took options. | |||||
| * | | | Merge branch 'fix-backslashes-inline-diff' into 'master' | Douwe Maan | 2015-08-17 | 1 | -2/+5 | |
| |\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug where backslashes in inline diffs could be dropped This MR fixes a bug in inline diff generation causing backslashes to be dropped. For example, the input: ``` input.to_s.sub(/[\r\n].+/,'').sub(/\\[rn].+/, '').strip ``` The second backslash is dropped in the second `sub` statement:  With this fix, it looks like:  Closes #2253 See merge request !1143 | |||||
| | * | | Fix bug where backslashes in inline diffs could be dropped | Stan Hu | 2015-08-11 | 1 | -2/+5 | |
| | |/ | | | | | | | Closes #2253 | |||||
| * | | markup_helper: detect .mkd and .mkdn as markdown | Ben Boeckel | 2015-08-12 | 1 | -1/+1 | |
| |/ | ||||||
| * | Revert "Merge branch 'web-editor-rugged' into 'master'" | Dmitriy Zaporozhets | 2015-08-11 | 4 | -0/+210 | |
| | | | | | | | | This reverts commit 5a1aa49b5533593dc4c6de82279fe44f5f15616c, reversing changes made to a675bea2c1c1d5d6923cb97b8714eb72d4e4ff9b. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | Revert "Merge branch 'drop-satellites'" | Dmitriy Zaporozhets | 2015-08-11 | 6 | -0/+423 | |
| | | | | | | | | This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | Merge branch 'rs-reference-data-attrs' into 'master' | Robert Speicher | 2015-08-10 | 8 | -8/+32 | |
| |\ | | | | | | | | | | | | | Add `data-[type]-id` attribute to reference links This is to let us redact them later in another filter. See merge request !1110 | |||||
| | * | Add `data-[type]-id` attribute to reference linksrs-reference-data-attrs | Robert Speicher | 2015-08-08 | 8 | -8/+32 | |
| | | | | | | | | | This is to let us redact them later in another filter. | |||||
| * | | Show incompatible projects in Bitbucket import status | Stan Hu | 2015-08-07 | 1 | -0/+4 | |
| |/ | | | | See #1871 | |||||
| * | Merge branch 'master' into drop-satellites | Dmitriy Zaporozhets | 2015-08-04 | 6 | -19/+68 | |
| |\ | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| | * | Add spec to RelativeLinkFilter for Unicode filenames | Robert Speicher | 2015-07-30 | 1 | -2/+11 | |
| | | | ||||||
| | * | Merge branch 'fix-image-file-is-not-displayed' into 'master' | Robert Speicher | 2015-07-30 | 1 | -2/+3 | |
| | |\ | | | | | | | | | | | | | | | | Update RelativeLinkFilter to support non-ASCII filenames See merge request !1050 | |||||
| | | * | Fix the image file that contains non-ascii character is not displayed | Hiroyuki Sato | 2015-07-27 | 1 | -2/+3 | |
| | | | | ||||||
| | * | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Valery Sizov | 2015-07-29 | 2 | -2/+20 | |
| | |\ \ | ||||||
| | | * | | Fix style points | GitLab | 2015-07-28 | 2 | -8/+7 | |
| | | | | | | | | | | | | | | | | | To make Rubocop and Douwe happy | |||||
| | | * | | Send GL_ID to gitlab-git-http-server as JSON | GitLab | 2015-07-28 | 1 | -3/+4 | |
| | | | | | ||||||
| | | * | | Handle missing @user during Git HTTP requests | GitLab | 2015-07-28 | 1 | -1/+10 | |
| | | | | | ||||||
| | | * | | Experimental support for gitlab-git-http-server | Jacob Vosmaer | 2015-07-28 | 2 | -2/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-git-http-server This change introduces the GITLAB_GRACK_AUTH_ONLY environment variable. When set, Grack requests to GitLab will only respond with the user's GL_ID (if the request is OK) or an error. This allows gitlab-git-http-server to use the main GitLab application as an authentication and authorization backend. If we like how this works we should drop the GITLAB_GRACK_AUTH_ONLY variable at some point in the future. | |||||
| | * | | | Fix bug causing Bitbucket importer to crash when OAuth application had been ↵bitbucket-re-authorize | Douwe Maan | 2015-07-28 | 1 | -6/+15 | |
| | | |/ | |/| | | | | | | | removed. | |||||
| | * | | Allow custom label to be set for authentication providers.auth-icons-labels | Douwe Maan | 2015-07-23 | 1 | -8/+20 | |
| | | | | ||||||
| | * | | Fix Remove source-branch for MRs from same project | Douwe Maan | 2015-07-22 | 1 | -1/+1 | |
| | |/ | ||||||
| | * | GoogleCode importer: Do not care about casing of image file extensions | Sven Strickroth | 2015-07-20 | 1 | -1/+1 | |
| | | | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de> | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |