Commits · 7e6c3717e471d18fef39af73838aa11dad556036 · nexedi / gitlab-ce

20 Aug, 2014 1 commit
- add documentation for emailing from within GitLab · 7e6c3717
  Job van der Voort authored Aug 20, 2014
  
  7e6c3717
19 Aug, 2014 1 commit
- add email feature to changelog · b33bf0a3
  Job van der Voort authored Aug 19, 2014
  
  b33bf0a3
18 Aug, 2014 4 commits
- Merge tag 'v7.2.0.rc1' · 7567614d
  Jacob Vosmaer authored Aug 18, 2014
```
Bump version to 7.2.0.rc1

Conflicts:
	VERSION
```
  7567614d
- Bump version to 7.2.0.rc1 · 4142754c
  Jacob Vosmaer authored Aug 18, 2014
  
  4142754c
- Merge branch 'merge_ce_27cf081e' into 'master' · 48a943e9
  Jacob Vosmaer authored Aug 18, 2014
```
Merge CE 27cf081e

See merge request !145
```
  48a943e9
- Use the "fix" branch in the MR template spec · d6646e9e
  Jacob Vosmaer authored Aug 15, 2014
  
  d6646e9e
15 Aug, 2014 21 commits
- Merge pull request #7509 from cirosantilli/fix-md-style-api · 54c20837
  Jeroen van Baarsen authored Aug 15, 2014
```
Fix Md style for API.
```
  54c20837
- Merge pull request #7508 from cirosantilli/md-style-projects · f05cec53
  Jeroen van Baarsen authored Aug 15, 2014
```
Fix Md style for projects API doc.
```
  f05cec53
- Merge pull request #7510 from jbrooksuk/patch-1 · 0965b188
  Jeroen van Baarsen authored Aug 15, 2014
```
Fix grammar and spelling
```
  0965b188
- Merge pull request #7511 from jbrooksuk/api-docs · 6fffc207
  Jeroen van Baarsen authored Aug 15, 2014
```
Consistency, spelling and grammar
```
  6fffc207
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee · 7763f3b0
  Dmitriy Zaporozhets authored Aug 15, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG-EE
```
  7763f3b0
- Merge branch 'redmine-fix' · 86f6f5a9
  Dmitriy Zaporozhets authored Aug 15, 2014
  
  86f6f5a9
- add tests to redmine integration improvement · 0d9f8494
  Job van der Voort authored Aug 15, 2014
  
  0d9f8494
- Consistency, spelling and grammar · 3f36f84c
  James Brooks authored Aug 15, 2014
  
  3f36f84c
- Fix grammar and spelling · f85dec28
  James Brooks authored Aug 15, 2014
  
  f85dec28
- Merge branch 'label-permissions' into 'master' · cb33279a
  Dmitriy Zaporozhets authored Aug 15, 2014
```
Label permissions

* Update label permission docs
* Add authorisation to labels via API

See merge request !1020
```
  cb33279a
- Merge branch 'git_max_size' into 'master' · a8d1cbbe
  Dmitriy Zaporozhets authored Aug 15, 2014
```
Use new git max_size in the settings initializer

This allows us to avoid repeating default max_size setting in the omnibus-gitlab repository.

See merge request !1021
```
  a8d1cbbe
- Use new git max_size in the settings initializer · ec381a93
  Jacob Vosmaer authored Aug 15, 2014
  
  ec381a93
- Add labels api authorization. Update permission doc · 6063a1e6
  Dmitriy Zaporozhets authored Aug 15, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  6063a1e6
- Fix Md style for projects API doc. · a1d09978
  Ciro Santilli authored Aug 15, 2014
  
  a1d09978
- Merge commit '27cf081e' into merge_ce_27cf081e · ee8836a9
  Jacob Vosmaer authored Aug 15, 2014
```
Conflicts:
	VERSION
	app/models/user.rb
	app/services/merge_requests/build_service.rb
	config/gitlab.yml.example
	db/schema.rb
	doc/integration/README.md
	features/project/merge_requests.feature
	features/steps/project/merge_requests.rb
```
  ee8836a9
- Merge pull request #7479 from Razer6/feature/labels_api · 27cf081e
  Dmitriy Zaporozhets authored Aug 15, 2014
```
Implement complete labels API (create/delete/update)
```
  27cf081e
- Merge pull request #7499 from skv-headless/fix-commit-msg · 014eff5d
  Dmitriy Zaporozhets authored Aug 15, 2014
```
Fix commit msg
```
  014eff5d
- Change default label color · 0602c5d0
  Dmitriy Zaporozhets authored Aug 15, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  0602c5d0
- Merge pull request #7465 from Razer6/better_label_color_validation · 433dac77
  Dmitriy Zaporozhets authored Aug 15, 2014
```
Better label color validation, fixes #7454
```
  433dac77
- Fix Md style for API. · 2ada4ef0
  Ciro Santilli authored Aug 15, 2014
  
  2ada4ef0
- Merge pull request #7281 from skv-headless/diff-unfold · 7120af72
  Dmitriy Zaporozhets authored Aug 15, 2014
```
unfold commits
```
  7120af72
14 Aug, 2014 5 commits
- Mention username option for developers in gitlab.yml · 45da59da
  Dmitriy Zaporozhets authored Aug 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  45da59da
- diff unfold · 4e408001
  skv authored Aug 02, 2014
  
  4e408001
- gfm and preserve commit message · fe465004
  skv authored Aug 14, 2014
```
for commits#show
```
  fe465004
- whitespaceses at beginning of commit messages · 3d7b79e4
  skv authored Aug 14, 2014
  
  3d7b79e4
- Do label validation for issues/merge requests API · cbc90565
  Robert Schilling authored Aug 14, 2014
  
  cbc90565
13 Aug, 2014 8 commits
- Merge branch 'jira_service_logging' into 'master' · 3d469188
  Dmitriy Zaporozhets authored Aug 13, 2014
```
Improve logging for the JIRA issue closing service

See merge request !144
```
  3d469188
- Merge branch 'remove-remove-label' into 'master' · fdd8e450
  Dmitriy Zaporozhets authored Aug 13, 2014
```
Remove labels via ajax

See merge request !1019
```
  fdd8e450
- Fix repository archive · 1d63464c
  Dmitriy Zaporozhets authored Aug 13, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1d63464c
- Remove labels with ajax request · 540596b7
  Dmitriy Zaporozhets authored Aug 13, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  540596b7
- Make default sing-in logo smaller · d8b769ec
  Dmitriy Zaporozhets authored Aug 13, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d8b769ec
- Improve logging for the JIRA issue closing service · fa04782a
  Jacob Vosmaer authored Aug 13, 2014
  
  fa04782a
- Merge pull request #7494 from Razer6/add_7_1_1_changelog · 2653ca6e
  Jeroen van Baarsen authored Aug 13, 2014
```
Add 7.1.1 patch release changelog
```
  2653ca6e
- Add patch release changelog · ea177b33
  Dmitriy Zaporozhets authored Jul 29, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
```
  ea177b33