summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Use Hash syntax for LDAP server declarationJan-Willem van der Meer2014-10-141-3/+3
* Remove unused methodsJan-Willem van der Meer2014-10-142-12/+0
* Add explaining note to authentication method [skip ci]Jan-Willem van der Meer2014-10-141-0/+2
* Use server specific uidJan-Willem van der Meer2014-10-141-1/+1
* Make sure the filters are appliedJan-Willem van der Meer2014-10-141-8/+9
* Fix authorization for LDAP loginJan-Willem van der Meer2014-10-142-1/+5
* DRY find method to find Gitlab userJan-Willem van der Meer2014-10-141-4/+2
* Remove unused methodJan-Willem van der Meer2014-10-141-8/+0
* Refactor lib files for multiple LDAP groupsJan-Willem van der Meer2014-10-137-114/+252
* Merge branch 'feature-oauth-refactoring' into 'master'Dmitriy Zaporozhets2014-10-133-70/+78
|\
| * Refactor OAuth refactorings to CEJan-Willem van der Meer2014-10-103-70/+78
* | Merge branch 'bug_with_apostrophe' into 'master'Dmitriy Zaporozhets2014-10-121-0/+12
|\ \
| * | Add a comment why this is done.Marin Jankovski2014-10-101-0/+6
| * | Substitute right single quote back with apostrophe.Marin Jankovski2014-10-101-0/+1
| * | Replace apostrophe with right single quote to avoid markdown interpretation a...Marin Jankovski2014-10-091-0/+5
* | | Merge branch 'enabling_markdown_pipelines_from_gitlab' into 'master'Dmitriy Zaporozhets2014-10-121-5/+13
|\ \ \ | |_|/ |/| |
| * | Make sure relative url and asset_host are honored, specs.Marin Jankovski2014-10-101-1/+6
| * | Enable markdown pipeline filters from inside gitlab.Marin Jankovski2014-10-091-8/+11
| |/
* | Add a comment on why we are using backward compatible ciphers.Marin Jankovski2014-10-101-3/+4
* | Revert "update ssl_ciphers"Marin Jankovski2014-10-101-1/+1
|/
* Merge pull request #7988 from marcaube/patch-1Robert Schilling2014-10-081-1/+4
|\
| * Update import.rakeMarc Aubé2014-10-071-1/+4
* | Improve wiki path parsing in internal apiDmitriy Zaporozhets2014-10-071-1/+1
* | Developers can push to wiki repo. Protected branches does not affect wiki rep...Dmitriy Zaporozhets2014-10-073-22/+41
|/
* Merge pull request #7963 from cirosantilli/factor-previewableDmitriy Zaporozhets2014-10-071-0/+4
|\
| * Factor markup? || gitlab_markdown? into new methodCiro Santilli2014-10-041-0/+4
* | Add task lists to issues and merge requestsVinnie Okada2014-10-052-1/+29
* | Fix external commit linksVinnie Okada2014-10-051-0/+1
* | Fix external issue linksVinnie Okada2014-10-051-3/+4
* | Track projects in ReferenceExtractorVinnie Okada2014-10-032-21/+33
* | Fix ReferenceExtractorVinnie Okada2014-10-032-4/+6
* | Implement cross-project Markdown referencesVinnie Okada2014-10-031-31/+59
|/
* Merge pull request #7779 from Bugagazavr/hook_tag_push_eventsDmitriy Zaporozhets2014-10-032-3/+16
|\
| * Add tag_push_events to project hook apiKirill Zaitsev2014-10-032-3/+16
* | Merge pull request #7664 from bbodenmiller/patch-2Sytse Sijbrandij2014-10-031-0/+2
|\ \
| * | add HSTS Policy warningBen Bodenmiller2014-09-011-0/+2
* | | Add parenthesis to function def with arguments.Ciro Santilli2014-10-038-18/+18
| |/ |/|
* | Merge branch 'backup_fail_hard' into 'master'Dmitriy Zaporozhets2014-10-023-6/+22
|\ \
| * | Fail harder in the backup scriptJacob Vosmaer2014-10-013-6/+22
* | | Merge pull request #7853 from Razer6/feature/html_pipelineDmitriy Zaporozhets2014-10-021-23/+13
|\ \ \
| * | | Factor out Emoji parsing using html-pipeline-gitlabRobert Schilling2014-09-261-23/+13
* | | | Merge branch 'fork-via-API' into 'master'Dmitriy Zaporozhets2014-10-011-0/+17
|\ \ \ \ | |_|/ / |/| | |
| * | | API: Initial support for forking a project via the APIBernhard Kaindl2014-10-011-0/+17
* | | | Try wear_merged! without argumentDmitriy Zaporozhets2014-10-011-1/+1
* | | | Merge branch 'add_active_directory_ldap_option' into 'master'Dmitriy Zaporozhets2014-10-011-1/+3
|\ \ \ \ | |/ / / |/| | |
| * | | 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
* | | | Separate rake test for simplecovDmitriy Zaporozhets2014-09-301-0/+7
|/ / /
* | | Merge branch 'api/issues-filter-milestone' of https://github.com/jubianchi/gi...Dmitriy Zaporozhets2014-09-301-3/+12
|\ \ \
| * | | Filters issues by milestone via APIjubianchi2014-09-261-3/+12