Commits · 2d65430cd7b2cf3795f922f70ec1b63f12affed6 · Kirill Smelkov / gitlab-ce

14 Nov, 2013 4 commits
- Merge branch 'api_token_cast_5_4' of /home/git/repositories/gitlab/gitlabhq into 5-4-stable · 2d65430c
  Dmitriy Zaporozhets authored Nov 14, 2013
  
  2d65430c
- Use gitlab-shell 1.7.8 · 671cdc5c
  Jacob Vosmaer authored Nov 14, 2013
  
  671cdc5c
- Bump version · aa81c100
  Jacob Vosmaer authored Nov 14, 2013
  
  aa81c100
- Make sure private_token for API is a string · 1a115cec
  Jacob Vosmaer authored Nov 14, 2013
  
  1a115cec
04 Nov, 2013 7 commits
- Merge branch '5-4-security-update' of /home/git/repositories/gitlab/gitlabhq into 5-4-stable · 36dc6e6b
  Dmitriy Zaporozhets authored Nov 04, 2013
  
  36dc6e6b
- Add db:setup to rake gitlab:test · b40ff1e0
  Dmitriy Zaporozhets authored Nov 04, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b40ff1e0
- Bump version to 5.4.1 · 7b0f72d3
  Jacob Vosmaer authored Nov 04, 2013
  
  7b0f72d3
- Bump gitlab-shell to 1.7.4 (CVE-2013-4490) · ac5d5ade
  Jacob Vosmaer authored Nov 02, 2013
  
  ac5d5ade
- Correctly escape search query · 6d8b0bbb
  Dmitriy Zaporozhets authored Oct 31, 2013
  
  6d8b0bbb
- Shell escape code search · 8a5bf011
  Dmitriy Zaporozhets authored Oct 31, 2013
  
  8a5bf011
- Update gitlab_git (CVE-2013-4489) · 6c067380
  Jacob Vosmaer authored Nov 04, 2013
  
  6c067380
25 Sep, 2013 1 commit
- Fix for Resque forking might cause stuck workers for the threaded Sidekiq. · 38cf6281
  Sytse Sijbrandij authored Aug 10, 2013
  
  38cf6281
27 Aug, 2013 2 commits

Merge branch 'celluloid_update' of /home/git/repositories/gitlab/gitlabhq into 5-4-stable · 9360c733
Dmitriy Zaporozhets authored Aug 27, 2013

9360c733

Updated sidekiq Gemfile.lock for celluloid error · 56a83cdf

Izaak Alpert authored Jul 04, 2013

Should (hopefully fix issue with: "Mysql2::Error: This connection is still waiting for a result, try again once you have the result:"

https://github.com/mperham/sidekiq/pull/954
https://github.com/celluloid/celluloid/pull/268

Change-Id: I4daa65b6b6f9de20975d95ba07ffab103ec03204

56a83cdf

19 Aug, 2013 1 commit
- Merge pull request #4801 from Rovanion/patch-3 · aed4e0f0
  Jacob Vosmaer authored Aug 19, 2013
```
Don't restart nginx, just tell it to reload it's config files.
```
  aed4e0f0
17 Aug, 2013 1 commit
- Don't restart nginx, just tell it to reload it's config files. · a906860e
  Rovanion Luckey authored Aug 17, 2013
  
  a906860e
04 Aug, 2013 1 commit
- Merge pull request #4611 from axilleas/bump-gitlab-shell-version_5-4 · e8d77e21
  Dmitriy Zaporozhets authored Aug 04, 2013
```
Bump version of gitlab-shell to 1.7.0
```
  e8d77e21
03 Aug, 2013 1 commit
- Bump version of gitlab-shell to 1.5.0 and fix gitlab version typo · eab6ce03
  Axilleas Pipinellis authored Jul 22, 2013
  
  eab6ce03
22 Jul, 2013 1 commit
- Update references to 5-3-stable in install guide · 94a814d3
  Jacob Vosmaer authored Jul 22, 2013
  
  94a814d3
19 Jul, 2013 1 commit
- Update VERSION to 5.4.0 · a5a7555c
  Dmitriy Zaporozhets authored Jul 19, 2013
  
  a5a7555c
18 Jul, 2013 3 commits
- Merge pull request #4589 from lukas2511/patch-1 · 5487db6e
  Dmitriy Zaporozhets authored Jul 18, 2013
```
Update installation.md
```
  5487db6e
- Update installation.md · 7a165d20
  Lukas Schauer authored Jul 18, 2013
```
fixed branch-name (5-3 -> 5-4)
```
  7a165d20
- Doc for update from 5.3 to 5.4 · f24c6e83
  Dmitriy Zaporozhets authored Jul 18, 2013
  
  f24c6e83
12 Jul, 2013 8 commits
- 5.4.0 is rc1 · f1fc1ae6
  Dmitriy Zaporozhets authored Jul 12, 2013
  
  f1fc1ae6
- Update CHANGELOG · e68b0cac
  Dmitriy Zaporozhets authored Jul 12, 2013
  
  e68b0cac
- Merge pull request #4324 from axilleas/initd_script · 94149f8e
  Dmitriy Zaporozhets authored Jul 12, 2013
```
Removal of gitlab.socket should be in stop function too. Fix #4313
```
  94149f8e
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · d938486c
  Dmitriy Zaporozhets authored Jul 12, 2013
  
  d938486c
- Fix issues 500 if milestone id exists but milestone is not · dfc82811
  Dmitriy Zaporozhets authored Jul 12, 2013
  
  dfc82811
- Merge pull request #4533 from babatakao/patch-2 · 02d174e9
  Yves Senn authored Jul 12, 2013
```
Fix typo.
```
  02d174e9
- Removal of gitlab.socket should be in stop function too. Fix #4313 · ec38d629
  Axilleas Pipinellis authored Jun 17, 2013
  
  ec38d629
- Fix typo. · 7bed7785
  Takao Baba authored Jul 12, 2013
  
  7bed7785
11 Jul, 2013 8 commits
- Merge pull request #3993 from bke-drewb/3599 · 8cdfa86b
  Dmitriy Zaporozhets authored Jul 11, 2013
```
Issue 3599: Add snippets_enabled flag to projects for API
```
  8cdfa86b
- Merge pull request #4264 from andrewwutw/fix-postgresql-restore · 7740005b
  Dmitriy Zaporozhets authored Jul 11, 2013
```
Fix PostgreSQL database restoration problem (#4217)
```
  7740005b
- Merge pull request #4282 from bke-drewb/3904 · 2a7ae176
  Dmitriy Zaporozhets authored Jul 11, 2013
```
Increase snippet content column size.
```
  2a7ae176
- Merge pull request #4297 from jdurand/patch-1 · 11703e8e
  Dmitriy Zaporozhets authored Jul 11, 2013
```
Update api.js.coffee
```
  11703e8e
- Merge pull request #4353 from dirker/allow-import-via-git-protocol · c1d43ed7
  Dmitriy Zaporozhets authored Jul 11, 2013
```
project: allow import via git:// url
```
  c1d43ed7
- Merge pull request #4398 from Razer6/remove_gitolite_check · 79a989fa
  Dmitriy Zaporozhets authored Jul 11, 2013
```
Remove gitolite repo check for import script
```
  79a989fa
- Merge pull request #4502 from wuwx/patch-1 · 1de30b91
  Dmitriy Zaporozhets authored Jul 11, 2013
```
fix bug when project named: mediawiki
```
  1de30b91
- Merge pull request #4528 from akiva/master · 17a4f11e
  Dmitriy Zaporozhets authored Jul 11, 2013
```
Allow SSH keys to be of type ecdsa rather than only rsa and dsa (which are slower, older, and weaker)
```
  17a4f11e
10 Jul, 2013 1 commit

Allow ecdsa SSH keys · 88301d56

Akiva Levy authored Jul 10, 2013

Update app/models/key.rb to permit SSH keys of type ecdsa rather than forcing dsa and rsa algorithms.

88301d56