Commits · 944d9eeec0d0bcba66b59b0ba98ec12ae1de6362 · nexedi / gitlab-ce

10 Oct, 2014 1 commit
- Do AD check if AD is enabled. · 944d9eee
  Marin Jankovski authored Oct 10, 2014
  
  944d9eee
03 Oct, 2014 33 commits
- Merge branch 'ee-7-4' into 'master' · 37169e54
  Dmitriy Zaporozhets authored Oct 03, 2014
```
More new code from CE 7.4 into EE

See merge request !191
```
  37169e54
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee into ee-7-4 · 7cf86dc4
  Dmitriy Zaporozhets authored Oct 03, 2014
  
  7cf86dc4
- Merge branch 'fix_for_project_without_group' into 'master' · 74ac2df3
  Dmitriy Zaporozhets authored Oct 03, 2014
```
Fix for project without group

See merge request !192
```
  74ac2df3
- If project doesn't have a group, group ldap sync is false. · 94ba1f01
  Marin Jankovski authored Oct 03, 2014
  
  94ba1f01
- Updated packages for 7.2.0 and 7.2.1 for ubuntu and debian. · d3bf5f63
  Marin Jankovski authored Oct 03, 2014
  
  d3bf5f63
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ee-7-4 · eafac593
  Dmitriy Zaporozhets authored Oct 03, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/helpers/merge_requests_helper.rb
	doc/update/README.md
	lib/gitlab/reference_extractor.rb
```
  eafac593
- Merge branch 'ee-7-4' into 'master' · 778923b6
  Dmitriy Zaporozhets authored Oct 03, 2014
```
Recent 7.4 code from CE into EE

Fixes #187

See merge request !190
```
  778923b6
- Merge branch 'do_not_show_ldap_users_in_dropdowns' into 'master' · da38e4f5
  Dmitriy Zaporozhets authored Oct 03, 2014
```
Do not show ldap users in dropdowns

Fixes #160

See merge request !186
```
  da38e4f5
- Merge branch 'cirosantilli-factor-commit-msg-textarea' · 43217dd5
  Dmitriy Zaporozhets authored Oct 03, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/projects/edit_tree/show.html.haml
```
  43217dd5
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 8188427e
  Dmitriy Zaporozhets authored Oct 03, 2014
  
  8188427e
- Merge branch 'new-milestone-link' into 'master' · 5709e8d7
  Dmitriy Zaporozhets authored Oct 03, 2014
```
New milestone and label links

Fixes #1364

Fixes #1586

See merge request !1145
```
  5709e8d7
- Merge branch 'signin_after_confirmation' into 'master' · 5a541f54
  Dmitriy Zaporozhets authored Oct 03, 2014
```
Signin after confirmation

Fixes #1471

See merge request !1146
```
  5a541f54
- Fix EE code after membership refactoring · 9afa80bb
  Dmitriy Zaporozhets authored Oct 03, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  9afa80bb
- Merge pull request #7948 from cirosantilli/rm-outdated-comment · 91e346eb
  Robert Schilling authored Oct 03, 2014
```
Remove outdated comment on the project test seed
```
  91e346eb
- Merge pull request #7947 from cirosantilli/rm-assign-without-effect · 77979280
  Robert Schilling authored Oct 03, 2014
```
Remove assignment without effect.
```
  77979280
- Merge pull request #7934 from Soullivaneuh/font-awesome · 0676f1da
  Dmitriy Zaporozhets authored Oct 03, 2014
```
Upgrade to Font Awesome v4.2
```
  0676f1da
- Merge pull request #7779 from Bugagazavr/hook_tag_push_events · ac6f0321
  Dmitriy Zaporozhets authored Oct 03, 2014
```
Add tag push events to project hook api
```
  ac6f0321
- Merge pull request #7754 from Bugagazavr/hooks · 03b44916
  Dmitriy Zaporozhets authored Oct 03, 2014
```
More information in merge request hook
```
  03b44916
- Merge branch 'factor-commit-msg-textarea' of... · 4ebe718d
  Dmitriy Zaporozhets authored Oct 03, 2014
```
Merge branch 'factor-commit-msg-textarea' of https://github.com/cirosantilli/gitlabhq into cirosantilli-factor-commit-msg-textarea
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/projects/blob/_remove.html.haml
```
  4ebe718d
- Merge pull request #7941 from Razer6/update/org-mode · 1c077cac
  Dmitriy Zaporozhets authored Oct 03, 2014
```
Bump org-mode to 0.9.9
```
  1c077cac
- Remove outdated comment on the project test seed · 6014e28c
  Ciro Santilli authored Oct 03, 2014
  
  6014e28c
- Remove assignment without effect. · 3960a5a2
  Ciro Santilli authored Oct 03, 2014
  
  3960a5a2
- Upgrade to Font Awesome v4.2 · 5d8be443
  Sullivan SENECHAL authored Oct 02, 2014
  
  5d8be443
- Merge pull request #7664 from bbodenmiller/patch-2 · 0cc30145
  Sytse Sijbrandij authored Oct 03, 2014
```
add HSTS Policy warning
```
  0cc30145
- Merge pull request #7595 from bbodenmiller/patch-4 · f74dba8c
  Marin Jankovski authored Oct 03, 2014
```
add sign-in count
```
  f74dba8c
- Merge pull request #7748 from yglukhov/clickable-source-repo-in-mr · 910d5cf3
  Marin Jankovski authored Oct 03, 2014
```
Source repo is now clickable.
```
  910d5cf3
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · d97a9d49
  Marin Jankovski authored Oct 03, 2014
  
  d97a9d49
- Merge pull request #7858 from cirosantilli/def-param-paren · 9f45e229
  Robert Schilling authored Oct 03, 2014
```
Add parenthesis to function def with arguments.
```
  9f45e229
- Add parenthesis to function def with arguments. · 2e9f5de8
  Ciro Santilli authored Sep 26, 2014
  
  2e9f5de8
- Add tag_push_events to project hook api · b4963e9d
  Kirill Zaitsev authored Sep 19, 2014
  
  b4963e9d
- Merge pull request #7946 from Razer6/changelog_entry · a3d90c50
  Robert Schilling authored Oct 03, 2014
```
Add move to html-pipeline-gitlab to changelog
```
  a3d90c50
- Add move to html-pipeline-gitlab to changelog · d5c8ca74
  Robert Schilling authored Oct 03, 2014
  
  d5c8ca74
- Merge pull request #7834 from cirosantilli/rm-empty-eq · 6f797f86
  Robert Schilling authored Oct 03, 2014
```
Remove test line without effect because no should.
```
  6f797f86
02 Oct, 2014 6 commits
- Merge pull request #7922 from cirosantilli/improve-remove-file-commit-placeholder · 06fd4bf7
  Robert Schilling authored Oct 03, 2014
```
Improve remove file oommit message textarea placeholder.
```
  06fd4bf7
- Bump org-mode to 0.9.9 · b0a32762
  Robert Schilling authored Oct 02, 2014
  
  b0a32762
- Merge branch 'be_pragmatic_about_shelling_out' into 'master' · a835b0ce
  Sytse Sijbrandij authored Oct 02, 2014
```
Be pragmatic about shelling out

See merge request !1149
```
  a835b0ce
- Add a counterexample to 'do it in Ruby' · 97c5d380
  Jacob Vosmaer authored Oct 02, 2014
  
  97c5d380
- Merge branch 'show-build-coverage-in-mr' into 'master' · 4e96c84e
  Dmitriy Zaporozhets authored Oct 02, 2014
```
Show build coverage in MR

![Screenshot 2014-10-02 18.20.53](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/a8ff7b23bd/Screenshot_2014-10-02_18.20.53.png)

See merge request !1148
```
  4e96c84e
- Merge branch 'fix-500-admin-user-page' into 'master' · 1a09a805
  Dmitriy Zaporozhets authored Oct 02, 2014
```
Fix 500 admin user page

See merge request !1147
```
  1a09a805