Commits · 522d754dfee9673befc7e6dc93c8a080eba7ae66 · Boxiang Sun / gitlab-ce

01 Oct, 2014 6 commits
- Try wear_merged! without argument · 522d754d
  Dmitriy Zaporozhets authored Oct 01, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  522d754d
- Update changelog for 7.3.2 · 3dde6bb3
  Marin Jankovski authored Oct 01, 2014
```
Conflicts:
	CHANGELOG
```
  3dde6bb3
- Update guides to use gitlab-shell 2.0.1. · 2ac1f95b
  Marin Jankovski authored Oct 01, 2014
  
  2ac1f95b
- Update gitlab-shell to v2.0.1. · 0ca85051
  Marin Jankovski authored Oct 01, 2014
  
  0ca85051
- Merge branch 'add_active_directory_ldap_option' into 'master' · 73b92f85
  Dmitriy Zaporozhets authored Oct 01, 2014
```
Add active directory ldap option

Fixes #1557

See merge request !1139
```
  73b92f85
- Merge branch 'readme_tab' into 'master' · 88d3e97e
  Dmitriy Zaporozhets authored Oct 01, 2014
```
Add Readme tab to project show page

Fixes #1533

See merge request !1140
```
  88d3e97e
30 Sep, 2014 34 commits
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 76aca721
  Dmitriy Zaporozhets authored Sep 30, 2014
  
  76aca721
- Merge pull request #7917 from mr-vinn/fix-alt-typo · 654f9498
  Robert Schilling authored Sep 30, 2014
```
Fix typo in link title
```
  654f9498
- Fix typo in link title · b7874c85
  Vinnie Okada authored Sep 30, 2014
  
  b7874c85
- Merge pull request #7914 from cirosantilli/patch-6 · 136d4455
  Robert Schilling authored Sep 30, 2014
```
Remove statement without effect.
```
  136d4455
- Merge pull request #7913 from cirosantilli/fix-dev-merge-seed · b87c8c1a
  Robert Schilling authored Sep 30, 2014
```
Fix dev merge seed: update testme to gitlab-test.
```
  b87c8c1a
- Remove statement without effect. · 0f12e051
  Ciro Santilli authored Sep 30, 2014
  
  0f12e051
- Fix dev merge seed: update testme to gitlab-test. · 789b4275
  Ciro Santilli authored Sep 30, 2014
  
  789b4275
- Merge branch 'email_on_push_template_changes' into 'master' · 8b362fbf
  Dmitriy Zaporozhets authored Sep 30, 2014
```
Email on push template changes

Fixes #1304

See merge request !1136
```
  8b362fbf
- Merge pull request #7911 from cirosantilli/trailing-white · 88db8708
  Robert Schilling authored Sep 30, 2014
```
Remove trailing whitespace from views.
```
  88db8708
- Remove trailing whitespace from views. · 6aa0448f
  Ciro Santilli authored Sep 30, 2014
  
  6aa0448f
- Bump gitlab_git · 2b88c9cd
  Dmitriy Zaporozhets authored Sep 30, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  2b88c9cd
- Add readme tab to changelog. · ae88a9bf
  Marin Jankovski authored Sep 30, 2014
  
  ae88a9bf
- Add a feature for readme on project show page. · 65cb51af
  Marin Jankovski authored Sep 30, 2014
  
  65cb51af
- Add rspec to test_ci · 6fa81e5d
  Dmitriy Zaporozhets authored Sep 30, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  6fa81e5d
- Separate rake test for simplecov · 99a7bf88
  Dmitriy Zaporozhets authored Sep 30, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  99a7bf88
- Save if user prefers readme or activity tab. · 49157242
  Marin Jankovski authored Sep 30, 2014
  
  49157242
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · 0e183aa7
  Dmitriy Zaporozhets authored Sep 30, 2014
  
  0e183aa7
- Add tab for readme and load readme in tab. · 31e50ed3
  Marin Jankovski authored Sep 30, 2014
  
  31e50ed3
- Merge branch 'speed-upgrade' into 'master' · ff2b0bfa
  Marin Jankovski authored Sep 30, 2014
```
Speed upgrade

/cc @jacobvosmaer @dzaporozhets

See merge request !1134
```
  ff2b0bfa
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 7d45d8a1
  Marin Jankovski authored Sep 30, 2014
  
  7d45d8a1
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · a336f01b
  Dmitriy Zaporozhets authored Sep 30, 2014
  
  a336f01b
- Merge branch 'backup_uploader_docs' into 'master' · be34477d
  Dmitriy Zaporozhets authored Sep 30, 2014
```
Improve backup uploader docs

See merge request !1137
```
  be34477d
- Add option to gitlab config to specify if LDAP server is active directory. · f7aba277
  Marin Jankovski authored Sep 30, 2014
  
  f7aba277
- Add region to backup upload config in gitlab.yml · f778387e
  Jacob Vosmaer authored Sep 30, 2014
  
  f778387e
- Consolidate the IAM backup upload policy · b5d2d3d7
  Jacob Vosmaer authored Sep 30, 2014
  
  b5d2d3d7
- Add a 'region' to the backup upload connection · 794078a3
  Jacob Vosmaer authored Sep 30, 2014
  
  794078a3
- Update email templates for email on push service with links to commit and repository. · 75eacf4d
  Marin Jankovski authored Sep 30, 2014
  
  75eacf4d
- Merge pull request #7906 from mr-vinn/fix-graph-log · adc84bf8
  Dmitriy Zaporozhets authored Sep 30, 2014
```
Replace Gitlab::Git::GitStats
```
  adc84bf8
- Merge branch 'jubianchi-api/issues-filter-milestone' · 0c29cb34
  Dmitriy Zaporozhets authored Sep 30, 2014
  
  0c29cb34
- Merge branch 'api/issues-filter-milestone' of... · 4c52ff51
  Dmitriy Zaporozhets authored Sep 30, 2014
```
Merge branch 'api/issues-filter-milestone' of https://github.com/jubianchi/gitlabhq into jubianchi-api/issues-filter-milestone
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
```
  4c52ff51
- Merge branch 'fix-network-graph' into 'master' · c20c2c83
  Dmitriy Zaporozhets authored Sep 30, 2014
```
Fix network graph

Fix #1624

See merge request !1135
```
  c20c2c83
- Merge branch 'prevent_notes_polling' into 'master' · 3f739428
  Dmitriy Zaporozhets authored Sep 30, 2014
```
Prevent notes polling when there are not notes

See merge request !1132
```
  3f739428
- Fix contributors api · e145f46a
  Dmitriy Zaporozhets authored Sep 30, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e145f46a
- Bump gitlab_git version · 5601b87b
  Dmitriy Zaporozhets authored Sep 30, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  5601b87b