root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
19,147 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

2742 Commits

Author SHA1 Message Date
Douwe Maan b4bedfdfb9 Merge branch 'fix-user-identities-api' into 'master' 
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
 2015-09-23 09:13:23 +00:00
Patricio Cano f60eb60473 Added ability to update or set the identity of an existing user, like the documentation said it was possible, but actually wasn't. 2015-09-22 16:26:59 -05:00
Achilleas Pipinellis 110e90c855 Skip check_initd_configured_correctly on omnibus installs 
This was causing the task `gitlab-rake gitlab:incoming_email:check`
to fail.
 2015-09-22 22:56:49 +03:00
Kamil Trzcinski 156ace4778 Add missing rake and change nginx config for CI migration 2015-09-22 09:45:52 +02:00
Robert Speicher d4acda1253 Merge branch 'rs-relative-link-up-one' into 'master' 
Allow relative links to go up one directory level

See merge request !1352
 2015-09-21 19:38:37 +00:00
Robert Speicher d4a960161e Merge branch 'rename-reply-by-email' into 'master' 
Rename reply_by_email to incoming_email to prepare for the future.

Closes #2579.

See merge request !1367
 2015-09-21 18:52:13 +00:00
Jacob Vosmaer e0823d189f Relax CI version check during import 2015-09-21 11:46:12 +02:00
Jacob Vosmaer 25c7467ce1 Make importing builds less noisy 2015-09-21 11:42:59 +02:00
Douwe Maan 0c83349867 Merge branch 'master' into rename-reply-by-email 2015-09-21 10:35:56 +02:00
Douwe Maan ee028d9d60 Rename reply_by_email to incoming_email to prepare for the future. 2015-09-21 10:35:37 +02:00
Kamil Trzcinski ee0f1c00b1 Use GitlabCi::VERSION when checking migration 2015-09-21 10:33:35 +02:00
Marin Jankovski d2c90d7494 Merge branch 'optimize-ci-tags-migration' into 'master' 
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
 2015-09-21 08:26:06 +00:00
Kamil Trzcinski a37e591e74 Use INSERT INTO to insert tags 2015-09-21 10:07:53 +02:00
Robert Speicher 2b94f5fb06 Allow RelativeLinkFilter to go up multiple directories 2015-09-20 19:21:33 -04:00
Kamil Trzcinski 098c198271 Disable CI for time of migration 2015-09-21 00:14:07 +02:00
Kamil Trzcinski 500e277a83 Change notices during migrating 2015-09-21 00:13:58 +02:00
Kamil Trzcinski 265ad515c6 Create CI migration task on GitLab side 2015-09-20 23:20:51 +02:00
Kamil Trzcinski 45a105b127 Use pure SQL queries to migrate CI tags 2015-09-20 22:13:47 +02:00
Douwe Maan 3377808193 Fix reply by email for comments on a specific line in a diff/commit. 2015-09-20 18:18:39 +02:00
Robert Speicher 619f04c196 Allow relative links to go up one directory level 2015-09-18 14:03:42 -04:00
Valery Sizov a0c1a12dee remove API calls from CE to CI 2015-09-18 18:02:11 +02:00
Dmitriy Zaporozhets ac571623d8 Merge branch 'pg_dump_schema' into 'master' 
Add pg_schema to backup config

https://dev.gitlab.org/gitlab/gitlabhq/issues/2489

See merge request !1345
 2015-09-18 14:33:35 +00:00
Valery Sizov d7242054ba add pg_schema to backup config 2015-09-18 16:29:13 +03:00
Kamil Trzcinski 97fa990406 Use 400 to notify that CI API is disabled 2015-09-18 12:46:47 +02:00
Kamil Trzcinski e41a29b0c3 Allow to disable GitLab CI 2015-09-18 12:46:47 +02:00
Valery Sizov b7e49d8042 Fix: ci projects order 2015-09-17 20:12:17 +03:00
Dmitriy Zaporozhets da3d35952d Merge branch 'restrict-user-api-integers' into 'master' 
Restrict users API endpoints to use integer IDs

Closes #2267

See merge request !1156
 2015-09-17 07:29:57 +00:00
Kamil Trzciński cac969229a Merge branch 'fix-nginx' into 'master' 
Add missing proxy requests to migration docs

See merge request !1317
 2015-09-16 20:02:49 +00:00
Kamil Trzcinski 50e5950947 Add missing proxy requests to migration docs 2015-09-16 20:45:58 +02:00
Robert Speicher 09bcce7d1f Merge branch 'ldap-attributes' into 'master' 
Allow configuration of LDAP attributes GitLab will use for the new user account.

Fixes #2412.

See merge request !1261
 2015-09-16 18:34:55 +00:00
Kamil Trzcinski e01300ddb0 Fix update_runner_info helper 2015-09-16 16:46:26 +02:00
Kamil Trzcinski 7348d34cfd Fix migrate tags statement 2015-09-16 16:46:19 +02:00
Kamil Trzcinski ac8d2eb065 Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-09-16 13:34:58 +02:00
Kamil Trzcinski 0859ba75a8 Fix migrate task 2015-09-16 13:30:34 +02:00
Kamil Trzcinski d3886f9d41 Added migration docs and updated installation documentation 2015-09-16 10:58:33 +02:00
Douwe Maan 84d57bc703 Make code clearer 2015-09-16 09:14:04 +02:00
Stan Hu 1c289ac0c3 Fix broken sort in merge request API 
Closes #2266
 2015-09-15 22:55:22 -07:00
Kamil Trzcinski df7d807d5a Migrate CI services 2015-09-16 00:43:04 +02:00
Kamil Trzcinski 9c5833d5ac Add rake task for easy migration of SQL dumps 2015-09-16 00:09:09 +02:00
Kamil Trzcinski 2f2b9f67c2 Fix backup tests 2015-09-16 00:06:41 +02:00
Kamil Trzcinski c9d914a392 Fix builds directory store 2015-09-15 22:53:38 +02:00
Kamil Trzcinski 269b9224cf Use GitLab instead of GITLAB for rake task 2015-09-15 20:14:22 +02:00
Kamil Trzcinski 7e07bc0698 Remove unused tasks 2015-09-15 20:14:22 +02:00
Kamil Trzcinski ed18e04bb3 Cleanup CI backup => migrate with GitLab 2015-09-15 20:14:21 +02:00
Valery Sizov e2cbb36ba9 fix specs. Stage 5 2015-09-15 15:51:03 +03:00
Valery Sizov 16ba41a186 fix specs. Stage 4 2015-09-15 14:45:59 +03:00
Valery Sizov 22bf844869 fix specs. Stage 3 2015-09-15 13:50:24 +03:00
Kamil Trzcinski 9a3d0f1d92 Add rake task to migrate CI tags 2015-09-15 00:29:20 +02:00
Valery Sizov 910bf96ec3 fix specs. Stage 2 2015-09-14 18:14:17 +03:00
Valery Sizov 4c53cc0eba rubocop satisfy 2015-09-14 14:37:18 +03:00