summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Remove CI helpKamil Trzcinski2015-09-171-4/+0
* Merge branch 'ldap-attributes' into 'master'Robert Speicher2015-09-162-1/+22
|\
| * Add to docsDouwe Maan2015-09-091-2/+2
| * Expand explanation in config fileDouwe Maan2015-09-091-15/+20
| * Add attributes to LDAP::Config.Douwe Maan2015-09-081-0/+1
| * Allow configuration of LDAP attributes GitLab will use for the new user account.Douwe Maan2015-09-081-0/+15
* | Update documentation and config filesKamil Trzcinski2015-09-161-3/+19
* | Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree...Kamil Trzcinski2015-09-151-9/+21
|\ \
| * \ Merge pull request #9138 from liyakun/masterStan Hu2015-09-141-0/+10
| |\ \
| | * | Add "Replace" and "Upload" featuresliyakun2015-09-151-0/+10
| * | | Merge branch 'dashboard-titles' into 'master'Dmitriy Zaporozhets2015-09-111-9/+11
| |\ \ \
| | * \ \ Merge branch 'master' into dashboard-titlesdashboard-titlesDouwe Maan2015-09-104-2/+42
| | |\ \ \ | | | |/ /
| | * | | Clean up overlap between dashboard and explore.Douwe Maan2015-09-081-9/+11
| | | |/ | | |/|
* | | | Revert "monkey patch of Hash"Kamil Trzcinski2015-09-141-15/+0
* | | | monkey patch of HashValery Sizov2015-09-141-0/+15
* | | | Merge branch 'ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g' of gitlab.com:gitlab...Valery Sizov2015-09-141-1/+6
|\ \ \ \
| * \ \ \ Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets2015-09-111-1/+6
| |\ \ \ \ | | |/ / /
| | * | | Bump rouge to 1.10.1Stan Hu2015-09-101-24/+0
| | | |/ | | |/|
| | * | Merge branch 'rouge-patch' into 'master'Robert Speicher2015-09-091-0/+24
| | |\ \
| | | * | Fix highlighting of deleted lines in diffs.rouge-patchDouwe Maan2015-09-091-0/+24
| | | |/
| | * | Fix reading session_expire_delay when application settings are not yet create...Kamil Trzcinski2015-09-091-1/+6
* | | | fix of APIValery Sizov2015-09-141-1/+1
|/ / /
* | | remove gitlab_ci configValery Sizov2015-09-105-150/+24
* | | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets2015-09-095-19/+33
|\ \ \ | |/ /
| * | Merge branch 'global_labels' into 'master'Dmitriy Zaporozhets2015-09-091-0/+2
| |\ \
| | * | CRUD for admin labelsValery Sizov2015-09-031-0/+2
| * | | FogBugz project importJared Szechy2015-09-082-1/+10
| | |/ | |/|
| * | Merge branch 'crowd' into 'master'Valery Sizov2015-09-072-1/+6
| |\ \
| | * | Crowd integrationValery Sizov2015-09-022-1/+6
| | |/
| * | Merge branch 'fix-wiki-page-history' into 'master'Douwe Maan2015-09-071-9/+13
| |\ \
| | * | Fix broken Wiki Page HistoryStan Hu2015-09-011-9/+13
| | |/
| * | Avoid instance variable re-use troubleJacob Vosmaer2015-09-021-1/+1
| |/
| * Merge branch 'gitlab-git-http-server' into 'master'Dmitriy Zaporozhets2015-09-011-6/+1
| |\
| | * Replace grack with gitlab-git-http-serverJacob Vosmaer2015-08-311-6/+1
| * | retrieving oauth token with LDAP credentialsoauth_token_with_ldapValery Sizov2015-08-311-2/+1
| |/
* | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDouwe Maan2015-08-264-8/+49
|\ \ | |/
| * Dashboard activity as separate pageDmitriy Zaporozhets2015-08-251-0/+1
| * Merge branch 'reply-by-email-improvements' into 'master'Robert Speicher2015-08-241-0/+2
| |\
| | * Ignore empty incoming messages.Douwe Maan2015-08-241-0/+2
| * | Only include base URL in OmniAuth full_host parameterStan Hu2015-08-232-9/+19
| |/
* | Update gitignore, change literal DB table names, fix errors, fix fontawesomeDouwe Maan2015-08-262-22/+0
* | Groundwork for merging CI into CEDouwe Maan2015-08-2523-47/+380
|/
* Merge branch 'master' into reply-by-emailDouwe Maan2015-08-202-2/+3
|\
| * Import sources: settings in the admin interfaceArtem Sidorenko2015-08-201-0/+1
| * Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets2015-08-111-2/+2
* | Add documentation.Douwe Maan2015-08-192-13/+26
* | Changes and stuff.Douwe Maan2015-08-181-1/+1
* | Reply by email POCDouwe Maan2015-08-183-0/+25
|/
* Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets2015-08-111-2/+2
* Merge branch 'gravatar-host-link' into 'master'Stan Hu2015-08-091-0/+10
|\
View Lorry Controller Status