Commits · d15944694e1d4bc769e1fe1c7295fb03815730f4 · Kirill Smelkov / gitlab-ce

28 Aug, 2014 4 commits
- Update the CHANGELOG for 7.2.1 · d1594469
  Jacob Vosmaer authored Aug 28, 2014
  
  d1594469
- Merge branch 'stable-xss-fix' into '7-2-stable' · aad45011
  Jacob Vosmaer authored Aug 28, 2014
```
Stable xss fix

See merge request !1048
```
  aad45011
- Fixes #7571 · dc42aae3
  James Brooks authored Aug 27, 2014
  
  dc42aae3
- Prevent possible XSS issues by seting text/plain for all text files in · ac24a5a3
  Dmitriy Zaporozhets authored Aug 28, 2014
```
RAW feature
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ac24a5a3
26 Aug, 2014 1 commit
- Add pkg-config as required dependency for rugged · a044c4b1
  Robert Schilling authored Aug 26, 2014
  
  a044c4b1
23 Aug, 2014 2 commits
- clarify which configs should be updated · 935ed64b
  Ben Bodenmiller authored Aug 23, 2014
  
  935ed64b
- remove prerelease note from 6.0 to 7.2 guide · e4f6025d
  Ben Bodenmiller authored Aug 23, 2014
  
  e4f6025d
22 Aug, 2014 7 commits
- gitlab 7.2 requires gitlab shell 1.9.7 · ce6767c9
  Ben Bodenmiller authored Aug 22, 2014
  
  ce6767c9
- update upgrader documentation to mention dependencies · 01f82f12
  Job van der Voort authored Aug 22, 2014
  
  01f82f12
- We have 7.2 now 🤘 · 0fe5c5ec
  Robert Schilling authored Aug 22, 2014
  
  0fe5c5ec
- Bump VERSION to 7.2.0 · da5d33e1
  Jacob Vosmaer authored Aug 22, 2014
  
  da5d33e1
- Merge branch 'rack_attack/unsubscribes' into 'master' · abda2dab
  Jacob Vosmaer authored Aug 22, 2014
```
Protect unsubscribe path

See merge request !1033
```
  abda2dab
- Create one big regular expresion for Rack::Attack · b7060628
  Jacob Vosmaer authored Aug 22, 2014
  
  b7060628
- Change rack attack example. · 52e903e9
  Marin Jankovski authored Aug 21, 2014
  
  52e903e9
21 Aug, 2014 21 commits
- Merge branch 'backticks-cause-quote' into 'master' · e328668f
  Jacob Vosmaer authored Aug 21, 2014
```
Backticks cause quote

See merge request !704
```
  e328668f
- Remove backticks in markdown links that cause ugly code blocks in GitLab. · eea59597
  Sytse Sijbrandij authored Aug 21, 2014
  
  eea59597
- Merge branch 'doc/memory_recommendations' into 'master' · a83451a5
  Sytse Sijbrandij authored Aug 21, 2014
```
Swap is required on servers with 1GB RAM

See merge request !1032
```
  a83451a5
- Swap is required on servers with 1GB RAM · ecd946be
  Jacob Vosmaer authored Aug 21, 2014
  
  ecd946be
- Merge branch 'gitlab_shell_to_1.9.7' into 'master' · 2a532498
  Jacob Vosmaer authored Aug 21, 2014
```
Bump required gitlab-shell version to 1.9.7

See merge request !1031
```
  2a532498
- Bump required gitlab-shell version to 1.9.7 · bfaf3a79
  Jacob Vosmaer authored Aug 21, 2014
  
  bfaf3a79
- Merge branch 'doc/update/cmake' into 'master' · 85cf0633
  Marin Jankovski authored Aug 21, 2014
```
Add installing cmake to 7.2 update docs

See merge request !1029
```
  85cf0633
- Merge pull request #7562 from xvonabur/patch-1 · 5a6230b0
  Jacob Vosmaer authored Aug 21, 2014
```
Add dependency info for mysql-postgresql converter
```
  5a6230b0
- Merge pull request #7436 from bbodenmiller/patch-3 · 0d8a4e38
  Jacob Vosmaer authored Aug 21, 2014
```
upgrade ruby and gitlab shell config during 6.0->7.1 & 6.0->7.2 upgrades
```
  0d8a4e38
- Add installing cmake to 7.2 update docs · 274ca090
  Jacob Vosmaer authored Aug 21, 2014
  
  274ca090
- Merge branch 'explain_migration' into 'master' · 3ed8fbce
  Marin Jankovski authored Aug 21, 2014
```
Explain label migration

See merge request !1025
```
  3ed8fbce
- Merge branch 'update_changelog' into 'master' · df54f868
  Jacob Vosmaer authored Aug 21, 2014
```
Update changelog

Fixes #1509

See merge request !1026
```
  df54f868
- Merge pull request #7540 from sameersbn/docs-install-cmake · 6040e84b
  Jacob Vosmaer authored Aug 21, 2014
```
cmake is required during the installation of the rugged gem
```
  6040e84b
- Add dependency info for mysql-postgresql converter · 672daff5
  xvonabur authored Aug 21, 2014
```
Running converter with Python 2.6.x installed gives the following error:
AttributeError: 'module' object has no attribute 'check_output'

After installing Python 2.7.x everything works fine.
```
  672daff5
- Merge pull request #7555 from erikjwaxx/master · f2942ffe
  Jacob Vosmaer authored Aug 21, 2014
```
Fix spelling error in merge request performance issue warning.
```
  f2942ffe
- Make sure the test fails in year 2114. · 7f846015
  Marin Jankovski authored Aug 21, 2014
  
  7f846015
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · b1433228
  Jacob Vosmaer authored Aug 21, 2014
  
  b1433228
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · 5f7be640
  Jacob Vosmaer authored Aug 21, 2014
  
  5f7be640
- Merge pull request #7557 from Razer6/fix_tests · 846e2799
  Jacob Vosmaer authored Aug 21, 2014
```
Fix merge request API after #7526
```
  846e2799
- Merge branch 'fix_labels_edit' into 'master' · 44a210c0
  Jacob Vosmaer authored Aug 21, 2014
```
Fix labels preview color when edit

This is related to #515. Parentheses are missing in coffeescript. For this reason, the color preview is not updated when loading the labels edit page.

See merge request !173
```
  44a210c0
- update ruby & gitlab shell config · 0e14fb05
  Ben Bodenmiller authored Aug 20, 2014
```
ruby 2.0.x required for gitlab 7.0+
```
  0e14fb05
20 Aug, 2014 5 commits
- Fix tests after #7526 · 66f6ca07
  Robert Schilling authored Aug 20, 2014
  
  66f6ca07
- Fix spelling error in merge request performance issue warning. · 1ff781c3
  Erik Weatherwax authored Aug 20, 2014
  
  1ff781c3
- Call updateColorPreview in Labels constructor · 64102476
  Robert Schilling authored Aug 20, 2014
  
  64102476
- Merge branch 'label-doc' into 'master' · abf917d3
  Jacob Vosmaer authored Aug 20, 2014
```
Label doc

Fixes #1487

See merge request !1028
```
  abf917d3
- Bump version to 7.2.0.rc5 · 87efd92d
  Jacob Vosmaer authored Aug 20, 2014
  
  87efd92d