summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Try wear_merged! without argumentDmitriy Zaporozhets2014-10-011-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'add_active_directory_ldap_option' into 'master'Dmitriy Zaporozhets2014-10-011-1/+3
|\ | | | | | | | | | | | | | | Add active directory ldap option Fixes #1557 See merge request !1139
| * Add option to gitlab config to specify if LDAP server is active directory.Marin Jankovski2014-09-301-1/+3
| |
* | Add rspec to test_ciDmitriy Zaporozhets2014-09-301-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Separate rake test for simplecovDmitriy Zaporozhets2014-09-301-0/+7
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'api/issues-filter-milestone' of ↵Dmitriy Zaporozhets2014-09-301-3/+12
|\ | | | | | | | | | | | | | | | | https://github.com/jubianchi/gitlabhq into jubianchi-api/issues-filter-milestone Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG
| * Filters issues by milestone via APIjubianchi2014-09-261-3/+12
| |
* | Add backup upload support to the rake taskJacob Vosmaer2014-09-291-2/+24
| |
* | Refactor commits graphDmitriy Zaporozhets2014-09-291-0/+49
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix branch APIDmitriy Zaporozhets2014-09-251-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix satellitesDmitriy Zaporozhets2014-09-251-8/+14
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix 500 error on empty search in projectDmitriy Zaporozhets2014-09-251-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix wikiuse-more-ruggedDmitriy Zaporozhets2014-09-251-4/+8
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Rollback diff drop and set default commit id to HEADDmitriy Zaporozhets2014-09-251-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Improve diff and bump gitlab_git revisionDmitriy Zaporozhets2014-09-241-1/+1
|
* Use new version of gitlab_git with extended rugged usageDmitriy Zaporozhets2014-09-241-1/+1
|
* Merge pull request #7823 from cirosantilli/test-fetch-shellDmitriy Zaporozhets2014-09-241-1/+4
|\ | | | | Only clone GitLab Shell on tests if necessary.
| * Only clone GitLab Shell on tests if necessary.Ciro Santilli2014-09-221-1/+4
| |
* | Merge branch 'api/improve-error-reporting' of ↵Dmitriy Zaporozhets2014-09-238-49/+76
|\ \ | | | | | | | | | https://github.com/jubianchi/gitlabhq into jubianchi-api/improve-error-reporting
| * | Improve error reporting on users APIjubianchi2014-09-168-49/+76
| | | | | | | | | | | | | | | | | | | | | | | | * users (#6878, #3526, #4209): Validation error messages are now exposed through 400 responses, 409 response are sent in case of duplicate email or username * MRs (#5335): 409 responses are sent in case of duplicate merge request (source/target branches), 422 responses are sent when submiting MR fo/from unrelated forks * issues * labels * projects
* | | Fix ref parsing in Gitlab::GitAccessJacob Vosmaer2014-09-231-5/+23
| | |
* | | Merge pull request #7807 from cirosantilli/factor-service-errorDmitriy Zaporozhets2014-09-222-9/+7
|\ \ \ | | | | | | | | Factor error and success methods from services.
| * | | Factor error and success methods from services.Ciro Santilli2014-09-212-9/+7
| | |/ | |/|
* | | Merge branch '7-4-pre' into 'master'Dmitriy Zaporozhets2014-09-226-30/+34
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7.4 development Development branch during `master` code freeze for 7.3 See merge request !1096
| * \ \ Merge branch 'refator-members-logic' of ↵Dmitriy Zaporozhets2014-09-176-30/+34
| |\ \ \ | | |/ / | |/| | | | | | https://dev.gitlab.org/dzaporozhets/gitlabhq into 7-4-pre
| | * | Fix finder and tests for new membership modelsDmitriy Zaporozhets2014-09-151-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | More fixes to project members apiDmitriy Zaporozhets2014-09-151-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Fix access_level apiDmitriy Zaporozhets2014-09-151-5/+5
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Replace project_access attribute with access_level in specs and APIDmitriy Zaporozhets2014-09-151-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Replace old references of users_project & users_groupDmitriy Zaporozhets2014-09-141-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Huge replace of old users_project and users_group referencesDmitriy Zaporozhets2014-09-146-20/+24
| | |/ | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Support sockets in 'rake gitlab:shell:install'Jacob Vosmaer2014-09-221-4/+9
|/ /
* | Check for hooks directory symlink in gitlab:checkJacob Vosmaer2014-09-161-62/+17
| |
* | Fix typo in comment.Marin Jankovski2014-09-161-1/+1
| |
* | Ordering and sorting for MR in api.Marin Jankovski2014-09-151-0/+14
|/
* Merge pull request #7712 from bbodenmiller/patch-1Dmitriy Zaporozhets2014-09-122-2/+2
|\ | | | | set fail_timeout=0 as recommended by Unicorn
| * fail_timeout=0 as recommended by UnicornBen Bodenmiller2014-09-122-2/+2
| | | | | | | | | | | | Set's fail_timeout=0 as recommended by http://unicorn.bogomips.org/Unicorn/Configurator.html#method-i-timeout when Unicorn is running behind nginx.
* | Merge remote-tracking branch 'origin/master' into feature-oauth-refactoringJan-Willem van der Meer2014-09-1118-124/+411
|\ \
| * | Prevent 500 error when search wiki for non-existing repoDmitriy Zaporozhets2014-09-091-4/+9
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Merge branch 'parallel_diff_refactor' into 'master'Dmitriy Zaporozhets2014-09-095-83/+151
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Parallel diff refactor Refactor side-by-side diff to remove code duplication. Base the side-by-side diff on inline diff code. In first iteration: 1. commenting on the side-by-side diff is not possible 1. no expanding of the surrounding code See merge request !1066
| | * | Refactoring inside refactoring. We need to go deeperDmitriy Zaporozhets2014-09-084-18/+29
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Specs for diff parser! Yay!Dmitriy Zaporozhets2014-09-081-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Use new diff parsing logicDmitriy Zaporozhets2014-09-081-88/+0
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Gitlab::Diff classes addedDmitriy Zaporozhets2014-09-083-0/+140
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Take the next type into considerationMarin Jankovski2014-09-081-1/+2
| | | |
| | * | Remove duplication, expand for next_line.Marin Jankovski2014-09-081-42/+1
| | | |
| | * | Duplicate the behaviour and refactor for use with parallel diff.Marin Jankovski2014-09-081-0/+45
| | | |
| * | | Merge pull request #7695 from coverer/search_wikiDmitriy Zaporozhets2014-09-091-1/+17
| |\ \ \ | | | | | | | | | | Added search wiki feature
| | * | | Fixed trailing white spaceRalf Seidler2014-09-061-1/+1
| | | | |
| | * | | Fixed houndci complaining over too long linesRalf Seidler2014-09-061-2/+4
| | | | |
View Lorry Controller Status