Commits · 6d761461d3a65723a5587a5cac1bf49fb803cb09 · nexedi / gitlab-ce

10 Apr, 2014 1 commit
- Merge branch 'email_update_test' into 'master' · 6d761461
  Dmitriy Zaporozhets authored Apr 10, 2014
```
Email update test
```
  6d761461
09 Apr, 2014 3 commits
- Test update_email method. · 0cf7f2f8
  Marin Jankovski authored Apr 09, 2014
  
  0cf7f2f8
- Do not require modernizr. · cf616a84
  Marin Jankovski authored Apr 03, 2014
```
Conflicts:
	app/assets/javascripts/main.js.coffee
```
  cf616a84
- Remove modernizr gem. · ac2fd399
  Marin Jankovski authored Apr 03, 2014
  
  ac2fd399
08 Apr, 2014 2 commits
- Merge branch 'packages/6-7-2-openssl' into 'master' · 28246292
  Jacob Vosmaer authored Apr 08, 2014
```
Update omnibus openssl for CVE-2014-0160
```
  28246292
- Update omnibus openssl for CVE-2014-0160 · 2db296f8
  Jacob Vosmaer authored Apr 08, 2014
  
  2db296f8
07 Apr, 2014 3 commits
- Merge branch 'packages/6-7-2' into 'master' · da6edad0
  Jacob Vosmaer authored Apr 07, 2014
```
Packages for 6.7.2-ee
```
  da6edad0
- Group by OS. · b700ba0e
  Marin Jankovski authored Apr 07, 2014
  
  b700ba0e
- Add packages for 6.7.2-ee. · 807f0673
  Marin Jankovski authored Apr 07, 2014
  
  807f0673
04 Apr, 2014 4 commits
- Merge branch 'email_synchronization' into 'master' · 892630bf
  Dmitriy Zaporozhets authored Apr 04, 2014
```
Synchronize GitLab user email if it changed in LDAP
```
  892630bf
- Merge branch 'link-to-ee-packages' into 'master' · 2a8d33f7
  Jacob Vosmaer authored Apr 04, 2014
```
Link to ee packages
```
  2a8d33f7
- Link to the ee packages from ee. · d692bd43
  dosire authored Apr 04, 2014
  
  d692bd43
- Synchronize user email with ldap. · 1187d3f2
  Marin Jankovski authored Apr 04, 2014
  
  1187d3f2
02 Apr, 2014 2 commits
- Merge branch '67-ce-to-ee' into 'master' · 153705bc
  Sytse Sijbrandij authored Apr 02, 2014
```
67-ce-to-ee

This was still missing
```
  153705bc
- add 6.7-ce-to-ee guide · 64890350
  Job van der Voort authored Apr 02, 2014
  
  64890350
01 Apr, 2014 3 commits
- Be more specific about omnibus-gitlab features · cb8b93f7
  Jacob Vosmaer authored Apr 01, 2014
  
  cb8b93f7
- Merge branch 'packages/6-7' into 'master' · da255da8
  Jacob Vosmaer authored Apr 01, 2014
```
Packages for GitLab EE 6.7.1
```
  da255da8
- Add packages for 6.7.1 EE · 73014178
  Jacob Vosmaer authored Apr 01, 2014
  
  73014178
31 Mar, 2014 2 commits
- Merge branch 'update-JIRA-documentation' into 'master' · 9ca2842a
  Sytse Sijbrandij authored Mar 31, 2014
```
Update-jira-documentation

Added explanation on how to reference JIRA issue from GitLab comments.
```
  9ca2842a
- fix JIRA documentation by explaining how to reference JIRA issues in GitLab comments · b78000c6
  Marc Radulescu authored Mar 31, 2014
  
  b78000c6
28 Mar, 2014 5 commits
- Merge branch 'bug/ldap_dn_matches_filter' into 'master' · 430ceaa9
  Jacob Vosmaer authored Mar 28, 2014
```
Handle LDAP errors in Adapter#dn_matches_filter?
```
  430ceaa9
- Add changelog entry for dn_matches_filter? bug · 4e9d2808
  Jacob Vosmaer authored Mar 28, 2014
  
  4e9d2808
- Check for errors in Adapter#dn_matches_filter? · 2bfa02bb
  Jacob Vosmaer authored Mar 28, 2014
  
  2bfa02bb
- Add test for LDAP::Adapter#dn_matches_filter? · 401cac62
  Jacob Vosmaer authored Mar 28, 2014
  
  401cac62
- Subscribers should use subscribers@gitlab.com · ec73107d
  Jacob Vosmaer authored Mar 28, 2014
  
  ec73107d
26 Mar, 2014 5 commits
- Add changelog entry for admin group edit fix · 93e064c9
  Jacob Vosmaer authored Mar 26, 2014
  
  93e064c9
- Merge branch 'documentation/git_hooks' into 'master' · 197e793c
  Sytse Sijbrandij authored Mar 26, 2014
```
More documentation for git hooks
```
  197e793c
- Add a link to the Ruby Regexp documentation · 7017474b
  Jacob Vosmaer authored Mar 26, 2014
  
  7017474b
- Git tags can still be deleted through the UI · 403c10b2
  Jacob Vosmaer authored Mar 26, 2014
  
  403c10b2
- Skip git hooks if oldrev or newrev is nil · 713815df
  Dmitriy Zaporozhets authored Mar 26, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  713815df
25 Mar, 2014 2 commits
- Merge branch '6-7-2-ce' into 'master' · 67e942cc
  Dmitriy Zaporozhets authored Mar 25, 2014
```
CE 6.7.2 changes
```
  67e942cc
- Merge branch '6-7-stable' of dev.gitlab.org:gitlab/gitlabhq into 6-7-2-ce · 3a293fa9
  Dmitriy Zaporozhets authored Mar 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	doc/install/installation.md
	lib/gitlab/backend/grack_auth.rb
```
  3a293fa9
24 Mar, 2014 2 commits
- Merge branch 'upgrader-test' into 'master' · ffaeca90
  Dmitriy Zaporozhets authored Mar 24, 2014
```
Upgrader Test

/cc @jacobvosmaer @job @marin
```
  ffaeca90
- Add upgrader test. · c9fd0bd4
  dosire authored Mar 24, 2014
  
  c9fd0bd4
21 Mar, 2014 6 commits
- Version 6.7.2 · dbbf4ea2
  Dmitriy Zaporozhets authored Mar 21, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  dbbf4ea2
- Fix upgrader · a261c5fc
  Dmitriy Zaporozhets authored Mar 21, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a261c5fc
- Version 6.7.1 · ba0d8842
  Dmitriy Zaporozhets authored Mar 21, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ba0d8842
- Fix gitlab-ci integration · b8d83d25
  Dmitriy Zaporozhets authored Mar 21, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b8d83d25
- Merge branch 'update-install-doc-branch' into '6-7-stable' · 919bc979
  Dmitriy Zaporozhets authored Mar 21, 2014
```
Update Install Doc Branch

/cc @marin
```
  919bc979
- Should be 6-7. · a9863ed0
  dosire authored Mar 21, 2014
  
  a9863ed0