summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs-throttle-reset' into 'master' Douwe Maan2015-10-021-51/+53
|\
| * Add recently_reset message to Devise translationsRobert Speicher2015-10-011-0/+1
| * Update config/locales/devise.en.yml with latest versionRobert Speicher2015-10-011-51/+52
* | Merge branch 'ee_features_in_example_config' into 'master' Dmitriy Zaporozhets2015-10-011-1/+0
|\ \ | |/ |/|
| * Removes reference to Enterprise Edition ssh key sync feature.Ted Strzalkowski2015-07-211-1/+0
* | Take advantage of `Devise.sign_in_after_reset_password`rs-disable-signin-after-resetRobert Speicher2015-09-301-0/+4
* | Move CI project settings page to CE project settings areamove-ci-settingsDmitriy Zaporozhets2015-09-291-0/+1
* | Merge branch 'move-triggers-page' into 'master' Dmitriy Zaporozhets2015-09-291-2/+1
|\ \
| * | Move CI triggers page to project settings areamove-triggers-pageDmitriy Zaporozhets2015-09-291-2/+1
* | | Merge branch 'master' into 'master' Jacob Vosmaer2015-09-292-14/+17
|\ \ \ | |/ / |/| |
| * | Add support for AWS S3 Server-Side Encryption supportPaul Beattie2015-09-252-14/+17
* | | Move CI variables page to project settingsmove-variables-pageDmitriy Zaporozhets2015-09-281-1/+1
* | | Merge branch 'move-runners-page'Dmitriy Zaporozhets2015-09-281-8/+7
|\ \ \
| * | | Move runners page to project settingsDmitriy Zaporozhets2015-09-251-8/+7
| |/ /
* | | Merge branch 'fxposter/gitlab-ce-login-from-admin'Douwe Maan2015-09-281-0/+1
|\ \ \ | |/ / |/| |
| * | Move login button to user page, switched to POST methodPavel Forkert2015-09-241-1/+1
| * | Add option to admin area to sign in as a specific userPavel Forkert2015-09-241-0/+1
* | | Add and document option to use StartTLS with mail_room.Douwe Maan2015-09-241-0/+2
|/ /
* | Move CI charts to project graphs areaDmitriy Zaporozhets2015-09-231-0/+1
* | Merge branch 'rename-reply-by-email' into 'master' Robert Speicher2015-09-212-6/+6
|\ \
| * | Rename reply_by_email to incoming_email to prepare for the future.Douwe Maan2015-09-212-5/+5
* | | Fix grammarSytse Sijbrandij2015-09-211-2/+2
|/ /
* | fixes link to reply_by_email docsSameer Naik2015-09-201-1/+1
* | remove API calls from CE to CIci_closer_integrationValery Sizov2015-09-181-1/+0
* | Merge branch 'pg_dump_schema' into 'master' Dmitriy Zaporozhets2015-09-182-0/+2
|\ \
| * | add pg_schema to backup configpg_dump_schemaValery Sizov2015-09-182-0/+2
* | | Allow to disable GitLab CIKamil Trzcinski2015-09-182-1/+2
|/ /
* | 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
View Lorry Controller Status