Commits · d155b3e72c681fb835e9a69e4e00eee92d93f28e · nexedi / gitlab-ce

20 Aug, 2014 9 commits
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq · d155b3e7
  Jacob Vosmaer authored Aug 20, 2014
  
  d155b3e7
- Merge pull request #7553 from Razer6/fix_project_description · 1eaa8e18
  Jacob Vosmaer authored Aug 20, 2014
```
Fix project description on explore page, fixes #7458
```
  1eaa8e18
- Merge pull request #7552 from Razer6/fix_star_button · 16500a20
  Jacob Vosmaer authored Aug 20, 2014
```
use default white-space for sidebar buttons, fixes #7549
```
  16500a20
- Merge branch 'show_shared_groups' into 'master' · d819b9d4
  Jacob Vosmaer authored Aug 20, 2014
```
Show shared groups

Fixes #134

See merge request !148
```
  d819b9d4
- Merge branch 'email' into 'master' · 2ec7339c
  Jacob Vosmaer authored Aug 20, 2014
```
Email

Fixes #126

See merge request !150
```
  2ec7339c
- Merge pull request #7536 from yuters/patch-5 · 08ff7c38
  Jacob Vosmaer authored Aug 20, 2014
```
Fix color toggle for labels in edit view
```
  08ff7c38
- add documentation for emailing from within GitLab · 7e6c3717
  Job van der Voort authored Aug 20, 2014
  
  7e6c3717
- Typo fix. · 81430a61
  Marin Jankovski authored Aug 20, 2014
  
  81430a61
- Restyle explore projects to fix #7548 · 5e7f5ee8
  Robert Schilling authored Aug 20, 2014
  
  5e7f5ee8
19 Aug, 2014 24 commits
- use default white-space for sidebar buttons, fixes #7549 · 6f679236
  Robert Schilling authored Aug 19, 2014
  
  6f679236
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq · f41eef16
  Jacob Vosmaer authored Aug 19, 2014
```
Conflicts:
	VERSION
```
  f41eef16
- Bump version to 7.2.0.rc2 · ed9e922d
  Jacob Vosmaer authored Aug 19, 2014
  
  ed9e922d
- Use the default color when migrating labels · eaef3328
  Jacob Vosmaer authored Aug 19, 2014
  
  eaef3328
- Remove invalid characters from the label name · 169e8831
  Jacob Vosmaer authored Aug 19, 2014
  
  169e8831
- Test if the label is valid before creating link · 0920573e
  Jacob Vosmaer authored Aug 19, 2014
  
  0920573e
- Add 6.0-to-7.2.md guide ahead of 7.2 release · 71a674fd
  Jacob Vosmaer authored Aug 19, 2014
  
  71a674fd
- Add 7.1-to-7.2.md update guide · c5e6defd
  Jacob Vosmaer authored Aug 19, 2014
  
  c5e6defd
- Fix env varable style for documentation · b9bb647b
  Robert Schilling authored Aug 18, 2014
  
  b9bb647b
- Add missing elements to webhook doc · f324275e
  sue445 authored Aug 19, 2014
  
  f324275e
- Fix labels return code · 33c8c1cc
  Robert Schilling authored Aug 18, 2014
  
  33c8c1cc
- Fix minor spelling error · c191d730
  Robert Schilling authored Aug 17, 2014
  
  c191d730
- Consistency: Capitalize hex values of sugested colors · dfbe8fa9
  Robert Schilling authored Aug 15, 2014
  
  dfbe8fa9
- Update org-ruby · 549d453d
  Robert Schilling authored Aug 13, 2014
  
  549d453d
- Update gemnasium-gitlab-service · b7cc0ad7
  Robert Schilling authored Aug 13, 2014
  
  b7cc0ad7
- Add dealing with newlines for editor to 5.1-to-6.0 · 53bed000
  Ben Bodenmiller authored Aug 04, 2014
```
backport of https://github.com/gitlabhq/gitlabhq/commit/2d681c0d1ed14bf23c041aa04fa3e77caceda9a1
```
  53bed000
- Merge branch 'fix_label_migration' into 'master' · 86491e65
  Jacob Vosmaer authored Aug 19, 2014
```
Fix label migration

Failure to create any labels at all caused this DB migration to run for over 40
minutes during a gitlab.com deploy this morning. This change specifies a color f
or each new label and strips invalid characters from the label name.

See merge request !1024
```
  86491e65
- Use the default color when migrating labels · dfc5bf6b
  Jacob Vosmaer authored Aug 19, 2014
  
  dfc5bf6b
- Remove invalid characters from the label name · e354e548
  Jacob Vosmaer authored Aug 19, 2014
  
  e354e548
- Test if the label is valid before creating link · 7e0a2b3b
  Jacob Vosmaer authored Aug 19, 2014
  
  7e0a2b3b
- Add 6.0-to-7.2.md guide ahead of 7.2 release · 0b3ebb64
  Jacob Vosmaer authored Aug 19, 2014
  
  0b3ebb64
- Show projects that are not private and are shared with the group. · dbeca1c6
  Marin Jankovski authored Aug 19, 2014
  
  dbeca1c6
- Add 7.1-to-7.2.md update guide · af6842a9
  Jacob Vosmaer authored Aug 19, 2014
  
  af6842a9
- add email feature to changelog · b33bf0a3
  Job van der Voort authored Aug 19, 2014
  
  b33bf0a3
18 Aug, 2014 7 commits
- Merge pull request #7438 from bbodenmiller/patch-5 · e5e3fcaf
  Jeroen van Baarsen authored Aug 18, 2014
```
Add dealing with newlines for editor to 5.1-to-6.0
```
  e5e3fcaf
- Merge pull request #7537 from Razer6/rake_tasks_style · e76b1ffd
  Jeroen van Baarsen authored Aug 18, 2014
```
Fix env variable style for documentation
```
  e76b1ffd
- Fix env varable style for documentation · c0f9abad
  Robert Schilling authored Aug 18, 2014
  
  c0f9abad
- Fix color toggle for labels in edit view · 8eff8bce
  Martin Bastien authored Aug 18, 2014
  
  8eff8bce
- Merge pull request #7534 from sue445/feature/add_webhook_doc · 1db77dc1
  Jacob Vosmaer authored Aug 18, 2014
```
Add missing elements to webhook doc
```
  1db77dc1
- Merge pull request #7524 from Razer6/repo_settings_spelling_error · a2ee7467
  Jacob Vosmaer authored Aug 18, 2014
```
Fix minor spelling error in repo settings page
```
  a2ee7467
- Add missing elements to webhook doc · 911e47a9
  sue445 authored Aug 19, 2014
  
  911e47a9