Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix: Images cannot show when projects' path was changeduploads_path_fix | Valery Sizov | 2015-10-14 | 3 | -1/+125 |
| | |||||
* | Merge branch 'fix_email_downcasing' into 'master' | Robert Speicher | 2015-10-11 | 1 | -0/+21 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | LDAP email address downcasing Fixes #2960 In the event we cannot match an LDAP user by DN we attempt to find an identity by email address and then update the DN. In this case the identity is matched by email address. If the user's email address in LDAP has an upper case character we cannot find a match in the GitLab database. GitLab downcases emails before the user object is saved. This merge request downcases the email from LDAP before we lookup by email. I also added a test to prevent a regression. See merge request !1550 | ||||
| * | Fix ldap email downcasing bug | Drew Blessing | 2015-10-08 | 1 | -0/+21 |
| | | |||||
* | | Normalize space-like characters in keys before output to gitlab-shellrs-issue-2970 | Robert Speicher | 2015-10-08 | 1 | -0/+13 |
|/ | | | | | | | gitlab-shell expects only one tab separator per key, and an SSH key with a tab character in the comment, for example, would break things. Closes #2970 | ||||
* | Added methods for detecting MySQL/PostgreSQL | Yorick Peterse | 2015-10-07 | 1 | -0/+17 |
| | | | | | These two methods remove the need for manually going into ActiveRecord::Base.connection all over the place. | ||||
* | Fix gitlab_ci_yaml_processor specs | Kamil Trzcinski | 2015-10-05 | 1 | -0/+3 |
| | |||||
* | Fix next round of tests | Kamil Trzcinski | 2015-10-05 | 1 | -6/+6 |
| | |||||
* | Fix rubocop warnings in spec/lib and spec/tasks | Guilherme Garnier | 2015-10-03 | 2 | -6/+2 |
| | |||||
* | Fix tests | Kamil Trzcinski | 2015-09-29 | 1 | -3/+2 |
| | |||||
* | Test grace auth against gitlab_ci_project with tokenget-ci-token-from-ci-projects | Kamil Trzcinski | 2015-09-24 | 1 | -1/+4 |
| | |||||
* | Update stub syntax | Robert Speicher | 2015-09-24 | 1 | -1/+1 |
| | |||||
* | Fix grack auth spec | Kamil Trzcinski | 2015-09-24 | 1 | -1/+1 |
| | |||||
* | Fix LDAP attribute mappingfix-ldap-attributes | Douwe Maan | 2015-09-23 | 1 | -6/+6 |
| | |||||
* | Merge branch 'rs-relative-link-up-one' into 'master' | Robert Speicher | 2015-09-21 | 1 | -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-one | Robert Speicher | 2015-09-20 | 1 | -0/+8 |
| | | |||||
| * | Allow relative links to go up one directory level | Robert Speicher | 2015-09-18 | 1 | -4/+14 |
| | | |||||
* | | Rename reply_by_email to incoming_email to prepare for the future. | Douwe Maan | 2015-09-21 | 3 | -87/+62 |
| | | |||||
* | | remove API calls from CE to CIci_closer_integration | Valery Sizov | 2015-09-18 | 1 | -1/+0 |
|/ | |||||
* | Merge branch 'ldap-attributes' into 'master' | Robert Speicher | 2015-09-16 | 4 | -5/+70 |
|\ | | | | | | | | | | | | | | | Allow configuration of LDAP attributes GitLab will use for the new user account. Fixes #2412. See merge request !1261 | ||||
| * | Test overriding LDAP attributes | Douwe Maan | 2015-09-09 | 1 | -0/+65 |
| | | |||||
| * | Add attributes to LDAP::Config. | Douwe Maan | 2015-09-08 | 1 | -1/+1 |
| | | |||||
| * | Allow configuration of LDAP attributes GitLab will use for the new user account. | Douwe Maan | 2015-09-08 | 2 | -4/+4 |
| | | |||||
* | | fix specs. Stage 7 | Valery Sizov | 2015-09-15 | 2 | -305/+307 |
| | | |||||
* | | fix specs. Stage 5 | Valery Sizov | 2015-09-15 | 1 | -19/+19 |
| | | |||||
* | | rubocop satisfy | Valery Sizov | 2015-09-14 | 1 | -20/+20 |
| | | |||||
* | | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g | Dmitriy Zaporozhets | 2015-09-11 | 1 | -0/+19 |
|\ \ | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Add comments and clean up test for !1274 | Stan Hu | 2015-09-10 | 1 | -3/+0 |
| | | | |||||
| * | | Gracefully handle errors in syntax highlighting by leaving the block unformatted | Stan Hu | 2015-09-10 | 1 | -0/+22 |
| |/ | | | | | | | Closes #2433 | ||||
* | | Fix Ci::Ansi2html spec | Dmitriy Zaporozhets | 2015-09-11 | 1 | -33/+34 |
| | | |||||
* | | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g | Dmitriy Zaporozhets | 2015-09-09 | 12 | -43/+101 |
|\ \ | |/ | |||||
| * | Merge branch 'rs-cleanup-redcarpet-renderer' into 'master' | Douwe Maan | 2015-09-01 | 8 | -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 option | Robert Speicher | 2015-08-27 | 8 | -40/+0 |
| | | | |||||
| * | | Fix bug where only the first 15 Bitbucket issues would be imported. | Stan Hu | 2015-09-01 | 1 | -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_993 | Douwe Maan | 2015-08-29 | 13 | -12/+524 |
| |\ \ | | |/ | |||||
| | * | Merge branch 'rs-remove-user-color-scheme-class' into 'master' | Douwe Maan | 2015-08-27 | 2 | -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 module | Robert Speicher | 2015-08-25 | 2 | -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 changes | Joel Koglin | 2015-08-21 | 1 | -0/+22 |
| | | | | |||||
* | | | | Move helpers back to original directory | Dmitriy Zaporozhets | 2015-09-09 | 3 | -42/+3 |
| | | | | |||||
* | | | | Refactor CI tests | Dmitriy Zaporozhets | 2015-09-09 | 4 | -0/+500 |
| | | | | |||||
* | | | | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g | Douwe Maan | 2015-08-26 | 1 | -1/+0 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Re-enable the "links with adjacent text" UserReferenceFilter specrs-re-enable-user-reference-spec | Robert Speicher | 2015-08-24 | 1 | -1/+0 |
| | |/ | |/| | |||||
* | | | Groundwork for merging CI into CE | Douwe Maan | 2015-08-25 | 1 | -1/+1 |
|/ / | |||||
* | | Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLab | Stan Hu | 2015-08-23 | 3 | -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 Speicher | 2015-08-22 | 6 | -2/+456 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reply by email Fixes #1360. It's far from done, but _it works_. See merge request !1173 | ||||
| * | | No HTML-only email please | Douwe Maan | 2015-08-21 | 1 | -3/+16 |
| | | | |||||
| * | | Block blocked users from replying to threads by email.reply-by-email | Douwe Maan | 2015-08-21 | 1 | -0/+10 |
| | | | |||||
| * | | Add stub_reply_by_email_setting helper. | Douwe Maan | 2015-08-20 | 2 | -8/+7 |
| | | | |||||
| * | | Use heredocs. | Douwe Maan | 2015-08-20 | 1 | -95/+107 |
| | | | |||||
| * | | Add fixture_file helper. | Douwe Maan | 2015-08-20 | 5 | -21/+3 |
| | | | |||||
| * | | Removed unused fixtures. | Douwe Maan | 2015-08-20 | 1 | -1/+1 |
| | | |