Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #8291 from MrMarvin/fix/ldap_cleanup_task | Jacob Vosmaer | 2014-11-12 | 1 | -2/+2 | |
|\ \ \ | | | | | | | | | fixes the `block_removed_ldap_users` rake task | |||||
| * | | | fixes the `block_removed_ldap_users` rake task | Marvin Frick | 2014-11-12 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In e23a26a (and later 1bc9936) the API for Gitlab::LDAP::Adapter was changed. I assume this rake task was an oversight in the refactoring of the changed class. While being on it, I noticed that already blocked users cannot be blocked again. | |||||
* | | | | Merge remote-tracking branch 'origin/master' into backup_restore_drop_sequences | Valery Sizov | 2014-11-12 | 2 | -9/+5 | |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | Conflicts: CHANGELOG | |||||
| * | | | Merge pull request #8254 from cirosantilli/factor-get-shell-version | Dmitriy Zaporozhets | 2014-11-08 | 2 | -8/+4 | |
| |\ \ \ | | | | | | | | | | | Factor GITLAB_SHELL_VERSION get method | |||||
| | * | | | Factor GITLAB_SHELL_VERSION get method | Ciro Santilli | 2014-11-05 | 2 | -8/+4 | |
| | |/ / | ||||||
| * | | | Factor using Repository#path_to_repo | Ciro Santilli | 2014-11-05 | 1 | -1/+1 | |
| |/ / | ||||||
* | | | Drop all Postgres sequences during backup restore | Jacob Vosmaer | 2014-10-28 | 1 | -0/+10 | |
|/ / | ||||||
* | | Merge pull request #8005 from cirosantilli/settings-to-gitlab-config | Dmitriy Zaporozhets | 2014-10-27 | 1 | -3/+3 | |
|\ \ | | | | | | | Use Gitlab.config instead of Settings everywhere | |||||
| * | | Use Gitlab.config instead of Settings everywhere | Ciro Santilli | 2014-10-15 | 1 | -3/+3 | |
| | | | ||||||
* | | | Merge pull request #8158 from cirosantilli/basename-dirname-split | Robert Schilling | 2014-10-25 | 1 | -2/+1 | |
|\ \ \ | | | | | | | | | Merge File basename and direname into split | |||||
| * | | | Merge File basename and direname into split | Ciro Santilli | 2014-10-23 | 1 | -2/+1 | |
| | | | | | | | | | | | | | | | | Faster because only does one split in that case. | |||||
* | | | | Fix import.rake failed import if project name is | Ciro Santilli | 2014-10-24 | 1 | -10/+2 | |
| | | | | | | | | | | | | | | | | | | | | also an existing namespace. E.g., when trying to import group/root.git, that would fail if there is an user called root. | |||||
* | | | | Merge pull request #8088 from cirosantilli/sh-str-to-args | Jacob Vosmaer | 2014-10-23 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | Use argument list for sh instead of string | |||||
| * | | | | Use argument list for sh instead of string | Ciro Santilli | 2014-10-18 | 1 | -1/+1 | |
| | |/ / | |/| | | | | | | | | | | Faster, more portable and less error prone since no shell expansion. | |||||
* | | | | Merge pull request #8026 from HerrBerg/master | Dmitriy Zaporozhets | 2014-10-22 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | rake:import:repos: fix exclude wiki regex for importing repositories | |||||
| * | | | | fix exclude wiki regex | HerrBerg | 2014-10-13 | 1 | -1/+1 | |
| |/ / / | | | | | | | | | the new regex allows importing repositories with repository name ending with wiki but still exclude gitlab wiki repositories | |||||
* | | | | Make gitlab ldap check work for old and new syntax | Dmitriy Zaporozhets | 2014-10-22 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | | | Fix rake gitlab:ldap:check | Dmitriy Zaporozhets | 2014-10-21 | 1 | -30/+10 | |
| |/ / |/| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | | Replace match with end_with: more readable, faster | Ciro Santilli | 2014-10-18 | 1 | -1/+1 | |
|/ / | ||||||
* | | Update import.rake | Marc Aubé | 2014-10-07 | 1 | -1/+4 | |
| | | | | | | Output a message when a repo is skipped | |||||
* | | Try wear_merged! without argument | Dmitriy Zaporozhets | 2014-10-01 | 1 | -1/+1 | |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Add rspec to test_ci | Dmitriy Zaporozhets | 2014-09-30 | 1 | -1/+1 | |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Separate rake test for simplecov | Dmitriy Zaporozhets | 2014-09-30 | 1 | -0/+7 | |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Merge pull request #7823 from cirosantilli/test-fetch-shell | Dmitriy Zaporozhets | 2014-09-24 | 1 | -1/+4 | |
|\ \ | | | | | | | Only clone GitLab Shell on tests if necessary. | |||||
| * | | Only clone GitLab Shell on tests if necessary. | Ciro Santilli | 2014-09-22 | 1 | -1/+4 | |
| | | | ||||||
* | | | Merge branch '7-4-pre' into 'master' | Dmitriy Zaporozhets | 2014-09-22 | 2 | -11/+11 | |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7.4 development Development branch during `master` code freeze for 7.3 See merge request !1096 | |||||
| * \ \ | Merge branch 'refator-members-logic' of ↵ | Dmitriy Zaporozhets | 2014-09-17 | 2 | -11/+11 | |
| |\ \ \ | | |/ / | |/| | | | | | | https://dev.gitlab.org/dzaporozhets/gitlabhq into 7-4-pre | |||||
| | * | | Replace old references of users_project & users_group | Dmitriy Zaporozhets | 2014-09-14 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| | * | | Huge replace of old users_project and users_group references | Dmitriy Zaporozhets | 2014-09-14 | 2 | -9/+9 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | | | Support sockets in 'rake gitlab:shell:install' | Jacob Vosmaer | 2014-09-22 | 1 | -4/+9 | |
|/ / / | ||||||
* | | | Check for hooks directory symlink in gitlab:check | Jacob Vosmaer | 2014-09-16 | 1 | -62/+17 | |
|/ / | ||||||
* | | Use create-hooks instead of rewrite-hooks.sh | Jacob Vosmaer | 2014-09-08 | 1 | -2/+2 | |
| | | | | | | | | | | The rewrite-hooks.sh script is a deprecated wrapper for gitlab-shell's create-hooks script. | |||||
* | | change git to git bin path | Ben Bodenmiller | 2014-08-30 | 1 | -4/+4 | |
| | | ||||||
* | | Write authorized_keys in tmp/tests during tests | Jacob Vosmaer | 2014-08-26 | 1 | -1/+1 | |
| | | | | | | | | | | This should reduce the number of gitlab-shell error messages while the tests run. | |||||
* | | Add rake task to drop a project's PostReceive jobs | Jacob Vosmaer | 2014-08-21 | 1 | -0/+47 | |
| | | ||||||
* | | Merge pull request #7441 from bbodenmiller/patch-7 | Dmitriy Zaporozhets | 2014-08-13 | 1 | -2/+4 | |
|\ \ | | | | | | | add git config --global core.autocrlf check | |||||
| * | | add git config --global core.autocrlf check | Ben Bodenmiller | 2014-08-04 | 1 | -2/+4 | |
| | | | | | | | | | core.autocrlf was added to install guide in https://github.com/gitlabhq/gitlabhq/commit/2d681c0d1ed14bf23c041aa04fa3e77caceda9a1 but not added to check script | |||||
* | | | Fix markdown tests. Use new repo for testing. Fixed gitlab-shell test setup | Dmitriy Zaporozhets | 2014-07-31 | 1 | -1/+1 | |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | | Get gitlab-shell verion from file for install rake task | Dmitriy Zaporozhets | 2014-07-31 | 1 | -1/+2 | |
|/ / | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Check ruby version to be >= 2.0.0 | Dmitriy Zaporozhets | 2014-07-23 | 1 | -0/+18 | |
|/ | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | Remove duplicated calls. | Marin Jankovski | 2014-07-07 | 1 | -18/+11 | |
| | ||||||
* | Add sanitize option to gitlab check rake task. | Marin Jankovski | 2014-07-07 | 1 | -3/+26 | |
| | ||||||
* | Merge pull request #7208 from MrMarvin/ce_rake_cleanup_ldap_users | Dmitriy Zaporozhets | 2014-07-04 | 1 | -0/+24 | |
|\ | | | | | Adds rake task to clean up deleted LDAP users | |||||
| * | adds rake task to clean up deleted LDAP users | Marvin Frick | 2014-06-26 | 1 | -0/+24 | |
| | | ||||||
* | | Merge pull request #7170 from cirosantilli/add-trailing-newlines | Sytse Sijbrandij | 2014-06-30 | 1 | -1/+1 | |
|\ \ | |/ |/| | [minor-refactor] Add trailing newline to all text files. | |||||
| * | Add trailing newline to all text files. | Ciro Santilli | 2014-06-21 | 1 | -1/+1 | |
| | | | | | | | | Present in the large majority of files of each respective type. | |||||
* | | Patch `rake cache:clear` for large amounts of keys | Jacob Vosmaer | 2014-06-20 | 1 | -1/+6 | |
|/ | ||||||
* | Skip init script checks on omnibus-gitlab | Jacob Vosmaer | 2014-06-12 | 1 | -0/+14 | |
| | | | | Omnibus-gitlab does not use the init script. | |||||
* | Update check task and add to monthly release doc lines about ↵ | Marin Jankovski | 2014-06-10 | 1 | -1/+17 | |
| | | | | gitlab_shell_version file. | |||||
* | Splitted the Spinach tests to prevent time-outs | Jeroen van Baarsen | 2014-06-04 | 1 | -0/+21 | |
| | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> |