summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ | | | | | | | | | | | | | | | | | | | | Fix user identities API Added ability to update or set the identity of an existing user, like the documentation said it was possible, but actually wasn't. @DouweM or @stanhu could you please take a look at my code, and see if its sound? /cc @JobV See merge request !1398
| * Added ability to update or set the identity of an existing user, like the ↵fix-user-identities-apiPatricio Cano2015-09-221-0/+11
| | | | | | | | documentation said it was possible, but actually wasn't.
* | Skip check_initd_configured_correctly on omnibus installsAchilleas Pipinellis2015-09-221-0/+5
| | | | | | | | | | This was causing the task `gitlab-rake gitlab:incoming_email:check` to fail.
* | 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 relative links to go up one directory level See merge request !1352
| * | 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
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Rename reply_by_email to incoming_email to prepare for the future. Closes #2579. See merge request !1367
| * \ \ 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
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CI migration rake task for GitLab CE - Uses backup format for final GitLab CI 8.0 - Highly optimized tags migration SQL queries See merge request !1365
| * | | Use INSERT INTO to insert tagsKamil Trzcinski2015-09-211-7/+8
| | | |
| * | | Disable CI for time of migrationKamil Trzcinski2015-09-211-0/+13
| | | |
| * | | Change notices during migratingKamil Trzcinski2015-09-211-2/+2
| | | |
| * | | Create CI migration task on GitLab sideKamil Trzcinski2015-09-204-40/+152
| | | |
| * | | Use pure SQL queries to migrate CI tagsKamil Trzcinski2015-09-201-33/+25
| |/ /
* | | Fix reply by email for comments on a specific line in a diff/commit.reply-by-email-diffDouwe Maan2015-09-201-1/+2
|/ /
* | remove API calls from CE to CIci_closer_integrationValery Sizov2015-09-182-38/+0
|/
* Merge branch 'pg_dump_schema' into 'master' Dmitriy Zaporozhets2015-09-181-2/+6
|\ | | | | | | | | | | | | Add pg_schema to backup config https://dev.gitlab.org/gitlab/gitlabhq/issues/2489 See merge request !1345
| * add pg_schema to backup configpg_dump_schemaValery Sizov2015-09-181-2/+6
| |
* | Use 400 to notify that CI API is disabledallow-to-disable-ciKamil Trzcinski2015-09-181-1/+3
| |
* | Allow to disable GitLab CIKamil Trzcinski2015-09-182-0/+8
|/
* Fix: ci projects orderci_projects_orderValery Sizov2015-09-171-0/+21
|
* Merge branch 'restrict-user-api-integers' into 'master'Dmitriy Zaporozhets2015-09-171-1/+1
|\ | | | | | | | | | | | | | | Restrict users API endpoints to use integer IDs Closes #2267 See merge request !1156
| * Restrict users API endpoints to use integer IDsStan Hu2015-08-231-1/+1
| | | | | | | | Closes #2267
* | Merge branch 'fix-nginx' into 'master'Kamil Trzciński2015-09-161-0/+12
|\ \ | | | | | | | | | | | | | | | Add missing proxy requests to migration docs See merge request !1317
| * | Add missing proxy requests to migration docsfix-nginxKamil Trzcinski2015-09-161-0/+12
| | |
* | | Merge branch 'ldap-attributes' into 'master'Robert Speicher2015-09-164-11/+54
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | Allow configuration of LDAP attributes GitLab will use for the new user account. Fixes #2412. See merge request !1261
| * | Make code clearerldap-attributesDouwe Maan2015-09-161-11/+9
| | |
| * | Shuffle config around a bitDouwe Maan2015-09-093-15/+9
| | |
| * | Add attributes to LDAP::Config.Douwe Maan2015-09-082-3/+8
| | |
| * | Allow configuration of LDAP attributes GitLab will use for the new user account.Douwe Maan2015-09-083-11/+57
| | |
* | | Fix update_runner_info helperKamil Trzcinski2015-09-161-0/+2
| | |
* | | Fix migrate tags statementKamil Trzcinski2015-09-161-1/+1
| | |
* | | Merge remote-tracking branch 'origin/master' into ↵ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gKamil Trzcinski2015-09-161-1/+1
|\ \ \ | | | | | | | | | | | | ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
| * | | Fix broken sort in merge request APIStan Hu2015-09-151-1/+1
| | | | | | | | | | | | | | | | Closes #2266
* | | | Fix migrate taskKamil Trzcinski2015-09-161-1/+1
| | | |
* | | | Added migration docs and updated installation documentationKamil Trzcinski2015-09-161-0/+29
| | | |
* | | | Migrate CI servicesKamil Trzcinski2015-09-161-0/+7
| | | |
* | | | Add rake task for easy migration of SQL dumpsKamil Trzcinski2015-09-163-27/+159
| | | |
* | | | Fix backup testsKamil Trzcinski2015-09-161-1/+1
| | | |
* | | | Fix builds directory storeKamil Trzcinski2015-09-151-4/+8
| | | |
* | | | Use GitLab instead of GITLAB for rake taskKamil Trzcinski2015-09-151-1/+1
| | | |
* | | | Remove unused tasksKamil Trzcinski2015-09-152-20/+0
| | | |
* | | | Cleanup CI backup => migrate with GitLabKamil Trzcinski2015-09-156-346/+51
| | | |
* | | | fix specs. Stage 5Valery Sizov2015-09-151-6/+3
| | | |
View Lorry Controller Status