summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Collapse)AuthorAgeFilesLines
* Fix LDAP attribute mappingfix-ldap-attributesDouwe Maan2015-09-231-6/+6
|
* Merge branch 'rs-relative-link-up-one' into 'master' Robert Speicher2015-09-211-4/+22
|\ | | | | | | | | Allow relative links to go up one directory level See merge request !1352
| * Allow RelativeLinkFilter to go up multiple directoriesrs-relative-link-up-oneRobert Speicher2015-09-201-0/+8
| |
| * Allow relative links to go up one directory levelRobert Speicher2015-09-181-4/+14
| |
* | Rename reply_by_email to incoming_email to prepare for the future.Douwe Maan2015-09-213-87/+62
| |
* | remove API calls from CE to CIci_closer_integrationValery Sizov2015-09-181-1/+0
|/
* Merge branch 'ldap-attributes' into 'master'Robert Speicher2015-09-164-5/+70
|\ | | | | | | | | | | | | | | Allow configuration of LDAP attributes GitLab will use for the new user account. Fixes #2412. See merge request !1261
| * Test overriding LDAP attributesDouwe Maan2015-09-091-0/+65
| |
| * Add attributes to LDAP::Config.Douwe Maan2015-09-081-1/+1
| |
| * Allow configuration of LDAP attributes GitLab will use for the new user account.Douwe Maan2015-09-082-4/+4
| |
* | fix specs. Stage 7Valery Sizov2015-09-152-305/+307
| |
* | fix specs. Stage 5Valery Sizov2015-09-151-19/+19
| |
* | rubocop satisfyValery Sizov2015-09-141-20/+20
| |
* | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets2015-09-111-0/+19
|\ \ | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Add comments and clean up test for !1274Stan Hu2015-09-101-3/+0
| | |
| * | Gracefully handle errors in syntax highlighting by leaving the block unformattedStan Hu2015-09-101-0/+22
| |/ | | | | | | Closes #2433
* | Fix Ci::Ansi2html specDmitriy Zaporozhets2015-09-111-33/+34
| |
* | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets2015-09-0912-43/+101
|\ \ | |/
| * Merge branch 'rs-cleanup-redcarpet-renderer' into 'master'Douwe Maan2015-09-018-40/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Decouple Gitlab::Markdown from the GitlabMarkdownHelper This module is now the sole source of knowledge for *how* we render Markdown (and GFM). See merge request !1223
| | * Reference filters no longer take a custom class context optionRobert Speicher2015-08-278-40/+0
| | |
| * | Fix bug where only the first 15 Bitbucket issues would be imported.Stan Hu2015-09-011-0/+34
| | | | | | | | | | | | Also fix a number of issues where author/reporter names were not available.
| * | Merge branch 'master' into joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993Douwe Maan2015-08-2913-12/+524
| |\ \ | | |/
| | * Merge branch 'rs-remove-user-color-scheme-class' into 'master'Douwe Maan2015-08-272-3/+45
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply syntax highlighting to fenced code blocks client-side Instead of applying the syntax highlighting scheme class to these blocks server-side, we use Javascript and Gon to apply the user's color scheme (or the default) client-side. This will make it easier to cache these blocks in the future because they're no longer state-dependent. See merge request !1203
| | | * Add Gitlab::ColorSchemes moduleRobert Speicher2015-08-252-3/+45
| | | | | | | | | | | | | | | | | | | | Very similar to Gitlab::Theme, this contains all of the definitions for our syntax highlighting schemes.
| * | | Issue #993: Fixed login failure when extern_uid changesJoel Koglin2015-08-211-0/+22
| | | |
* | | | Move helpers back to original directoryDmitriy Zaporozhets2015-09-093-42/+3
| | | |
* | | | Refactor CI testsDmitriy Zaporozhets2015-09-094-0/+500
| | | |
* | | | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDouwe Maan2015-08-261-1/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Re-enable the "links with adjacent text" UserReferenceFilter specrs-re-enable-user-reference-specRobert Speicher2015-08-241-1/+0
| | |/ | |/|
* | | Groundwork for merging CI into CEDouwe Maan2015-08-251-1/+1
|/ /
* | Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLabStan Hu2015-08-233-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and request them each session. Pass these tokens to the project import data. This prevents the need to encrypt these tokens and clear them in case they expire or get revoked. For example, if you deleted and re-created OAuth2 keys for Bitbucket, you would get an Error 500 with no way to recover: ``` Started GET "/import/bitbucket/status" for x.x.x.x at 2015-08-07 05:24:10 +0000 Processing by Import::BitbucketController#status as HTML Completed 500 Internal Server Error in 607ms (ActiveRecord: 2.3ms) NameError (uninitialized constant Import::BitbucketController::Unauthorized): app/controllers/import/bitbucket_controller.rb:77:in `rescue in go_to_bitbucket_for_permissions' app/controllers/import/bitbucket_controller.rb:74:in `go_to_bitbucket_for_permissions' app/controllers/import/bitbucket_controller.rb:86:in `bitbucket_unauthorized' ``` Closes #1871
* | Merge branch 'reply-by-email' into 'master'Robert Speicher2015-08-226-2/+456
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Reply by email Fixes #1360. It's far from done, but _it works_. See merge request !1173
| * | No HTML-only email pleaseDouwe Maan2015-08-211-3/+16
| | |
| * | Block blocked users from replying to threads by email.reply-by-emailDouwe Maan2015-08-211-0/+10
| | |
| * | Add stub_reply_by_email_setting helper.Douwe Maan2015-08-202-8/+7
| | |
| * | Use heredocs.Douwe Maan2015-08-201-95/+107
| | |
| * | Add fixture_file helper.Douwe Maan2015-08-205-21/+3
| | |
| * | Removed unused fixtures.Douwe Maan2015-08-201-1/+1
| | |
| * | Merge branch 'master' into reply-by-emailDouwe Maan2015-08-203-238/+4
| |\ \ | | |/
| * | Test Gitlab::Email::Receiver.Douwe Maan2015-08-201-0/+135
| | |
| * | Test Email::AttachmentUploader.Douwe Maan2015-08-202-1/+27
| | |
| * | Extract ReplyParser and AttachmentUploader from Receiver.Douwe Maan2015-08-202-481/+191
| | |
| * | Start on tests.Douwe Maan2015-08-191-0/+481
| | |
| * | Test Gitlab::ReplyByEmail.Douwe Maan2015-08-191-0/+86
| | |
* | | Remove trailing HTML entities from non-Rinku autolinks as well.rs-dev-issue-2550Robert Speicher2015-08-201-0/+10
| |/ |/|
* | Merge branch 'remove-satellites'Dmitriy Zaporozhets2015-08-193-238/+4
|\ \ | |/ |/| | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Merge branch 'master' into remove-satellitesDmitriy Zaporozhets2015-08-171-1/+1
| |\ | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets2015-08-113-224/+4
| | | | | | | | | | | | | | | This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c.
* | | Merge branch 'fix-authhash-infinite-loop' into 'master'Robert Speicher2015-08-181-4/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | Fix infinite loop when SAML was incorrectly configured. See merge request !1170
| * | | Fix infinite loop when SAML was incorrectly configured.fix-authhash-infinite-loopDouwe Maan2015-08-171-4/+0
| | |/ | |/|
View Lorry Controller Status