summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Wait 15 minutes before Sidekiq MemoryKiller actionJacob Vosmaer2014-12-051-15/+33
| | |
* | | Decline push if repository does not existDmitriy Zaporozhets2014-12-051-3/+12
|/ / | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Supporting for multiple omniauth provider for the same userValery Sizov2014-12-043-14/+17
| |
* | Multi-provider auth. LDAP is not reworkedValery Sizov2014-12-042-16/+10
| |
* | Reload mr code on force push tooDmitriy Zaporozhets2014-12-022-8/+16
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix deploy keys permission check in internal apiDmitriy Zaporozhets2014-12-011-10/+18
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Add comments to the MemoryKiller middlewareJacob Vosmaer2014-11-281-0/+3
| |
* | Add 'MemoryKiller' Sidekiq middlewareJacob Vosmaer2014-11-281-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 fixValery Sizov2014-11-241-1/+1
| |
* | Better message for failed pushes because of git hooksValery Sizov2014-11-184-24/+52
| | | | | | | | | | | | Conflicts: lib/gitlab/git_access.rb spec/lib/gitlab/git_access_spec.rb
* | Revert "Create dev fixture projects with fixed visibility"Dmitriy Zaporozhets2014-11-101-5/+1
| | | | | | | | This reverts commit a9fadce361163e97eb1de0ec62e4235ff0fa3daa.
* | Merge pull request #8254 from cirosantilli/factor-get-shell-versionDmitriy Zaporozhets2014-11-081-0/+7
|\ \ | | | | | | Factor GITLAB_SHELL_VERSION get method
| * | Factor GITLAB_SHELL_VERSION get methodCiro Santilli2014-11-051-0/+7
| | |
* | | Merge pull request #8168 from cirosantilli/dev-fixtures-visibilityMarin Jankovski2014-11-071-1/+5
|\ \ \ | | | | | | | | Create dev fixture projects with fixed visibility
| * | | Create dev fixture projects with fixed visibilityCiro Santilli2014-10-261-1/+5
| | | |
* | | | fix system silent callValery Sizov2014-11-062-4/+3
| | | |
* | | | Revert "Revert "Don't output to stdout from lib non-interactive methods""Valery Sizov2014-11-063-14/+40
| | | | | | | | | | | | | | | | This reverts commit b33d4bc2f1d26ee3526b9d7f530f468a9d5b5a5e.
* | | | Revert "Don't output to stdout from lib non-interactive methods"Valery Sizov2014-11-063-40/+14
| |/ / |/| | | | | | | | This reverts commit 0b1084a4538bc46684c8620410988d3b1093e7ab.
* | | Merge pull request #8236 from cirosantilli/rm-lib-stdoutValeriy Sizov2014-11-053-14/+40
|\ \ \ | | | | | | | | Don't output to stdout from lib non-interactive methods [failure unrelated]
| * | | Don't output to stdout from lib non-interactive methodsCiro Santilli2014-11-053-14/+40
| | | | | | | | | | | | | | | | It pollutes the test output too much.
* | | | Merge pull request #7516 from cirosantilli/update-regex-msgMarin Jankovski2014-11-051-2/+1
|\ \ \ \ | | | | | | | | | | Update default regex message to match regex.
| * | | | Update default regex message to match regex.Ciro Santilli2014-10-011-2/+1
| | | | |
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-11-042-2/+7
|\ \ \ \ \
| * | | | | Fix push not allowed to protected branch ifCiro Santilli2014-11-032-2/+7
| | |/ / / | |/| | | | | | | | | | | | | commit starts with 7 zeros.
* | | | | Merge branch 'master' into jastkand/gitlab-ce-fix-api-authDmitriy Zaporozhets2014-11-032-13/+20
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG
| * | | | Merge pull request #8217 from bbodenmiller/change-label-generationRobert Schilling2014-11-011-1/+0
| |\ \ \ \ | | | | | | | | | | | | remove feature label
| | * | | | remove feature labelBen Bodenmiller2014-10-311-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 pathCiro Santilli2014-10-311-12/+20
| |/ / / /
* | | | | Session API: Use case-insensitive authentication like in UIAndrey Krivko2014-10-301-1/+1
|/ / / /
* | | | Merge pull request #8005 from cirosantilli/settings-to-gitlab-configDmitriy Zaporozhets2014-10-271-1/+1
|\ \ \ \ | | | | | | | | | | Use Gitlab.config instead of Settings everywhere
| * | | | Use Gitlab.config instead of Settings everywhereCiro Santilli2014-10-151-1/+1
| | | | |
* | | | | Fix LDAP config lookup for provider 'ldap'Jacob Vosmaer2014-10-231-11/+16
| | | | |
* | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqMarin Jankovski2014-10-231-2/+2
|\ \ \ \ \
| * | | | | Fix LDAP authentication for Git HTTP accessJacob Vosmaer2014-10-231-2/+2
| | | | | |
* | | | | | Merge pull request #8150 from cirosantilli/unecessary-variable-userRobert Schilling2014-10-231-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Remove unused variable user at lib/gitlab/markdown
| * | | | | Remove unused variable user at lib/gitlab/markdownCiro Santilli2014-10-231-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'fix-ldap-check' into 'master'Dmitriy Zaporozhets2014-10-221-1/+5
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ldap check Fixes gitlab/gitlabhq#1691 See merge request !1206
| * | | | Fix rake gitlab:ldap:checkDmitriy Zaporozhets2014-10-211-1/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge pull request #8117 from cirosantilli/improve-grack-commentRobert Schilling2014-10-211-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Improve grack auth hooks comment.
| * | | | Improve grack auth hooks comment.Ciro Santilli2014-10-211-1/+1
| | | | |
* | | | | Merge pull request #7961 from cirosantilli/dry-log-file-namesDmitriy Zaporozhets2014-10-215-4/+22
|\ \ \ \ \ | |/ / / / |/| | | | Factor admin logs [failure unrelated]
| * | | | Dry admin logs.Ciro Santilli2014-10-065-4/+22
| | | | |
* | | | | Fix account existing blockingDmitriy Zaporozhets2014-10-171-9/+23
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Add regressiontest to verify allow_single_sign_on settingJan-Willem van der Meer2014-10-161-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 declarationJan-Willem van der Meer2014-10-141-3/+3
| | | |
* | | | Remove unused methodsJan-Willem van der Meer2014-10-142-12/+0
| | | |
* | | | Add explaining note to authentication method [skip ci]Jan-Willem van der Meer2014-10-141-0/+2
| | | |
* | | | Use server specific uidJan-Willem van der Meer2014-10-141-1/+1
| | | |
* | | | Make sure the filters are appliedJan-Willem van der Meer2014-10-141-8/+9
| | | |
* | | | Fix authorization for LDAP loginJan-Willem van der Meer2014-10-142-1/+5
| | | |