Commits · 4a36d669b5cb9c4727e82e68dd3a573f5cb1f53f · Léo-Paul Géneau / gitlab-ce

01 Aug, 2014 2 commits

# This is a combination of 2 commits. · 4a36d669

mabdullah-cinglevue authored Apr 16, 2014

# The first commit's message is:

Patched `MergeRequest` to return more data.

Patched `MergeRequest` to return the `description` & `milestone`
Conflicts:
	lib/api/entities.rb

# This is the 2nd commit message:

Update merge_requests.md

Update documentation for merge request endpoint adding support for description.

4a36d669

Merge pull request #7410 from robbytaylor/patch-1 · ec18f0ba
Jeroen van Baarsen authored Aug 01, 2014
```
Text changes to projects API documentation
```
ec18f0ba

31 Jul, 2014 5 commits
- Merge pull request #7411 from robbytaylor/patch-3 · ae646eb1
  Jeroen van Baarsen authored Jul 31, 2014
```
Fixed typos in Development - Rake Tasks doc
```
  ae646eb1
- Fixed typos in Development - Rake Tasks doc · 38a692d2
  Rob Taylor authored Jul 31, 2014
  
  38a692d2
- Text changes to projects API documentation · 79d71461
  Rob Taylor authored Jul 31, 2014
```
Fixes some grammar / punctuation errors and inconsistencies.
```
  79d71461
- Add test for createing issue with labels · 833bc305
  Dmitriy Zaporozhets authored Jul 31, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  833bc305
- Project labels tests · 0f474887
  Dmitriy Zaporozhets authored Jul 31, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  0f474887
30 Jul, 2014 21 commits
- Style label-branch color · 3ed2fce2
  Dmitriy Zaporozhets authored Jul 30, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3ed2fce2
- Use label-branch css for MR branches info · dab9835a
  Dmitriy Zaporozhets authored Jul 30, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  dab9835a
- Fix label set during issue/mr creation · f0c26bcb
  Dmitriy Zaporozhets authored Jul 30, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f0c26bcb
- Fix issue error message layout · 9c5edce1
  Dmitriy Zaporozhets authored Jul 30, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  9c5edce1
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq · 6e69b4eb
  Dmitriy Zaporozhets authored Jul 30, 2014
  
  6e69b4eb
- Put some entries to CHANGELOG · e27a8224
  Dmitriy Zaporozhets authored Jul 30, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e27a8224
- Merge branch 'release/omnibus' into 'master' · 1e2e0fef
  Sytse Sijbrandij authored Jul 30, 2014
```
Add omnibus-gitlab to the monthly release process

See merge request !997
```
  1e2e0fef
- Correct no-labels message · ecbb3ddf
  Dmitriy Zaporozhets authored Jul 30, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ecbb3ddf
- Add cancel button to labels page form · 51d2910a
  Dmitriy Zaporozhets authored Jul 30, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  51d2910a
- Order labels by name · 2ecc7950
  Dmitriy Zaporozhets authored Jul 30, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  2ecc7950
- Add pagination to labels page · 91c1534e
  Dmitriy Zaporozhets authored Jul 30, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  91c1534e
- Merge branch 'epic/refactor-labels' into 'master' · 86f1f833
  Dmitriy Zaporozhets authored Jul 30, 2014
```
Epic/refactor labels

Part of #1385

See merge request !1003
```
  86f1f833
- Fix old api compatibility and tests · d9d8d3b7
  Dmitriy Zaporozhets authored Jul 30, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d9d8d3b7
- Fix tests · 70f868b7
  Dmitriy Zaporozhets authored Jul 30, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  70f868b7
- Improve labels · 593df8e6
  Dmitriy Zaporozhets authored Jul 30, 2014
```
* allow developers to manage labels
* add ability to remove label
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  593df8e6
- Add indicies to labels · cc331684
  Dmitriy Zaporozhets authored Jul 30, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  cc331684
- Label views: index, new, edit · 6ac26a3c
  Dmitriy Zaporozhets authored Jul 30, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  6ac26a3c
- More strict validation for label title · ecabefba
  Dmitriy Zaporozhets authored Jul 30, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ecabefba
- Prevent duplicates in issue finder when filter by label · 4c6859a2
  Dmitriy Zaporozhets authored Jul 30, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4c6859a2
- Add create/update to Labels controller · 048a2197
  Dmitriy Zaporozhets authored Jul 30, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  048a2197
- Fix issues label finder · 81aebaa1
  Dmitriy Zaporozhets authored Jul 30, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  81aebaa1
29 Jul, 2014 12 commits
- Fix 500 for labels page · 2c32edb3
  Dmitriy Zaporozhets authored Jul 29, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  2c32edb3
- Refactor label rendering and default label set generation · b2a6f4e1
  Dmitriy Zaporozhets authored Jul 29, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b2a6f4e1
- Allow set labels from Issue/MR forms · d79c0ea2
  Dmitriy Zaporozhets authored Jul 29, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d79c0ea2
- Migrate issue/mr labels from act_as_taggable to own labels · d45a6b29
  Dmitriy Zaporozhets authored Jul 29, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d45a6b29
- Replace project labels with tags to prevent name conflict with GitLab labels · 6fb9badc
  Dmitriy Zaporozhets authored Jul 29, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  6fb9badc
- Merge branch 'user-new-password' into 'master' · 4c8cbf88
  Dmitriy Zaporozhets authored Jul 29, 2014
```
Require current password even if password was expired

Fixes #1469

See merge request !1002
```
  4c8cbf88
- Label and LabelLink models for implementing own GitLab labels · 03654a6a
  Dmitriy Zaporozhets authored Jul 29, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  03654a6a
- Require current password even if password was expired · 014e6d0f
  Dmitriy Zaporozhets authored Jul 29, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  014e6d0f
- Merge branch 'impprove-compare-logic' into 'master' · 535feb08
  Dmitriy Zaporozhets authored Jul 29, 2014
```
Impprove compare logic

* Use single class CompareService for collecting commits and diffs at Compare, MR#new, MR#create pages
* Don't use satellites for compare inside one repo

See merge request !1001
```
  535feb08
- Fix email on push · f8445565
  Dmitriy Zaporozhets authored Jul 29, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f8445565
- Git::Compare does not have limit param any more · 2f780af2
  Dmitriy Zaporozhets authored Jul 29, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  2f780af2
- Update gitlab_git · 027fcc05
  Dmitriy Zaporozhets authored Jul 29, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  027fcc05