Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #9650 from szechyjs/fb-close-comment | Stan Hu | 2015-09-25 | 1 | -1/+1 | |
|\ \ \ | |_|/ |/| | | FogBugz Import: Include closed comments since they may contain user data | |||||
| * | | FogBugz Import: Closed comments may contain user data | Jared Szechy | 2015-09-21 | 1 | -1/+1 | |
| | | | ||||||
* | | | api: add enable_ssl_verification to PUT/POST hooks | Ben Boeckel | 2015-09-24 | 1 | -2/+4 | |
| | | | ||||||
* | | | api: expose note_events and enable_ssl_verification for hooks | Ben Boeckel | 2015-09-24 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge branch 'cleanup-ci-dashboard' into 'master' | Douwe Maan | 2015-09-24 | 1 | -21/+0 | |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup ci dashboard Part of #2594. Based on !1403 * remove rendering GitLab projects with not enabled CI on CI dashboard * remove enabling CI for projects from CI dashboard (now its done by simply pushing `.gitlab-ci.yml`) * simplify the projects query for CI dashboard See merge request !1405 | |||||
| * | | | Simplify CI projects query | Dmitriy Zaporozhets | 2015-09-23 | 1 | -21/+0 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | | | Fix LDAP attribute mappingfix-ldap-attributes | Douwe Maan | 2015-09-23 | 1 | -1/+2 | |
|/ / / | ||||||
* | | | Merge branch 'fix-user-identities-api' into 'master' | Douwe Maan | 2015-09-23 | 1 | -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-api | Patricio Cano | 2015-09-22 | 1 | -0/+11 | |
| |/ / | | | | | | | | | | documentation said it was possible, but actually wasn't. | |||||
* | | | Skip check_initd_configured_correctly on omnibus installs | Achilleas Pipinellis | 2015-09-22 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | This was causing the task `gitlab-rake gitlab:incoming_email:check` to fail. | |||||
* | | | Add missing rake and change nginx config for CI migration | Kamil Trzcinski | 2015-09-22 | 1 | -12/+0 | |
| | | | ||||||
* | | | Merge branch 'rs-relative-link-up-one' into 'master' | Robert Speicher | 2015-09-21 | 1 | -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-one | Robert Speicher | 2015-09-20 | 1 | -2/+1 | |
| | | | | ||||||
| * | | | Allow relative links to go up one directory level | Robert Speicher | 2015-09-18 | 1 | -11/+30 | |
| | | | | ||||||
* | | | | Merge branch 'rename-reply-by-email' into 'master' | Robert Speicher | 2015-09-21 | 3 | -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-email | Douwe Maan | 2015-09-21 | 5 | -71/+189 | |
| |\ \ \ \ | ||||||
| * | | | | | Rename reply_by_email to incoming_email to prepare for the future. | Douwe Maan | 2015-09-21 | 3 | -24/+19 | |
| | | | | | | ||||||
* | | | | | | Relax CI version check during importci-import-improvements | Jacob Vosmaer | 2015-09-21 | 1 | -1/+3 | |
| | | | | | | ||||||
* | | | | | | Make importing builds less noisy | Jacob Vosmaer | 2015-09-21 | 1 | -1/+1 | |
| |_|_|/ / |/| | | | | ||||||
* | | | | | Use GitlabCi::VERSION when checking migration | Kamil Trzcinski | 2015-09-21 | 1 | -4/+2 | |
| |/ / / |/| | | | ||||||
* | | | | Merge branch 'optimize-ci-tags-migration' into 'master' | Marin Jankovski | 2015-09-21 | 5 | -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 tags | Kamil Trzcinski | 2015-09-21 | 1 | -7/+8 | |
| | | | | | ||||||
| * | | | | Disable CI for time of migration | Kamil Trzcinski | 2015-09-21 | 1 | -0/+13 | |
| | | | | | ||||||
| * | | | | Change notices during migrating | Kamil Trzcinski | 2015-09-21 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Create CI migration task on GitLab side | Kamil Trzcinski | 2015-09-20 | 4 | -40/+152 | |
| | | | | | ||||||
| * | | | | Use pure SQL queries to migrate CI tags | Kamil Trzcinski | 2015-09-20 | 1 | -33/+25 | |
| |/ / / | ||||||
* | | | | Fix reply by email for comments on a specific line in a diff/commit.reply-by-email-diff | Douwe Maan | 2015-09-20 | 1 | -1/+2 | |
|/ / / | ||||||
* | | | remove API calls from CE to CIci_closer_integration | Valery Sizov | 2015-09-18 | 2 | -38/+0 | |
|/ / | ||||||
* | | Merge branch 'pg_dump_schema' into 'master' | Dmitriy Zaporozhets | 2015-09-18 | 1 | -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_schema | Valery Sizov | 2015-09-18 | 1 | -2/+6 | |
| | | | ||||||
* | | | Use 400 to notify that CI API is disabledallow-to-disable-ci | Kamil Trzcinski | 2015-09-18 | 1 | -1/+3 | |
| | | | ||||||
* | | | Allow to disable GitLab CI | Kamil Trzcinski | 2015-09-18 | 2 | -0/+8 | |
|/ / | ||||||
* | | Fix: ci projects orderci_projects_order | Valery Sizov | 2015-09-17 | 1 | -0/+21 | |
| | | ||||||
* | | Merge branch 'restrict-user-api-integers' into 'master' | Dmitriy Zaporozhets | 2015-09-17 | 1 | -1/+1 | |
|\ \ | | | | | | | | | | | | | | | | | | | | | | Restrict users API endpoints to use integer IDs Closes #2267 See merge request !1156 | |||||
| * | | Restrict users API endpoints to use integer IDs | Stan Hu | 2015-08-23 | 1 | -1/+1 | |
| | | | | | | | | | | | | Closes #2267 | |||||
* | | | Merge branch 'fix-nginx' into 'master' | Kamil Trzciński | 2015-09-16 | 1 | -0/+12 | |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | Add missing proxy requests to migration docs See merge request !1317 | |||||
| * | | | Add missing proxy requests to migration docsfix-nginx | Kamil Trzcinski | 2015-09-16 | 1 | -0/+12 | |
| | | | | ||||||
* | | | | Merge branch 'ldap-attributes' into 'master' | Robert Speicher | 2015-09-16 | 4 | -11/+54 | |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Allow configuration of LDAP attributes GitLab will use for the new user account. Fixes #2412. See merge request !1261 | |||||
| * | | | Make code clearerldap-attributes | Douwe Maan | 2015-09-16 | 1 | -11/+9 | |
| | | | | ||||||
| * | | | Shuffle config around a bit | Douwe Maan | 2015-09-09 | 3 | -15/+9 | |
| | | | | ||||||
| * | | | Add attributes to LDAP::Config. | Douwe Maan | 2015-09-08 | 2 | -3/+8 | |
| | | | | ||||||
| * | | | Allow configuration of LDAP attributes GitLab will use for the new user account. | Douwe Maan | 2015-09-08 | 3 | -11/+57 | |
| | | | | ||||||
* | | | | Fix update_runner_info helper | Kamil Trzcinski | 2015-09-16 | 1 | -0/+2 | |
| | | | | ||||||
* | | | | Fix migrate tags statement | Kamil Trzcinski | 2015-09-16 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge remote-tracking branch 'origin/master' into ↵ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g | Kamil Trzcinski | 2015-09-16 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | | | | | | ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g | |||||
| * | | | | Fix broken sort in merge request API | Stan Hu | 2015-09-15 | 1 | -1/+1 | |
| | |_|/ | |/| | | | | | | | | | | Closes #2266 | |||||
* | | | | Fix migrate task | Kamil Trzcinski | 2015-09-16 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Added migration docs and updated installation documentation | Kamil Trzcinski | 2015-09-16 | 1 | -0/+29 | |
| | | | | ||||||
* | | | | Migrate CI services | Kamil Trzcinski | 2015-09-16 | 1 | -0/+7 | |
| | | | | ||||||
* | | | | Add rake task for easy migration of SQL dumps | Kamil Trzcinski | 2015-09-16 | 3 | -27/+159 | |
| | | | |