Commits · cc331684593143cba773b0160222865eeb86b134 · Forest Godfrey / gitlab-ce · GitLab

BigW Consortium Gitlab

30 Jul, 2014 6 commits
- 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 18 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
- 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
- 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
- Fix variable order on compare page · 54965576
  Dmitriy Zaporozhets authored Jul 29, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  54965576
- Use CompareService for compare page · 378a3f5c
  Dmitriy Zaporozhets authored Jul 29, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  378a3f5c
- Use CompareService in collecting diff when create MR · 098ee55e
  Dmitriy Zaporozhets authored Jul 29, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  098ee55e
- Refactor compare logic for MR. Use satellites only for forks for better performance · bf9ce1f4
  Dmitriy Zaporozhets authored Jul 29, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  bf9ce1f4
- Override Gitlab::Git::Compare limit · d30454e1
  Dmitriy Zaporozhets authored Jul 29, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d30454e1
- Merge branch 'satellite_compare_gitlab_git' into 'master' · 06154af0
  Dmitriy Zaporozhets authored Jul 29, 2014
```
Use Gitlab::Git::Compare in Satellite::CompareAction

See merge request !976
```
  06154af0
- Use same color for all selectbox in bulk issue update · 0768100a
  Dmitriy Zaporozhets authored Jul 29, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  0768100a
- Fix text align for bulk issues update · 8abf010d
  Dmitriy Zaporozhets authored Jul 29, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8abf010d
28 Jul, 2014 13 commits
- Merge branch 'federkasten/gitlab-ce-fix-high-cpu-in-ff' · 593b6674
  Dmitriy Zaporozhets authored Jul 28, 2014
  
  593b6674
- Merge branch 'fix-high-cpu-in-ff' of https://gitlab.com/federkasten/gitlab-ce… · b72ce57d
  Dmitriy Zaporozhets authored Jul 28, 2014
```
Merge branch 'fix-high-cpu-in-ff' of https://gitlab.com/federkasten/gitlab-ce into federkasten/gitlab-ce-fix-high-cpu-in-ff
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
```
  b72ce57d
- Merge pull request #7383 from Razer6/fix_test_hooks_empty_project · 67d5b95d
  Dmitriy Zaporozhets authored Jul 28, 2014
```
Do not execute hooks on empty projects, fixes #6108
```
  67d5b95d
- Merge pull request #7386 from Razer6/bump_version_number · 9f463c92
  Dmitriy Zaporozhets authored Jul 28, 2014
```
Bump version to 7.2.0.pre to avoid backup version mismatches, fixes #7375
```
  9f463c92
- Merge pull request #7387 from Razer6/add_markup_gems · e4c5bf50
  Dmitriy Zaporozhets authored Jul 28, 2014
```
Improve markup gems to prevent 500 errors
```
  e4c5bf50
- Merge branch 'fix-mr-500-error' into 'master' · f65e9677
  Dmitriy Zaporozhets authored Jul 28, 2014
```
Fix MergeRequest#new page

* fix 500 error when no parent for initial commit
* fix link from diff files to wrong commit
* fix new file being skipped from diff if it was added in next commit

Fixes #1462

See merge request !998
```
  f65e9677
- Merge branch 'log_sidekiq_payloads' into 'master' · 28151ba5
  Dmitriy Zaporozhets authored Jul 28, 2014
```
Log sidekiq arguments

See merge request !940
```
  28151ba5
- Improve MR building · ddaa493e
  Dmitriy Zaporozhets authored Jul 28, 2014
```
* fix 500 error when no parent for initial commit
* fix link from diff files to wrong commit
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ddaa493e
- Merge branch 'only_redirect_to_referer_from_public' into 'master' · 746b7e2d
  Dmitriy Zaporozhets authored Jul 28, 2014
```
Only redirect to referrer from public GitLab pages

See merge request !995
```
  746b7e2d
- Log Sidekiq arguments · 03ae6b89
  Jacob Vosmaer authored Jul 03, 2014
  
  03ae6b89
- Only redirect to referrer from public GitLab pages · 3a6f9c09
  Jacob Vosmaer authored Jul 25, 2014
  
  3a6f9c09
- Improve markup gems · ceabda74
  Robert Schilling authored Jul 28, 2014
  
  ceabda74
- 7.2 started · 2e55eac2
  Robert Schilling authored Jul 28, 2014
  
  2e55eac2
27 Jul, 2014 3 commits
- Do not execute hooks on empty projects, fixes #6108 · 062ff17b
  Robert Schilling authored Jul 27, 2014
  
  062ff17b
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · 00c67238
  Dmitriy Zaporozhets authored Jul 27, 2014
  
  00c67238
- Merge branch 'fix_typo_application_scss' into 'master' · c77315dc
  Dmitriy Zaporozhets authored Jul 27, 2014
```
Add missing semicolon in application.scss

Was toying to import some custom css and found out about this :)

See merge request !157
```
  c77315dc