Commits · 593b6674e1b3fb1d5277b823703b9bbc366152b2 · Kazuhiko Shiozaki / gitlab-ce

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 6 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
- Merge branch 'test_regex_with_rubular' into 'master' · 3c420ae1
  Sytse Sijbrandij authored Jul 27, 2014
```
Add a tip on how to test regular expressions

See merge request !994
```
  3c420ae1
- Merge branch 'add-merge-moments-to-process' into 'master' · 7da74468
  Sytse Sijbrandij authored Jul 27, 2014
```
Add merge moments to process

Fixes #1450

See merge request !986
```
  7da74468
- Add missing semicolon in application.scss · 2f78d75c
  Achilleas Pipinellis authored Jul 27, 2014
  
  2f78d75c
26 Jul, 2014 3 commits
- Merge pull request #7319 from jvanbaarsen/small-eventcache-refactoring · cb0d63b9
  Dmitriy Zaporozhets authored Jul 26, 2014
```
Moved some behaviour to one place
```
  cb0d63b9
- Merge branch 'most-starred' into 'master' · 8734a9cd
  Dmitriy Zaporozhets authored Jul 26, 2014
```
Most starred projects page

Fixes #1461

See merge request !996
```
  8734a9cd
- Tests for trending/starred pages · d3ea5387
  Dmitriy Zaporozhets authored Jul 26, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d3ea5387
25 Jul, 2014 10 commits
- Moved some behaviour to one place · 16eea492
  Jeroen van Baarsen authored Jul 16, 2014
```
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
```
  16eea492
- Most starred projects page for Explore area · 974b5a7b
  Dmitriy Zaporozhets authored Jul 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  974b5a7b
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · 76af5a1d
  Dmitriy Zaporozhets authored Jul 25, 2014
  
  76af5a1d
- Add a tip on how to test regular expressions · e03ab14f
  Jacob Vosmaer authored Jul 25, 2014
  
  e03ab14f
- Merge branch 'exim-problems' into 'master' · 5a89b610
  Dmitriy Zaporozhets authored Jul 25, 2014
```
Exim problems

After merge report back to https://github.com/gitlabhq/gitlabhq/issues/4866

See merge request !990
```
  5a89b610
- Merge branch 'project-services-explained' into 'master' · 42632de3
  Dmitriy Zaporozhets authored Jul 25, 2014
```
Project services explained

See merge request !993
```
  42632de3
- Explain project services. · 83b40ba2
  Sytse Sijbrandij authored Jul 25, 2014
  
  83b40ba2
- Merge branch 'backup-settings-warning' into 'master' · e0cdb8a3
  Jacob Vosmaer authored Jul 25, 2014
```
Backup settings warning

Fixes #1457

See merge request !992
```
  e0cdb8a3
- Add warning about backing up the config. · ead2dc0c
  Sytse Sijbrandij authored Jul 25, 2014
  
  ead2dc0c
- Merge branch 'word-requirement-a-bit-more-realistic' into 'master' · 1a2a1931
  Sytse Sijbrandij authored Jul 25, 2014
```
Word requirement a bit more realistic

See commit message

See merge request !155
```
  1a2a1931
24 Jul, 2014 8 commits
- Merge branch 'improve-star-ui' into 'master' · 414afd68
  Dmitriy Zaporozhets authored Jul 24, 2014
```
Improve star ui

* move star button to sidebar (where other buttons are)
* it fixes overflow issue for screens smaller then 1200px
* it fixes wrong vertical align for star button at old position
* add forks count too - so it looks similar with stars

Fixes #1460

See merge request !991
```
  414afd68
- Fix star tests · 2d25faf2
  Dmitriy Zaporozhets authored Jul 24, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  2d25faf2
- Move star button to sidebar. Add counter to forks too · 420ba211
  Dmitriy Zaporozhets authored Jul 24, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  420ba211
- Note exim problems. · 14d3f304
  Sytse Sijbrandij authored Jul 24, 2014
  
  14d3f304
- Mention Explore page in CHANGELOG · bb80741c
  Dmitriy Zaporozhets authored Jul 24, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  bb80741c
- Fix test · c23e1f3d
  Dmitriy Zaporozhets authored Jul 24, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c23e1f3d
- Merge branch 'cirosantilli-star' · 1fd43e1f
  Dmitriy Zaporozhets authored Jul 24, 2014
  
  1fd43e1f
- Merge branch 'star' of https://github.com/cirosantilli/gitlabhq into cirosantilli-star · e21ca9f8
  Dmitriy Zaporozhets authored Jul 24, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
```
  e21ca9f8