summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Case-insensetive search autocomplete for projetsDmitriy Zaporozhets2014-01-181-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Prevent duplicate method names in helpersDmitriy Zaporozhets2014-01-181-5/+5
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix search autocompleteDmitriy Zaporozhets2014-01-181-19/+8
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Refactor search autocomplete. Use ajax for sourceDmitriy Zaporozhets2014-01-187-22/+65
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'explain_ldap_check' into 'master'Dmitriy Zaporozhets2014-01-172-2/+4
|\ | | | | | | Improve the explanation of the LDAP check script
| * Explain that `limit` only applies to the checkJacob Vosmaer2014-01-162-2/+4
| |
* | Fix typo in LDAP explanation commentJacob Vosmaer2014-01-171-1/+1
| |
* | Merge branch 'explain_allow_username_or_email_login' into 'master'Dmitriy Zaporozhets2014-01-171-0/+5
|\ \ | | | | | | | | | Explain allow_username_or_email_login LDAP setting
| * | Explain allow_username_or_email_login LDAP settingJacob Vosmaer2014-01-171-0/+5
| |/
* | Merge branch 'refactoring/context_into_services' into 'master'Dmitriy Zaporozhets2014-01-1731-55/+55
|\ \ | | | | | | | | | | | | | | | Refactoring context Into services To prevent confusion where to write logic. Context or Service?
| * | Fix require for file servicesDmitriy Zaporozhets2014-01-163-3/+3
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Replace context with service in libDmitriy Zaporozhets2014-01-163-6/+6
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Replace context with service in specsDmitriy Zaporozhets2014-01-166-19/+19
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Move all Context classes into ServicesDmitriy Zaporozhets2014-01-1622-27/+27
| |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'feature/base64_content' into 'master'Dmitriy Zaporozhets2014-01-179-11/+30
|\ \ | |/ |/| | | Feature: base64 encoding for blob content
| * Fix encoding pass to edit file satelliteDmitriy Zaporozhets2014-01-161-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 repoDmitriy Zaporozhets2014-01-162-1/+7
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Accept encoding attribute in files APIDmitriy Zaporozhets2014-01-161-2/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Add files encoding support on context levelDmitriy Zaporozhets2014-01-162-4/+6
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Mention base64 encoding for files APIDmitriy Zaporozhets2014-01-161-0/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Add support of base64 encoded contentDmitriy Zaporozhets2014-01-163-4/+13
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge pull request #6061 from zzet/patch-8Dmitriy Zaporozhets2014-01-161-1/+6
|\ | | | | Fix deprecation in specs
| * Fix deprecation in specsAndrew Kumanyaev2014-01-151-1/+6
| | | | | | From https://github.com/gitlabhq/gitlabhq/pull/6053
* | Merge pull request #6062 from skv-headless/fix_n+1_user_pageDmitriy Zaporozhets2014-01-161-1/+1
|\ \ | | | | | | fix n+1 problem for namespaces
| * | fix n+1 problem for namespacesskv2014-01-151-1/+1
| |/
* | Merge branch 'custom_password_length' into 'master'Dmitriy Zaporozhets2014-01-162-0/+16
|\ \ | | | | | | | | | Document how to customize password length limits
| * | Explain where the default password validation isJacob Vosmaer2014-01-131-1/+2
| | |
| * | Add instructions for custom password length limitsJacob Vosmaer2014-01-132-0/+15
| | |
* | | Merge branch 'new-branch-usability' into 'master'Dmitriy Zaporozhets2014-01-161-3/+2
|\ \ \ | | | | | | | | | | | | Improve usability of new branch form
| * | | New branch doesn't exist yet.dosire2014-01-161-2/+2
| | | |
| * | | Replace hints with text that is obviously not valid.dosire2014-01-151-3/+2
| | | |
* | | | Merge branch 'refactoring/issues_filter' into 'master'Dmitriy Zaporozhets2014-01-1613-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 definedDmitriy Zaporozhets2014-01-161-1/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Remove unnecessary specDmitriy Zaporozhets2014-01-151-73/+0
| | | | |
| * | | | Remove unnecessary contextsDmitriy Zaporozhets2014-01-154-200/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Use FilteringService for project issuus, mrsDmitriy Zaporozhets2014-01-153-8/+17
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Specs for FilteringServiceDmitriy Zaporozhets2014-01-151-0/+65
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Use FilteringService for Dashboard, Group pagesDmitriy Zaporozhets2014-01-154-21/+32
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Implement FilteringServiceDmitriy Zaporozhets2014-01-151-0/+119
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch '6-4-update-guide' into 'master'Dmitriy Zaporozhets2014-01-161-4/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Improve 6-4 update guide
| * | | | | Simplify upgrade guide based on 6-4 functionality mentioned by Jacob.dosire2014-01-061-4/+2
| | | | | |
* | | | | | Merge branch 'webhook_verify_none' into 'master'Dmitriy Zaporozhets2014-01-161-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 webhooksJacob Vosmaer2014-01-151-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 Zaporozhets2014-01-161-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Say Media Mention Sponsorship message for https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/388/diffs
| * | | | | | Add second sponsorship message, perfect world.dosire2014-01-161-2/+2
| | | | | | |
* | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-01-162-1/+10
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge pull request #6065 from jvanbaarsen/github-email-fixDmitriy Zaporozhets2014-01-161-1/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Always ask for email with github omniauth
| | * | | | | | Always ask for email with github omniauthJeroen van Baarsen2014-01-151-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-2Sytse Sijbrandij2014-01-161-0/+8
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Added webbrowser requirements
| | * | | | | Added webbrowser requirementsJeroen van Baarsen2014-01-151-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/gitlabhq/gitlabhq/issues/4319