Commits · 75b2ff8f43d52c76d4d4eaac37618295b5046cc6 · iv / gitlab-ce

23 Sep, 2013 2 commits

Added ldap tests · 75b2ff8f
Izaak Alpert authored Sep 16, 2013
```
Change-Id: Ifd77615b3b92d7d8bca92b8875aa8204356cfd85
```
75b2ff8f

Allows username only updates to ldap properties · 4fcc17e6

Izaak Alpert authored Sep 12, 2013

-when logging in if users are allowed to login with just usernames in ldap we will update uid of the user if their uid is out of date

Conflicts:
	spec/lib/auth_spec.rb

Change-Id: Ia171b3d5133da86edc18c0d08ecfaf6a174f2574

4fcc17e6

22 Sep, 2013 10 commits
- Merge pull request #5136 from f0k/patch-1 · 089f0000
  Dmitriy Zaporozhets authored Sep 22, 2013
```
Remove old assets before compiling new ones
```
  089f0000
- Merge pull request #5142 from karlhungus/bugfix-handle-empty-public-projects · 7be084b1
  Dmitriy Zaporozhets authored Sep 22, 2013
```
Prevent empty public projects from throwing exceptions
```
  7be084b1
- Merge pull request #5116 from karlhungus/feature-configurable-theme · 5bc07b2a
  Dmitriy Zaporozhets authored Sep 22, 2013
```
Make users theme configurable
```
  5bc07b2a
- Merge pull request #5145 from hiroponz/fix-api-merge-request · 0d23ea29
  Dmitriy Zaporozhets authored Sep 22, 2013
```
Fix API::MergeRequest
```
  0d23ea29
- Corrects the update document to match the version of gitshell specified in the... · 3d2ec9fe
  Spencer Owen authored Sep 16, 2013
```
Corrects the update document to match the version of gitshell specified in the install document (1.7.1)
```
  3d2ec9fe
- Merge branch '6-1-stable' · 3f0f30d0
  Marin Jankovski authored Sep 22, 2013
  
  3f0f30d0
- Fix hover for tree view · 8fb83bc8
  Dmitriy Zaporozhets authored Sep 22, 2013
  
  8fb83bc8
- Version 6.1.0 · dcf9abc1
  Marin Jankovski authored Sep 22, 2013
  
  dcf9abc1
- Defaulted theme to MARS · fcba0d55
  Izaak Alpert authored Sep 22, 2013
```
Change-Id: I02814fb47edcc915309183547cc8dcb165100f4f
```
  fcba0d55
- Make users theme configurable · 51e6095d
  Izaak Alpert authored Sep 16, 2013
```
GITLAB-1262

Change-Id: I690cb8ea294df53ebe8405a519c23c501af2c21a

Conflicts:
	app/models/user.rb
	config/initializers/1_settings.rb
	spec/models/user_spec.rb
```
  51e6095d
21 Sep, 2013 6 commits
- Fix API::MergeRequest · d426195d
  Hiroyuki Sato authored Sep 22, 2013
```
Fixes #5144 Refs #4996
```
  d426195d
- Restyle event title · 5367e42b
  Sytse Sijbrandij authored Sep 21, 2013
  
  5367e42b
- Restyle tree table UI · 1a5cde17
  Sytse Sijbrandij authored Sep 21, 2013
  
  1a5cde17
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq · 731619ac
  Sytse Sijbrandij authored Sep 21, 2013
  
  731619ac
- Update gitlab_git to version 2.3.1 · 687cd9fa
  Sytse Sijbrandij authored Sep 21, 2013
  
  687cd9fa
- Merge branch 'update_changelog' of /home/git/repositories/axil/gitlabhq · 09e4ecfb
  Dmitriy Zaporozhets authored Sep 21, 2013
  
  09e4ecfb
20 Sep, 2013 1 commit
- Prevent empty public projects from throwing exceptions · 61a86101
  Izaak Alpert authored Sep 20, 2013
```
GITLAB-1279 (GITLAB-1264)

Change-Id: Ifb5b4313bc91fae720f8ef5c36152c45e9d38934
```
  61a86101
19 Sep, 2013 3 commits
- remove old assets before compiling · a47fe72a
  Jan Schlüter authored Sep 19, 2013
  
  a47fe72a
- Add author of new init script · ed68bf7e
  Axilleas Pipinellis authored Sep 19, 2013
  
  ed68bf7e
- README improved. Removed travis badge · 05ef996e
  Sytse Sijbrandij authored Sep 19, 2013
  
  05ef996e
18 Sep, 2013 7 commits
- Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhq · d4c4fc35
  Dmitriy Zaporozhets authored Sep 18, 2013
  
  d4c4fc35
- Merge pull request #5099 from yatishmehta27/gitignore-changes · 540b3ee5
  Dmitriy Zaporozhets authored Sep 18, 2013
```
Added .ruby-version & .ruby-gemset in .gitignore
```
  540b3ee5
- Merge branch 'changelog-specifics' of /home/git/repositories/gitlab/gitlabhq · 6a8b9ed8
  Dmitriy Zaporozhets authored Sep 18, 2013
  
  6a8b9ed8
- Add author and issue id warning. · 300f2444
  Sytse Sijbrandij authored Sep 18, 2013
  
  300f2444
- Merge pull request #5112 from hiroponz/drop-support-of-root-namespace · 8672203b
  Dmitriy Zaporozhets authored Sep 17, 2013
```
Drop support of root namespace in model
```
  8672203b
- Merge pull request #5117 from karlhungus/feature-password-update-skipped-when-ldap-user · 9fabd703
  Dmitriy Zaporozhets authored Sep 17, 2013
```
Don't show users password change page if ldap users
```
  9fabd703
- Don't show users password change page if ldap users · ca1b67ce
  Izaak Alpert authored Sep 17, 2013
  
  ca1b67ce
17 Sep, 2013 1 commit
- Drop support of root namespace in model · a3ef6831
  Hiroyuki Sato authored Sep 17, 2013
  
  a3ef6831
16 Sep, 2013 4 commits
- Added .ruby-version & .ruby-gemset in .gitignore · 1b1c81b1
  Yatish Mehta authored Sep 16, 2013
  
  1b1c81b1
- Update docs to use 6-1-stable branch · 16b6040c
  Dmitriy Zaporozhets authored Sep 16, 2013
  
  16b6040c
- Update gitlab_git to version 2.2.0. Fixes invalid diff in Compare · 9c629a1e
  Dmitriy Zaporozhets authored Sep 16, 2013
  
  9c629a1e
- Merge pull request #5093 from smashwilson/example-config-fix · 2d31a9f3
  Dmitriy Zaporozhets authored Sep 15, 2013
```
Fix issue_closing_regex in gitlab.yml.example
```
  2d31a9f3
15 Sep, 2013 1 commit
- Don't quote the default issue closing regex. · 8bbb5628
  Ash Wilson authored Sep 15, 2013
```
It turns out that regex escapes and YAML quoted-scalar escapes don't play
nicely together.
```
  8bbb5628
14 Sep, 2013 5 commits
- Fix tests · e0e88cdd
  Dmitriy Zaporozhets authored Sep 14, 2013
  
  e0e88cdd
- Fix 500 error on admin->project page · 90dc5ff5
  Dmitriy Zaporozhets authored Sep 14, 2013
  
  90dc5ff5
- Extend user infiormation displayed on admin user page · 74a62138
  Dmitriy Zaporozhets authored Sep 14, 2013
  
  74a62138
- Fix setting default values for user · a51562d6
  Dmitriy Zaporozhets authored Sep 14, 2013
  
  a51562d6
- Let it be 6.1.0.rc1 · 3fe2558a
  Dmitriy Zaporozhets authored Sep 14, 2013
  
  3fe2558a