Commits · 4e77b0b52d609bb886c6b77a043d9736505f073d · nexedi / gitlab-ce

29 Nov, 2013 1 commit

Merge branch '6-3-stable' of dev.gitlab.org:gitlab/gitlabhq into release/6-3 · 4e77b0b5

Dmitriy Zaporozhets authored Nov 29, 2013

Conflicts:
	Gemfile.lock
	VERSION
	app/assets/javascripts/api.js.coffee
	app/models/user.rb
	app/views/help/index.html.haml
	doc/install/installation.md
	doc/update/5.4-to-6.0.md
	doc/update/6.0-to-6.1.md
	doc/update/6.1-to-6.2.md
	lib/api/api.rb
	lib/api/entities.rb
	lib/gitlab/ldap/user.rb
	lib/tasks/gitlab/check.rake
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

4e77b0b5

23 Nov, 2013 3 commits
- minor fix to command · 232e6b40
  Sairam Kunala authored Nov 22, 2013
  
  232e6b40
- Merge branch 'update_ruby_6_3_stable' of /home/git/repositories/gitlab/gitlabhq into 6-3-stable · 2d8bdf52
  Dmitriy Zaporozhets authored Nov 23, 2013
  
  2d8bdf52
- Update ruby to patchlevel 353 (security update) · 251c384a
  Achilleas Pipinellis authored Nov 23, 2013
```
https://www.ruby-lang.org/en/news/2013/11/22/heap-overflow-in-floating-point-parsing-cve-2013-4164/
```
  251c384a
22 Nov, 2013 4 commits
- Fix 6.3 branch name · 35db034e
  Dmitriy Zaporozhets authored Nov 22, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  35db034e
- Version to 6.3.0 · f285da48
  Dmitriy Zaporozhets authored Nov 22, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f285da48
- Improve refs parsing for git over http · 51ae88c4
  Dmitriy Zaporozhets authored Nov 22, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  51ae88c4
- Cleanup parsed refs for git over HTTP · 06feb3c4
  Dmitriy Zaporozhets authored Nov 22, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  06feb3c4
21 Nov, 2013 9 commits
- Merge pull request #5647 from lordjabez/develop · 7f685986
  Dmitriy Zaporozhets authored Nov 21, 2013
```
Fix grammar in fork error message.
```
  7f685986
- Fix grammar in fork error message. · 574fffb7
  Judson D Neer authored Nov 21, 2013
  
  574fffb7
- Merge branch 'os-requirements' of /home/git/repositories/gitlab/gitlabhq · 6b491a2b
  Dmitriy Zaporozhets authored Nov 21, 2013
  
  6b491a2b
- Merge branch 'tests_limitation_skip' of /home/git/repositories/gitlab/gitlabhq · 503280db
  Dmitriy Zaporozhets authored Nov 21, 2013
  
  503280db
- Ensure customers know that GitLab.com supports RHEL. · b5ea6aa1
  Sytse Sijbrandij authored Nov 21, 2013
  
  b5ea6aa1
- No limits when testing. · bb71c5d8
  Marin Jankovski authored Nov 21, 2013
  
  bb71c5d8
- Time for release candidate · 4525fc84
  Dmitriy Zaporozhets authored Nov 21, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4525fc84
- Style resend confirmation instructions · fc3c5773
  Dmitriy Zaporozhets authored Nov 21, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  fc3c5773
- Merge branch 'backup_commands' of /home/git/repositories/gitlab/gitlabhq · 7e4739fe
  Dmitriy Zaporozhets authored Nov 21, 2013
  
  7e4739fe
20 Nov, 2013 15 commits
- Fix tests · fd6e5161
  Dmitriy Zaporozhets authored Nov 20, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  fd6e5161
- Render markdown in snippets · 3bdf9308
  Dmitriy Zaporozhets authored Nov 20, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3bdf9308
- Nicer icons for enabled/disabled stuff · 436e9646
  Dmitriy Zaporozhets authored Nov 20, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  436e9646
- Add more info to admin dashboard · b07c02eb
  Dmitriy Zaporozhets authored Nov 20, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b07c02eb
- Update docs for 6.3 · e3a71857
  Dmitriy Zaporozhets authored Nov 20, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e3a71857
- Recommend gitlab-shell 1.7.9 in docs and check task · 7101b22c
  Dmitriy Zaporozhets authored Nov 20, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  7101b22c
- Prefer user email match when looking for commit author · 8ddb064b
  Dmitriy Zaporozhets authored Nov 20, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8ddb064b
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 89315311
  Dmitriy Zaporozhets authored Nov 20, 2013
  
  89315311
- Correctly remove and re-create satellites when project transfer · 30912835
  Dmitriy Zaporozhets authored Nov 20, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  30912835
- Parse all refs when do push via HTTP and check permissions for all of them · 182aa19e
  Dmitriy Zaporozhets authored Nov 20, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  182aa19e
- Merge pull request #5621 from archiloque/typo_in_gitlab.yml · 728f1d81
  Jacob Vosmaer authored Nov 20, 2013
```
Typo in gitlab.yml.example
```
  728f1d81
- Improve files API. Relative path check added. Create dir for new file if missing · 3f3b202c
  Dmitriy Zaporozhets authored Nov 20, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3f3b202c
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · a1d88f0f
  Dmitriy Zaporozhets authored Nov 20, 2013
  
  a1d88f0f
- Improve consistency: use file_path for API create/update/delete files · 3bab1bd4
  Dmitriy Zaporozhets authored Nov 20, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3bab1bd4
- Merge pull request #5619 from taziyah/patch-1 · faacfc91
  Jacob Vosmaer authored Nov 19, 2013
```
Fix diff command for gitlab.yml.example
```
  faacfc91
19 Nov, 2013 8 commits
- Merge branch 'full-post-to-oss-security' of /home/git/repositories/gitlab/gitlabhq · 33eae334
  Dmitriy Zaporozhets authored Nov 19, 2013
  
  33eae334
- Merge branch 'master' into full-post-to-oss-security · 6413bfb5
  Sytse Sijbrandij authored Nov 19, 2013
```
Conflicts:
	doc/release/security.md
```
  6413bfb5
- Changelog entries and version up to beta1 · 6cc3cc51
  Dmitriy Zaporozhets authored Nov 19, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  6cc3cc51
- Merge branch 'feature/api_delete_file' of /home/git/repositories/gitlab/gitlabhq · 9772cefc
  Dmitriy Zaporozhets authored Nov 19, 2013
  
  9772cefc
- Merge branch 'feature/delete_file' of /home/git/repositories/gitlab/gitlabhq · b0f30006
  Dmitriy Zaporozhets authored Nov 19, 2013
  
  b0f30006
- Tests for delete file by API · a185cce5
  Dmitriy Zaporozhets authored Nov 19, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a185cce5
- API: delete file from repository · 32d7332d
  Dmitriy Zaporozhets authored Nov 19, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  32d7332d
- Remove file from repository feature · bd20ec1a
  Dmitriy Zaporozhets authored Nov 19, 2013
```
After click on remove file button you will be asked for commit message
via modal window. After submitting modal form file will be removed from
repository
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  bd20ec1a