Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Wait 15 minutes before Sidekiq MemoryKiller action | Jacob Vosmaer | 2014-12-05 | 1 | -15/+33 | |
| | | | ||||||
* | | | Decline push if repository does not exist | Dmitriy Zaporozhets | 2014-12-05 | 1 | -3/+12 | |
|/ / | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Supporting for multiple omniauth provider for the same user | Valery Sizov | 2014-12-04 | 3 | -14/+17 | |
| | | ||||||
* | | Multi-provider auth. LDAP is not reworked | Valery Sizov | 2014-12-04 | 2 | -16/+10 | |
| | | ||||||
* | | Reload mr code on force push too | Dmitriy Zaporozhets | 2014-12-02 | 2 | -8/+16 | |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Fix deploy keys permission check in internal api | Dmitriy Zaporozhets | 2014-12-01 | 1 | -10/+18 | |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Add comments to the MemoryKiller middleware | Jacob Vosmaer | 2014-11-28 | 1 | -0/+3 | |
| | | ||||||
* | | Add 'MemoryKiller' Sidekiq middleware | Jacob Vosmaer | 2014-11-28 | 1 | -0/+45 | |
| | | | | | | | | | | | | | | When enabled, this middleware allows Sidekiq to detect that its RSS has exceeded a maximum value, triggering a graceful shutdown. This middleware should be combined with external process supervision that will restart Sidekiq after the graceful shutdown, such as Runit. | |||||
* | | Git hook messages: wiki access fix | Valery Sizov | 2014-11-24 | 1 | -1/+1 | |
| | | ||||||
* | | Better message for failed pushes because of git hooks | Valery Sizov | 2014-11-18 | 4 | -24/+52 | |
| | | | | | | | | | | | | Conflicts: lib/gitlab/git_access.rb spec/lib/gitlab/git_access_spec.rb | |||||
* | | Revert "Create dev fixture projects with fixed visibility" | Dmitriy Zaporozhets | 2014-11-10 | 1 | -5/+1 | |
| | | | | | | | | This reverts commit a9fadce361163e97eb1de0ec62e4235ff0fa3daa. | |||||
* | | Merge pull request #8254 from cirosantilli/factor-get-shell-version | Dmitriy Zaporozhets | 2014-11-08 | 1 | -0/+7 | |
|\ \ | | | | | | | Factor GITLAB_SHELL_VERSION get method | |||||
| * | | Factor GITLAB_SHELL_VERSION get method | Ciro Santilli | 2014-11-05 | 1 | -0/+7 | |
| | | | ||||||
* | | | Merge pull request #8168 from cirosantilli/dev-fixtures-visibility | Marin Jankovski | 2014-11-07 | 1 | -1/+5 | |
|\ \ \ | | | | | | | | | Create dev fixture projects with fixed visibility | |||||
| * | | | Create dev fixture projects with fixed visibility | Ciro Santilli | 2014-10-26 | 1 | -1/+5 | |
| | | | | ||||||
* | | | | fix system silent call | Valery Sizov | 2014-11-06 | 2 | -4/+3 | |
| | | | | ||||||
* | | | | Revert "Revert "Don't output to stdout from lib non-interactive methods"" | Valery Sizov | 2014-11-06 | 3 | -14/+40 | |
| | | | | | | | | | | | | | | | | This reverts commit b33d4bc2f1d26ee3526b9d7f530f468a9d5b5a5e. | |||||
* | | | | Revert "Don't output to stdout from lib non-interactive methods" | Valery Sizov | 2014-11-06 | 3 | -40/+14 | |
| |/ / |/| | | | | | | | | This reverts commit 0b1084a4538bc46684c8620410988d3b1093e7ab. | |||||
* | | | Merge pull request #8236 from cirosantilli/rm-lib-stdout | Valeriy Sizov | 2014-11-05 | 3 | -14/+40 | |
|\ \ \ | | | | | | | | | Don't output to stdout from lib non-interactive methods [failure unrelated] | |||||
| * | | | Don't output to stdout from lib non-interactive methods | Ciro Santilli | 2014-11-05 | 3 | -14/+40 | |
| | | | | | | | | | | | | | | | | It pollutes the test output too much. | |||||
* | | | | Merge pull request #7516 from cirosantilli/update-regex-msg | Marin Jankovski | 2014-11-05 | 1 | -2/+1 | |
|\ \ \ \ | | | | | | | | | | | Update default regex message to match regex. | |||||
| * | | | | Update default regex message to match regex. | Ciro Santilli | 2014-10-01 | 1 | -2/+1 | |
| | | | | | ||||||
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2014-11-04 | 2 | -2/+7 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix push not allowed to protected branch if | Ciro Santilli | 2014-11-03 | 2 | -2/+7 | |
| | |/ / / | |/| | | | | | | | | | | | | | commit starts with 7 zeros. | |||||
* | | | | | Merge branch 'master' into jastkand/gitlab-ce-fix-api-auth | Dmitriy Zaporozhets | 2014-11-03 | 2 | -13/+20 | |
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG | |||||
| * | | | | Merge pull request #8217 from bbodenmiller/change-label-generation | Robert Schilling | 2014-11-01 | 1 | -1/+0 | |
| |\ \ \ \ | | | | | | | | | | | | | remove feature label | |||||
| | * | | | | remove feature label | Ben Bodenmiller | 2014-10-31 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | | | For automatic label generation remove label `feature` as it is basically means the same thing as label `enhancement`. | |||||
| * | | | | | Factor lib backend gitlab shell path | Ciro Santilli | 2014-10-31 | 1 | -12/+20 | |
| |/ / / / | ||||||
* | | | | | Session API: Use case-insensitive authentication like in UI | Andrey Krivko | 2014-10-30 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #8005 from cirosantilli/settings-to-gitlab-config | Dmitriy Zaporozhets | 2014-10-27 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | Use Gitlab.config instead of Settings everywhere | |||||
| * | | | | Use Gitlab.config instead of Settings everywhere | Ciro Santilli | 2014-10-15 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Fix LDAP config lookup for provider 'ldap' | Jacob Vosmaer | 2014-10-23 | 1 | -11/+16 | |
| | | | | | ||||||
* | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Marin Jankovski | 2014-10-23 | 1 | -2/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix LDAP authentication for Git HTTP access | Jacob Vosmaer | 2014-10-23 | 1 | -2/+2 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #8150 from cirosantilli/unecessary-variable-user | Robert Schilling | 2014-10-23 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Remove unused variable user at lib/gitlab/markdown | |||||
| * | | | | | Remove unused variable user at lib/gitlab/markdown | Ciro Santilli | 2014-10-23 | 1 | -1/+1 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge branch 'fix-ldap-check' into 'master' | Dmitriy Zaporozhets | 2014-10-22 | 1 | -1/+5 | |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ldap check Fixes gitlab/gitlabhq#1691 See merge request !1206 | |||||
| * | | | | Fix rake gitlab:ldap:check | Dmitriy Zaporozhets | 2014-10-21 | 1 | -1/+5 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | | | | Merge pull request #8117 from cirosantilli/improve-grack-comment | Robert Schilling | 2014-10-21 | 1 | -1/+1 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Improve grack auth hooks comment. | |||||
| * | | | | Improve grack auth hooks comment. | Ciro Santilli | 2014-10-21 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Merge pull request #7961 from cirosantilli/dry-log-file-names | Dmitriy Zaporozhets | 2014-10-21 | 5 | -4/+22 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Factor admin logs [failure unrelated] | |||||
| * | | | | Dry admin logs. | Ciro Santilli | 2014-10-06 | 5 | -4/+22 | |
| | | | | | ||||||
* | | | | | Fix account existing blocking | Dmitriy Zaporozhets | 2014-10-17 | 1 | -9/+23 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | | | | Add regressiontest to verify allow_single_sign_on setting | Jan-Willem van der Meer | 2014-10-16 | 1 | -3/+14 | |
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | verification for #1677 Since testing omniauth_callback_controller.rb is very difficult, the logic is moved to the models | |||||
* | | | | Use Hash syntax for LDAP server declaration | Jan-Willem van der Meer | 2014-10-14 | 1 | -3/+3 | |
| | | | | ||||||
* | | | | Remove unused methods | Jan-Willem van der Meer | 2014-10-14 | 2 | -12/+0 | |
| | | | | ||||||
* | | | | Add explaining note to authentication method [skip ci] | Jan-Willem van der Meer | 2014-10-14 | 1 | -0/+2 | |
| | | | | ||||||
* | | | | Use server specific uid | Jan-Willem van der Meer | 2014-10-14 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Make sure the filters are applied | Jan-Willem van der Meer | 2014-10-14 | 1 | -8/+9 | |
| | | | | ||||||
* | | | | Fix authorization for LDAP login | Jan-Willem van der Meer | 2014-10-14 | 2 | -1/+5 | |
| | | | |