summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs-issue-2970' into 'master' Douwe Maan2015-10-091-1/+2
|\
| * Normalize space-like characters in keys before output to gitlab-shellrs-issue-2970Robert Speicher2015-10-081-1/+2
* | Merge branch 'rs-2fa-task' into 'master' Jacob Vosmaer2015-10-091-0/+23
|\ \ | |/ |/|
| * Add output and confirmation to gitlab:two_factor:disable_for_all_usersrs-2fa-taskRobert Speicher2015-10-081-2/+15
| * Add gitlab:two_factor:disable_for_all_users taskRobert Speicher2015-10-071-0/+10
* | Added dedicated Rake task for setting up PostgresYorick Peterse2015-10-082-0/+7
* | Added methods for detecting MySQL/PostgreSQLYorick Peterse2015-10-071-0/+11
|/
* Merge branch 'rs-remove-ci-disable'Kamil Trzcinski2015-10-052-10/+0
|\
| * Remove the option to disable CIrs-remove-ci-disableRobert Speicher2015-10-052-10/+0
* | Merge branch 'refactor-build-service' into 'master' Kamil Trzciński2015-10-052-3/+4
|\ \ | |/ |/|
| * Fix next round of testsKamil Trzcinski2015-10-051-1/+1
| * Make commit_spec runKamil Trzcinski2015-10-051-2/+2
| * Add user to Ci::Build to have pusher email addressKamil Trzcinski2015-10-051-1/+1
| * Refactor commit and buildKamil Trzcinski2015-10-051-0/+1
* | Exclude benchmarks from the spec Rake taskYorick Peterse2015-10-051-1/+1
* | Merge branch 'benchmark-suite' into 'master' Yorick Peterse2015-10-051-1/+10
|\ \ | |/ |/|
| * Basic setup for an RSpec based benchmark suitebenchmark-suiteYorick Peterse2015-10-021-1/+10
* | Fix rubocop warnings in libGuilherme Garnier2015-10-036-9/+5
|/
* Merge branch 'show-diff-stats-for-mr'Dmitriy Zaporozhets2015-10-012-0/+16
|\
| * Show additions/deletions stats on merge request diffDmitriy Zaporozhets2015-10-012-0/+16
* | Merge branch 'fix-work-with-multibyte-chars-in-ldap-uid' into 'master' Dmitriy Zaporozhets2015-10-011-1/+1
|\ \ | |/ |/|
| * Add support of multibyte characters in LDAP UIDПетров Роман2015-09-301-1/+1
* | Delegate ci_project parameters to projectsKamil Trzcinski2015-09-301-19/+4
|/
* Merge branch 'master' into 'master' Jacob Vosmaer2015-09-291-3/+4
|\
| * Add support for AWS S3 Server-Side Encryption supportPaul Beattie2015-09-251-3/+4
* | Merge branch 'orphaned-repo-cleanup' into 'master' Douwe Maan2015-09-291-34/+15
|\ \
| * | Guard against trailing slashes in repos_pathJacob Vosmaer2015-09-151-1/+5
| * | Improve repo cleanup taskJacob Vosmaer2015-09-151-34/+11
* | | Merge pull request #9650 from szechyjs/fb-close-commentStan Hu2015-09-251-1/+1
|\ \ \ | |_|/ |/| |
| * | FogBugz Import: Closed comments may contain user dataJared Szechy2015-09-211-1/+1
* | | api: add enable_ssl_verification to PUT/POST hooksBen Boeckel2015-09-241-2/+4
* | | api: expose note_events and enable_ssl_verification for hooksBen Boeckel2015-09-241-1/+1
* | | Merge branch 'cleanup-ci-dashboard' into 'master' Douwe Maan2015-09-241-21/+0
|\ \ \
| * | | Simplify CI projects queryDmitriy Zaporozhets2015-09-231-21/+0
* | | | Fix LDAP attribute mappingfix-ldap-attributesDouwe Maan2015-09-231-1/+2
|/ / /
* | | Merge branch 'fix-user-identities-api' into 'master' Douwe Maan2015-09-231-0/+11
|\ \ \
| * | | Added ability to update or set the identity of an existing user, like the doc...fix-user-identities-apiPatricio Cano2015-09-221-0/+11
| |/ /
* | | Skip check_initd_configured_correctly on omnibus installsAchilleas Pipinellis2015-09-221-0/+5
* | | Add missing rake and change nginx config for CI migrationKamil Trzcinski2015-09-221-12/+0
* | | Merge branch 'rs-relative-link-up-one' into 'master' Robert Speicher2015-09-211-11/+29
|\ \ \
| * | | Allow RelativeLinkFilter to go up multiple directoriesrs-relative-link-up-oneRobert Speicher2015-09-201-2/+1
| * | | Allow relative links to go up one directory levelRobert Speicher2015-09-181-11/+30
* | | | Merge branch 'rename-reply-by-email' into 'master' Robert Speicher2015-09-213-23/+17
|\ \ \ \
| * \ \ \ Merge branch 'master' into rename-reply-by-emailDouwe Maan2015-09-215-71/+189
| |\ \ \ \
| * | | | | Rename reply_by_email to incoming_email to prepare for the future.Douwe Maan2015-09-213-24/+19
* | | | | | Relax CI version check during importci-import-improvementsJacob Vosmaer2015-09-211-1/+3
* | | | | | Make importing builds less noisyJacob Vosmaer2015-09-211-1/+1
| |_|_|/ / |/| | | |
* | | | | Use GitlabCi::VERSION when checking migrationKamil Trzcinski2015-09-211-4/+2
| |/ / / |/| | |
* | | | Merge branch 'optimize-ci-tags-migration' into 'master' Marin Jankovski2015-09-215-71/+189
|\ \ \ \
| * | | | Use INSERT INTO to insert tagsKamil Trzcinski2015-09-211-7/+8
View Lorry Controller Status