summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | Update markdown.rbAndrew Kumanyaev2014-08-181-1/+1
| | | | | | | | | | | | | | | Fix mistake by @qqshfox report
| | * | | Update markdown reference to external issuesAndrew Kumanyaev2014-06-231-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | 1. Issue may be not only in jira. 2. Rewrite method for support different external issue trackers
| * | | | Fix tests for CIDmitriy Zaporozhets2014-09-061-1/+1
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Added annotated tags. Updated tag haml file and call to gitlab-shell. ↵Sean Edge2014-09-041-2/+7
| | | | | | | | | | | | | | | | Updated API for annotated tags. Added tests for API. Strip leading/trailing whitespace from message, if present. Update CHANGELOG.
| * | | Validate branch-names and references in WebUI, APIRobert Schilling2014-09-031-0/+11
| | | | | | | | | | | | | | | | Add specs for GitRefValidator
* | | | Remove duplicated create methodJan-Willem van der Meer2014-09-081-10/+0
| | | |
* | | | Test authenticate method for Gitlab::LDAP::UserJan-Willem van der Meer2014-09-081-11/+16
| | | |
* | | | Add new Gitlab::Oauth::AuthHash classJan-Willem van der Meer2014-09-041-0/+54
| | | |
* | | | Move auth hash to a seperate classJan-Willem van der Meer2014-09-042-83/+42
| | | |
* | | | Use instance methods of LDAP::User as wellJan-Willem van der Meer2014-09-032-52/+50
| | | | | | | | | | | | | | | | Still in need of some proper cleanup
* | | | Refactor Oauth::User class to use instance methodsJan-Willem van der Meer2014-09-032-68/+80
|/ / /
* | | Merge branch 'feaure-ldap-oauth-tests'Dmitriy Zaporozhets2014-09-034-9/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: spec/lib/gitlab/oauth/user_spec.rb
| * | | Refactor: beter naming for active directory disabled usersJan-Willem van der Meer2014-09-012-2/+2
| | | |
| * | | Get uid from auth instead of info hashJan-Willem van der Meer2014-09-011-3/+1
| | | | | | | | | | | | | | | | As found in the omniauth specs: https://github.com/intridea/omniauth/wiki/Auth-Hash-Schema
| * | | Remove duplicate methodJan-Willem van der Meer2014-09-011-4/+0
| | | |
| * | | Ensure oath callbacks without a nickname work (google)Jan-Willem van der Meer2014-09-011-0/+1
| | | |
| * | | Handle user creation if email is not providedJan-Willem van der Meer2014-09-011-0/+1
| | | | | | | | | | | | | | | | This fixes #1541
| * | | Add tests for finding an oauth authenticated userJan-Willem van der Meer2014-09-011-1/+1
| | | |
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-09-021-0/+1
|\ \ \ \
| * \ \ \ Merge pull request #7663 from Razer6/all_is_not_a_valid_userDmitriy Zaporozhets2014-09-021-0/+1
| |\ \ \ \ | | | | | | | | | | | | 'all' is not a valid username
| | * | | | 'all' is not a valid usernameRobert Schilling2014-09-011-0/+1
| | |/ / /
* | | | | Merge branch 'gitlab-shell-2-0' into 'master'Dmitriy Zaporozhets2014-09-021-8/+31
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify GitLab to work with gitlab-shell 2.0 Related to #1516 See merge request !1057
| * | | | Rewrite GitAccess for gitlab-shell v2Dmitriy Zaporozhets2014-09-011-8/+31
| |/ / / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Handle user creation if email is not providedJan-Willem van der Meer2014-09-011-0/+1
|/ / / | | | | | | | | | This fixes #1541
* | | Merge branch 'feature-ldap-tests' into 'master'Dmitriy Zaporozhets2014-08-301-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feature ldap tests Move specs to proper places. Relates to #154 This is already mergeable, will continue in a new branch for additions & refactorings. See merge request !1053
| * | | Move and rename ldap / oauth specsJan-Willem van der Meer2014-08-291-1/+2
| | | |
* | | | Remove LDAP::Access#find_userJacob Vosmaer2014-08-291-16/+1
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method existed to allow LDAP users to take over existing GitLab accounts if the part before the '@' of their LDAP email attribute matched the username of an existing GitLab user. I propose to disable this behavior in order to prevent unintended GitLab account takeovers. After this change it is still possible to take over an existing GitLab account with your LDAP credentials, as long as the GitLab account email address matches the LDAP user email address.
* | | block visibility level restriction override in controllerJob van der Voort2014-08-281-1/+15
|/ /
* | Fix testsDmitriy Zaporozhets2014-08-272-2/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Search by issue/mr title and descriptionDmitriy Zaporozhets2014-08-271-2/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Pass scope and page to Gitlab::SearchResults#objects instead of initializeDmitriy Zaporozhets2014-08-272-21/+5
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Search results libraries addedDmitriy Zaporozhets2014-08-262-0/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab::SearchResults and Gitlab::ProjectSearchResults are libraries we are going to use to get search results based on query, enitity type and pagination. It will allow us to get only issues from project #23 where title or description includes 'foo'. Ex: search_results = Gitlab::ProjectSearchResults.new(project.id, 'foo', 'issues') search_results.objects => # [<Issues #23>, <Issues #34>] search_results.issues_count => 2 search_results.total_count => 12 (it includes results from comments and merge requests too) Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'blacklist/unsubscribes' into 'master'Dmitriy Zaporozhets2014-08-231-1/+24
|\ \ | | | | | | | | | | | | | | | | | | | | | Add 'unsubscribes' to the paths blacklist This is to prevent issues with the admin email feature in GitLab EE. See merge request !1034
| * | Add 'unsubscribes' to the paths blacklistJacob Vosmaer2014-08-221-0/+1
| | | | | | | | | | | | GitLab EE has a /unsubscribes/ route.
| * | Use one word per line in Gitlab::BlacklistJacob Vosmaer2014-08-221-1/+23
| | |
* | | Always set the origin remote in satellite actionsJacob Vosmaer2014-08-221-0/+1
|/ / | | | | | | | | This prevents issues with satellites containing outdated origin remotes after administrators move the git repositories directory.
* | diff unfoldskv2014-08-141-1/+1
| |
* | Merge branch 'ldap/cache_check' into 'master'Dmitriy Zaporozhets2014-08-132-7/+15
|\ \ | | | | | | | | | | | | | | | Cache LDAP check everywhere See merge request !1008
| * | Cache LDAP check in Gitlab::UserAccessJacob Vosmaer2014-08-061-7/+2
| | | | | | | | | | | | | | | This changes the number of LDAP calls when users access GitLab via Git-over-SSH or the API. LDAP check results are cached for 1 hour.
| * | Move LDAP timeout code to Gitlab::LDAP::AccessJacob Vosmaer2014-08-061-0/+13
| | |
* | | Increase import timeout from 2 to 4 minutesDmitriy Zaporozhets2014-08-111-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Use readme we support to render if there are multiple readmesRobert Schilling2014-08-111-0/+25
| | |
* | | Fix satellite testsDmitriy Zaporozhets2014-08-061-6/+9
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Refactor label rendering and default label set generationDmitriy Zaporozhets2014-07-291-19/+18
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Migrate issue/mr labels from act_as_taggable to own labelsDmitriy Zaporozhets2014-07-291-3/+4
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Git::Compare does not have limit param any moreDmitriy Zaporozhets2014-07-291-1/+5
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Refactor compare logic for MR. Use satellites only for forks for better ↵Dmitriy Zaporozhets2014-07-292-16/+13
| | | | | | | | | | | | | | | | | | performance Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Override Gitlab::Git::Compare limitDmitriy Zaporozhets2014-07-291-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'satellite_compare_gitlab_git' into 'master'Dmitriy Zaporozhets2014-07-291-9/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | Use Gitlab::Git::Compare in Satellite::CompareAction See merge request !976
| * | | Gitlab::Git::Compare in Satellite::CompareActionJacob Vosmaer2014-07-161-9/+6
| |/ /
View Lorry Controller Status