Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '5-4-security-update' of /home/git/repositories/gitlab/gitlabhq ...v5.4.1 | Dmitriy Zaporozhets | 2013-11-04 | 8 | -45/+10 |
|\ | |||||
| * | Add db:setup to rake gitlab:test | Dmitriy Zaporozhets | 2013-11-04 | 1 | -1/+1 |
| * | Bump version to 5.4.1 | Jacob Vosmaer | 2013-11-04 | 1 | -1/+1 |
| * | Bump gitlab-shell to 1.7.4 (CVE-2013-4490) | Jacob Vosmaer | 2013-11-04 | 2 | -2/+2 |
| * | Correctly escape search query | Dmitriy Zaporozhets | 2013-11-04 | 1 | -1/+2 |
| * | Shell escape code search | Dmitriy Zaporozhets | 2013-11-04 | 1 | -1/+1 |
| * | Update gitlab_git (CVE-2013-4489) | Jacob Vosmaer | 2013-11-04 | 2 | -5/+5 |
| * | Fix for Resque forking might cause stuck workers for the threaded Sidekiq. | Sytse Sijbrandij | 2013-09-25 | 1 | -36/+0 |
|/ | |||||
* | Merge branch 'celluloid_update' of /home/git/repositories/gitlab/gitlabhq int... | Dmitriy Zaporozhets | 2013-08-27 | 1 | -4/+4 |
|\ | |||||
| * | Updated sidekiq Gemfile.lock for celluloid error | Izaak Alpert | 2013-08-27 | 1 | -4/+4 |
|/ | |||||
* | Merge pull request #4801 from Rovanion/patch-3 | Jacob Vosmaer | 2013-08-19 | 1 | -1/+1 |
|\ | |||||
| * | Don't restart nginx, just tell it to reload it's config files. | Rovanion Luckey | 2013-08-17 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #4611 from axilleas/bump-gitlab-shell-version_5-4 | Dmitriy Zaporozhets | 2013-08-04 | 1 | -1/+1 |
|\ | |||||
| * | Bump version of gitlab-shell to 1.5.0 and fix gitlab version typo | Axilleas Pipinellis | 2013-08-03 | 1 | -2/+2 |
* | | Update references to 5-3-stable in install guidev5.4.0 | Jacob Vosmaer | 2013-07-22 | 1 | -4/+4 |
|/ | |||||
* | Update VERSION to 5.4.0 | Dmitriy Zaporozhets | 2013-07-19 | 1 | -1/+1 |
* | Merge pull request #4589 from lukas2511/patch-1 | Dmitriy Zaporozhets | 2013-07-18 | 1 | -1/+1 |
|\ | |||||
| * | Update installation.md | Lukas Schauer | 2013-07-18 | 1 | -1/+1 |
|/ | |||||
* | Doc for update from 5.3 to 5.4 | Dmitriy Zaporozhets | 2013-07-18 | 1 | -0/+80 |
* | 5.4.0 is rc1 | Dmitriy Zaporozhets | 2013-07-12 | 1 | -1/+1 |
* | Update CHANGELOG | Dmitriy Zaporozhets | 2013-07-12 | 1 | -0/+5 |
* | Merge pull request #4324 from axilleas/initd_script | Dmitriy Zaporozhets | 2013-07-12 | 1 | -3/+5 |
|\ | |||||
| * | Removal of gitlab.socket should be in stop function too. Fix #4313 | Axilleas Pipinellis | 2013-07-12 | 1 | -3/+5 |
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2013-07-12 | 1 | -1/+1 |
|\ \ | |||||
| * \ | Merge pull request #4533 from babatakao/patch-2 | Yves Senn | 2013-07-12 | 1 | -1/+1 |
| |\ \ | | |/ | |/| | |||||
| | * | Fix typo. | Takao Baba | 2013-07-12 | 1 | -1/+1 |
| |/ | |||||
* | | Fix issues 500 if milestone id exists but milestone is not | Dmitriy Zaporozhets | 2013-07-12 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #3993 from bke-drewb/3599 | Dmitriy Zaporozhets | 2013-07-11 | 3 | -19/+27 |
|\ | |||||
| * | Issue 3599: Add snippets_enabled flag to projects for API | Drew Blessing | 2013-06-11 | 3 | -18/+26 |
* | | Merge pull request #4264 from andrewwutw/fix-postgresql-restore | Dmitriy Zaporozhets | 2013-07-11 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fix PostgreSQL database restoration problem (#4217) | andrewwutw | 2013-06-10 | 1 | -1/+1 |
* | | | Merge pull request #4282 from bke-drewb/3904 | Dmitriy Zaporozhets | 2013-07-11 | 1 | -0/+9 |
|\ \ \ | |||||
| * | | | Increase snippet content column size. | Drew Blessing | 2013-06-11 | 1 | -0/+9 |
* | | | | Merge pull request #4297 from jdurand/patch-1 | Dmitriy Zaporozhets | 2013-07-11 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Update api.js.coffee | Jim | 2013-06-13 | 1 | -1/+1 |
* | | | | | Merge pull request #4353 from dirker/allow-import-via-git-protocol | Dmitriy Zaporozhets | 2013-07-11 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | project: allow import via git:// url | Dirk Hörner | 2013-06-20 | 1 | -1/+1 |
* | | | | | | Merge pull request #4398 from Razer6/remove_gitolite_check | Dmitriy Zaporozhets | 2013-07-11 | 1 | -2/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove gitolite repo check for import script | Robert Schilling | 2013-06-23 | 1 | -2/+0 |
* | | | | | | | Merge pull request #4502 from wuwx/patch-1 | Dmitriy Zaporozhets | 2013-07-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fix bug when project named: mediawiki | wuweixin | 2013-07-06 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #4528 from akiva/master | Dmitriy Zaporozhets | 2013-07-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Allow ecdsa SSH keys | Akiva Levy | 2013-07-10 | 1 | -1/+1 |
|/ / / / / / / / | |||||
* | | | | | | | | Remove randomly failing test | Dmitriy Zaporozhets | 2013-07-10 | 1 | -6/+0 |
* | | | | | | | | Merge pull request #4510 from Razer6/fix_not_found_lexers | Dmitriy Zaporozhets | 2013-07-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix Pygments 500 error if lexer not found by name. Use first alias instead. f... | Robert Schilling | 2013-07-07 | 1 | -1/+1 |
* | | | | | | | | | Merge pull request #4511 from yuters/patch-3 | Dmitriy Zaporozhets | 2013-07-10 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | navbar tooltip position fix when "loading" appears. | Martin Bastien | 2013-07-07 | 1 | -0/+11 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge pull request #4515 from amacarthur/fork-admin | Dmitriy Zaporozhets | 2013-07-10 | 5 | -3/+138 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Additon of apis for fork administration. | Angus MacArthur | 2013-07-08 | 5 | -3/+138 |