Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Case-insensetive search autocomplete for projets | Dmitriy Zaporozhets | 2014-01-18 | 1 | -1/+1 |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Prevent duplicate method names in helpers | Dmitriy Zaporozhets | 2014-01-18 | 1 | -5/+5 |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Fix search autocomplete | Dmitriy Zaporozhets | 2014-01-18 | 1 | -19/+8 |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Refactor search autocomplete. Use ajax for source | Dmitriy Zaporozhets | 2014-01-18 | 7 | -22/+65 |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Merge branch 'explain_ldap_check' into 'master' | Dmitriy Zaporozhets | 2014-01-17 | 2 | -2/+4 |
|\ | | | | | | | Improve the explanation of the LDAP check script | ||||
| * | Explain that `limit` only applies to the check | Jacob Vosmaer | 2014-01-16 | 2 | -2/+4 |
| | | |||||
* | | Fix typo in LDAP explanation comment | Jacob Vosmaer | 2014-01-17 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'explain_allow_username_or_email_login' into 'master' | Dmitriy Zaporozhets | 2014-01-17 | 1 | -0/+5 |
|\ \ | | | | | | | | | | Explain allow_username_or_email_login LDAP setting | ||||
| * | | Explain allow_username_or_email_login LDAP setting | Jacob Vosmaer | 2014-01-17 | 1 | -0/+5 |
| |/ | |||||
* | | Merge branch 'refactoring/context_into_services' into 'master' | Dmitriy Zaporozhets | 2014-01-17 | 31 | -55/+55 |
|\ \ | | | | | | | | | | | | | | | | Refactoring context Into services To prevent confusion where to write logic. Context or Service? | ||||
| * | | Fix require for file services | Dmitriy Zaporozhets | 2014-01-16 | 3 | -3/+3 |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Replace context with service in lib | Dmitriy Zaporozhets | 2014-01-16 | 3 | -6/+6 |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Replace context with service in specs | Dmitriy Zaporozhets | 2014-01-16 | 6 | -19/+19 |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Move all Context classes into Services | Dmitriy Zaporozhets | 2014-01-16 | 22 | -27/+27 |
| |/ | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | Merge branch 'feature/base64_content' into 'master' | Dmitriy Zaporozhets | 2014-01-17 | 9 | -11/+30 |
|\ \ | |/ |/| | | | Feature: base64 encoding for blob content | ||||
| * | Fix encoding pass to edit file satellite | Dmitriy Zaporozhets | 2014-01-16 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Add base64 encoding selector to new file UI so you can add image to repo | Dmitriy Zaporozhets | 2014-01-16 | 2 | -1/+7 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Accept encoding attribute in files API | Dmitriy Zaporozhets | 2014-01-16 | 1 | -2/+2 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Add files encoding support on context level | Dmitriy Zaporozhets | 2014-01-16 | 2 | -4/+6 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Mention base64 encoding for files API | Dmitriy Zaporozhets | 2014-01-16 | 1 | -0/+2 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Add support of base64 encoded content | Dmitriy Zaporozhets | 2014-01-16 | 3 | -4/+13 |
|/ | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Merge pull request #6061 from zzet/patch-8 | Dmitriy Zaporozhets | 2014-01-16 | 1 | -1/+6 |
|\ | | | | | Fix deprecation in specs | ||||
| * | Fix deprecation in specs | Andrew Kumanyaev | 2014-01-15 | 1 | -1/+6 |
| | | | | | | From https://github.com/gitlabhq/gitlabhq/pull/6053 | ||||
* | | Merge pull request #6062 from skv-headless/fix_n+1_user_page | Dmitriy Zaporozhets | 2014-01-16 | 1 | -1/+1 |
|\ \ | | | | | | | fix n+1 problem for namespaces | ||||
| * | | fix n+1 problem for namespaces | skv | 2014-01-15 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'custom_password_length' into 'master' | Dmitriy Zaporozhets | 2014-01-16 | 2 | -0/+16 |
|\ \ | | | | | | | | | | Document how to customize password length limits | ||||
| * | | Explain where the default password validation is | Jacob Vosmaer | 2014-01-13 | 1 | -1/+2 |
| | | | |||||
| * | | Add instructions for custom password length limits | Jacob Vosmaer | 2014-01-13 | 2 | -0/+15 |
| | | | |||||
* | | | Merge branch 'new-branch-usability' into 'master' | Dmitriy Zaporozhets | 2014-01-16 | 1 | -3/+2 |
|\ \ \ | | | | | | | | | | | | | Improve usability of new branch form | ||||
| * | | | New branch doesn't exist yet. | dosire | 2014-01-16 | 1 | -2/+2 |
| | | | | |||||
| * | | | Replace hints with text that is obviously not valid. | dosire | 2014-01-15 | 1 | -3/+2 |
| | | | | |||||
* | | | | Merge branch 'refactoring/issues_filter' into 'master' | Dmitriy Zaporozhets | 2014-01-16 | 13 | -248/+183 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring: Issues/MR filtering logic Move all issues, mr filtering logic into FilteringService | ||||
| * | | | | FilteringService works with scope :all event if current user is not defined | Dmitriy Zaporozhets | 2014-01-16 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | Remove unnecessary spec | Dmitriy Zaporozhets | 2014-01-15 | 1 | -73/+0 |
| | | | | | |||||
| * | | | | Remove unnecessary contexts | Dmitriy Zaporozhets | 2014-01-15 | 4 | -200/+0 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | Use FilteringService for project issuus, mrs | Dmitriy Zaporozhets | 2014-01-15 | 3 | -8/+17 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | Specs for FilteringService | Dmitriy Zaporozhets | 2014-01-15 | 1 | -0/+65 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | Use FilteringService for Dashboard, Group pages | Dmitriy Zaporozhets | 2014-01-15 | 4 | -21/+32 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | Implement FilteringService | Dmitriy Zaporozhets | 2014-01-15 | 1 | -0/+119 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | | Merge branch '6-4-update-guide' into 'master' | Dmitriy Zaporozhets | 2014-01-16 | 1 | -4/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | Improve 6-4 update guide | ||||
| * | | | | | Simplify upgrade guide based on 6-4 functionality mentioned by Jacob. | dosire | 2014-01-06 | 1 | -4/+2 |
| | | | | | | |||||
* | | | | | | Merge branch 'webhook_verify_none' into 'master' | Dmitriy Zaporozhets | 2014-01-16 | 1 | -1/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable SSL peer verification for all webhooks SSL peer verification was silently enabled by the HTTParty upgrade in 8a54fda45957b3755f7c06e5c9b955c794488ff1. This patch restores the previous behaviour of GitLab 6.3 and earlier. | ||||
| * | | | | | | Disable SSL peer verification for all webhooks | Jacob Vosmaer | 2014-01-15 | 1 | -1/+2 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | SSL peer verification was silently enabled by the HTTParty upgrade in 8a54fda45957b3755f7c06e5c9b955c794488ff1. This patch restores the previous behaviour of GitLab 6.3 and earlier. | ||||
* | | | | | | Merge branch 'say-media-mention' into 'master' | Dmitriy Zaporozhets | 2014-01-16 | 1 | -2/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Say Media Mention Sponsorship message for https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/388/diffs | ||||
| * | | | | | | Add second sponsorship message, perfect world. | dosire | 2014-01-16 | 1 | -2/+2 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2014-01-16 | 2 | -1/+10 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Merge pull request #6065 from jvanbaarsen/github-email-fix | Dmitriy Zaporozhets | 2014-01-16 | 1 | -1/+2 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Always ask for email with github omniauth | ||||
| | * | | | | | | Always ask for email with github omniauth | Jeroen van Baarsen | 2014-01-15 | 1 | -1/+2 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #2061 Fix was proposed on twitter by: neic0, in the following tweet: https://twitter.com/neic0/status/423138339806392320 | ||||
| * | | | | | | Merge pull request #6048 from jvanbaarsen/patch-2 | Sytse Sijbrandij | 2014-01-16 | 1 | -0/+8 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | Added webbrowser requirements | ||||
| | * | | | | | Added webbrowser requirements | Jeroen van Baarsen | 2014-01-15 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/gitlabhq/gitlabhq/issues/4319 |