Commits · 20fc971140a8aa570b70c7b915ab616b5c9fea40 · nexedi / gitlab-ce

19 Dec, 2013 2 commits
- Merge branch 'ldap_group_explanation' of /home/git/repositories/gitlab/gitlab-ee · 20fc9711
  Jacob Vosmaer authored Dec 19, 2013
  
  20fc9711
- Improve wording of LDAP sync explanation · 2f53c2d8
  Jacob Vosmaer authored Dec 19, 2013
  
  2f53c2d8
18 Dec, 2013 3 commits
- Fix grammar in help text · d19f5bd7
  Jacob Vosmaer authored Dec 18, 2013
  
  d19f5bd7
- Improve UI for Group ldap settings page · 4128f995
  Dmitriy Zaporozhets authored Dec 18, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4128f995
- Add unstyled explanation for LDAP group settings · 60797589
  Jacob Vosmaer authored Dec 18, 2013
  
  60797589
14 Dec, 2013 2 commits
- Merge branch 'improve/ldap_respect_group_access' of /home/git/repositories/gitlab/gitlab-ee · f77be391
  Dmitriy Zaporozhets authored Dec 14, 2013
  
  f77be391
- Respect existing group permissions during sync with LDAP group · d3844662
  Dmitriy Zaporozhets authored Dec 14, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d3844662
06 Dec, 2013 2 commits
- Merge branch 'avoid_duplicate_group_emails' of /home/git/repositories/gitlab/gitlab-ee · 9124acc1
  Dmitriy Zaporozhets authored Dec 06, 2013
  
  9124acc1
- Avoid duplicate group membership emails · 06d5b533
  Jacob Vosmaer authored Dec 06, 2013
  
  06d5b533
05 Dec, 2013 1 commit
- Merge branch '6-3-1-stable-ee' of /home/git/repositories/gitlab/gitlab-ee · 9afcb64e
  Jacob Vosmaer authored Dec 05, 2013
  
  9afcb64e
04 Dec, 2013 2 commits
- Bump version to 6.3.1-ee · c728b7b1
  Jacob Vosmaer authored Dec 04, 2013
  
  c728b7b1
- Update rails to 3.2.16 · 07358b4b
  Dmitriy Zaporozhets authored Dec 04, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  07358b4b
02 Dec, 2013 3 commits
- Merge branch '63_ce_to_ee' of /home/git/repositories/gitlab/gitlab-ee · db641c38
  Dmitriy Zaporozhets authored Dec 02, 2013
  
  db641c38
- Add 6.3 CE-to-EE update guide · 4d981e53
  Jacob Vosmaer authored Dec 02, 2013
  
  4d981e53
- Add assets:precompile to CE-to-EE update steps · 4dc6dfdf
  Jacob Vosmaer authored Dec 02, 2013
  
  4dc6dfdf
29 Nov, 2013 2 commits

Merge branch 'release/6-3' of /home/git/repositories/gitlab/gitlab-ee · 278935a3
Dmitriy Zaporozhets authored Nov 29, 2013

278935a3

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 7 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