Commits · 5771ff01872bb2b9febc6cd00f678e64829c0bc7 · nexedi / gitlab-ce

13 Feb, 2014 2 commits
- Merge branch 'ldap_debug' into 'master' · 5771ff01
  Dmitriy Zaporozhets authored Feb 13, 2014
```
Ldap Debug
```
  5771ff01
- Merge branch 'license-change' into 'master' · 312c25ee
  Sytse Sijbrandij authored Feb 13, 2014
```
License Change
```
  312c25ee
12 Feb, 2014 5 commits
- Merge branch 'update_documentation' into 'master' · 34e61145
  Jacob Vosmaer authored Feb 12, 2014
```
Update upgrade guide for 6.4-6.5

This makes the checkout command more clear because previously it was within a comment.

/cc @job @sytse
```
  34e61145
- Dump LDAP objects into the log for debugging · 0bfc45d5
  Jacob Vosmaer authored Feb 12, 2014
  
  0bfc45d5
- Remove empty lines. · 1c629b62
  Marin Jankovski authored Feb 12, 2014
  
  1c629b62
- Update minor versions upgrade guides get latest code section. · 245d68ee
  Marin Jankovski authored Feb 12, 2014
  
  245d68ee
- Make command for EE checkout more clear. · 50ccfe30
  Marin Jankovski authored Feb 12, 2014
  
  50ccfe30
11 Feb, 2014 8 commits
- Merge branch 'upstream-ce' into 'master' · f974bea8
  Dmitriy Zaporozhets authored Feb 11, 2014
```
Upstream changes from CE (6.6.0.pre)
```
  f974bea8
- Improve group edit page · e6c9ee77
  Dmitriy Zaporozhets authored Feb 11, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e6c9ee77
- Merge branch 'fix_admin_group_ui' into 'master' · f1866058
  Dmitriy Zaporozhets authored Feb 11, 2014
```
Improve group edit page for admins

Fixes #61
```
  f1866058
- Wrap license file. · 4f3de79f
  dosire authored Feb 11, 2014
  
  4f3de79f
- License change. · 31eb273c
  dosire authored Feb 11, 2014
  
  31eb273c
- Improve group edit page for admins · 3915b4b9
  Dmitriy Zaporozhets authored Feb 11, 2014
```
Add autocomplete selectbox for ldap group name.
Fixed align of LDAP settigs block
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3915b4b9
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce · 903726c8
  Dmitriy Zaporozhets authored Feb 11, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	Gemfile
	VERSION
	app/models/group.rb
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/5.4-to-6.0.md
```
  903726c8
- Fix new password page UI · faafde2d
  Dmitriy Zaporozhets authored Feb 11, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  faafde2d
10 Feb, 2014 24 commits
- Merge branch 'feature/blob_last_commit' into 'master' · 1af84f8c
  Dmitriy Zaporozhets authored Feb 10, 2014
```
Feature: show last commit for Blob#show

Fixes #970
```
  1af84f8c
- Show last commit for Blob#show · 9a3d6659
  Dmitriy Zaporozhets authored Feb 10, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  9a3d6659
- Merge pull request #6276 from robertd/update_changelog · 35fb7d54
  Dmitriy Zaporozhets authored Feb 10, 2014
```
Update changelog for #6267
```
  35fb7d54
- Merge branch 'bug/filtering_service' into 'master' · 657eb7ba
  Dmitriy Zaporozhets authored Feb 10, 2014
```
Fix wrong issues appears at Dashboard#issues page

Fixes #1028
```
  657eb7ba
- Merge branch 'ace_editor' into 'master' · c10a35c4
  Dmitriy Zaporozhets authored Feb 10, 2014
```
Ace Editor as gem
```
  c10a35c4
- Fix dashboard atom feed · 5e30f4d5
  Dmitriy Zaporozhets authored Feb 10, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  5e30f4d5
- Use ace editor as gem · 1794f606
  Dmitriy Zaporozhets authored Feb 10, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1794f606
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · baf8afc6
  Dmitriy Zaporozhets authored Feb 10, 2014
  
  baf8afc6
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq · 8342f73d
  Dmitriy Zaporozhets authored Feb 10, 2014
  
  8342f73d
- Merge pull request #6284 from Razer6/fix_grammer_in_mr_page · 6cf24ba9
  Sytse Sijbrandij authored Feb 10, 2014
```
Fixes #6073, Update grammer in MR accept form
```
  6cf24ba9
- Merge pull request #6283 from Razer6/fix_dead_links · 189ae623
  Sytse Sijbrandij authored Feb 10, 2014
```
Fixes #6187, Update dead links
```
  189ae623
- Fix Issues#bulk_update · 58ac731c
  Dmitriy Zaporozhets authored Feb 10, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  58ac731c
- Add more tests for FilteringService · ec437ad9
  Dmitriy Zaporozhets authored Feb 10, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ec437ad9
- Merge branch 'sockets_are_standard' into 'master' · 62778fa7
  Sytse Sijbrandij authored Feb 10, 2014
```
Sockets Are Standard
```
  62778fa7
- Fix wrong issues appears at Dashboard#issues page · 56f989e5
  Dmitriy Zaporozhets authored Feb 10, 2014
```
Filtering service used klass instead of passed items.
Because of this you see list of all issues intead of authorized ones.
This commit fixes it so people see only issues they are authorized to
see.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  56f989e5
- Domain sockets are the default, not TCP · 464d820b
  Jacob Vosmaer authored Feb 10, 2014
  
  464d820b
- Use one sentence per line in architecture.md · e009e020
  Jacob Vosmaer authored Feb 10, 2014
  
  e009e020
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 5a098e84
  Dmitriy Zaporozhets authored Feb 10, 2014
  
  5a098e84
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq · 05ab4d8b
  Dmitriy Zaporozhets authored Feb 10, 2014
  
  05ab4d8b
- Fix submodule_helper specs · bed05a13
  Dmitriy Zaporozhets authored Feb 10, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  bed05a13
- Merge pull request #6280 from bovi/patch-1 · e26c7f77
  Sytse Sijbrandij authored Feb 10, 2014
```
Minor README fix
```
  e26c7f77
- More than text was missing a word on the help page. · 7b33efdf
  dosire authored Feb 10, 2014
  
  7b33efdf
- Fix submodules · dee11dad
  Dmitriy Zaporozhets authored Feb 10, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  dee11dad
- Bump for gitlab_git · 8b6a14b5
  Dmitriy Zaporozhets authored Feb 10, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8b6a14b5
09 Feb, 2014 1 commit
- Fixes #6073, Update grammer in MR accept form · 725d35ed
  Robert Schilling authored Feb 09, 2014
  
  725d35ed