summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Prevent 500 error when search wiki for non-existing repoDmitriy Zaporozhets2014-09-091-4/+9
* Merge branch 'parallel_diff_refactor' into 'master'Dmitriy Zaporozhets2014-09-095-83/+151
|\
| * Refactoring inside refactoring. We need to go deeperDmitriy Zaporozhets2014-09-084-18/+29
| * Specs for diff parser! Yay!Dmitriy Zaporozhets2014-09-081-1/+1
| * Use new diff parsing logicDmitriy Zaporozhets2014-09-081-88/+0
| * Gitlab::Diff classes addedDmitriy Zaporozhets2014-09-083-0/+140
| * 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
|\ \
| * | Fixed trailing white spaceRalf Seidler2014-09-061-1/+1
| * | Fixed houndci complaining over too long linesRalf Seidler2014-09-061-2/+4
| * | Added search wiki featureRalf Seidler2014-09-051-1/+15
* | | Prevent people from using ci since we plan to host ci on /ci later.Sytse Sijbrandij2014-09-091-0/+1
* | | Merge pull request #7646 from bushong1/snippet-search3Dmitriy Zaporozhets2014-09-091-0/+131
|\ \ \
| * | | Updating to persist a params snippets variableCharles Bushong2014-09-051-7/+38
| * | | Changing some formatting for the Hound, modifying some UI textCharles Bushong2014-09-021-7/+7
| * | | Adding in snippet search functionalityCharles Bushong2014-08-291-0/+100
* | | | Merge pull request #7147 from zzet/patch-12Marin Jankovski2014-09-081-6/+10
|\ \ \ \ | |_|_|/ |/| | |
| * | | fix link_to by @bwrsandmanAndrew Kumanyaev2014-08-201-1/+1
| * | | Update markdown.rbAndrew Kumanyaev2014-08-181-1/+1
| * | | Update markdown reference to external issuesAndrew Kumanyaev2014-06-231-4/+8
* | | | Fix tests for CIDmitriy Zaporozhets2014-09-061-1/+1
| |_|/ |/| |
* | | Added annotated tags. Updated tag haml file and call to gitlab-shell. Updat...Sean Edge2014-09-041-2/+7
* | | Validate branch-names and references in WebUI, APIRobert Schilling2014-09-031-0/+11
* | | Merge branch 'feaure-ldap-oauth-tests'Dmitriy Zaporozhets2014-09-034-9/+4
|\ \ \
| * | | 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
| * | | 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
| * | | 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 usernameRobert Schilling2014-09-011-0/+1
| | |/ / /
* | | | | Merge branch 'gitlab-shell-2-0' into 'master'Dmitriy Zaporozhets2014-09-021-8/+31
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Rewrite GitAccess for gitlab-shell v2Dmitriy Zaporozhets2014-09-011-8/+31
| |/ / /
* | | | Handle user creation if email is not providedJan-Willem van der Meer2014-09-011-0/+1
|/ / /
* | | Merge branch 'feature-ldap-tests' into 'master'Dmitriy Zaporozhets2014-08-301-1/+2
|\ \ \
| * | | Move and rename ldap / oauth specsJan-Willem van der Meer2014-08-291-1/+2
* | | | Remove LDAP::Access#find_userJacob Vosmaer2014-08-291-16/+1
| |_|/ |/| |
* | | block visibility level restriction override in controllerJob van der Voort2014-08-281-1/+15
|/ /
* | Fix testsDmitriy Zaporozhets2014-08-272-2/+2
* | Search by issue/mr title and descriptionDmitriy Zaporozhets2014-08-271-2/+2
* | Pass scope and page to Gitlab::SearchResults#objects instead of initializeDmitriy Zaporozhets2014-08-272-21/+5
* | Search results libraries addedDmitriy Zaporozhets2014-08-262-0/+137
* | Merge branch 'blacklist/unsubscribes' into 'master'Dmitriy Zaporozhets2014-08-231-1/+24
|\ \
| * | Add 'unsubscribes' to the paths blacklistJacob Vosmaer2014-08-221-0/+1
| * | 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
|/ /