Commits · d5be6d90bc53a6dfb11ece1f5f32e1746091199a · Kirill Smelkov / gitlab-ce

29 Aug, 2014 2 commits
- Merge branch 'visibility-fix' into 'master' · d5be6d90
  Dmitriy Zaporozhets authored Aug 29, 2014
```
Visibility fix

Fixes #1529

See merge request !1049
```
  d5be6d90
- Prevent 500 error when browse wiki page with repo access · 36361f4e
  Dmitriy Zaporozhets authored Aug 29, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  36361f4e
28 Aug, 2014 21 commits
- block visibility level restriction override in controller · 68fd66c6
  Job van der Voort authored Aug 28, 2014
  
  68fd66c6
- Merge branch 'fix-xss' into 'master' · d4180875
  Jacob Vosmaer authored Aug 28, 2014
```
Fix XSS issue

When view blob as RAW make sure we allow only 2 kind of type: 'text/plain' and 'application/octet-stream'

Fixes #1514

See merge request !1045
```
  d4180875
- Merge pull request #7378 from jojosch/nginx-ssl-redirect · 3069826d
  Dmitriy Zaporozhets authored Aug 28, 2014
```
Use a ? after the $request_uri to perform a valid Redirect while cloning...
```
  3069826d
- Merge pull request #7609 from cirosantilli/rm-haml-strings · ef4848a6
  Dmitriy Zaporozhets authored Aug 28, 2014
```
[refactor] Remove HAML eval for const strings.
```
  ef4848a6
- Merge pull request #7621 from dreis2211/overflow-my-projects-list · c8514bec
  Dmitriy Zaporozhets authored Aug 28, 2014
```
Fix overflow in 'my projects' list
```
  c8514bec
- Merge pull request #7601 from yglukhov/hide_pass · 1438285d
  Dmitriy Zaporozhets authored Aug 28, 2014
```
Mask password in import URL while importing.
```
  1438285d
- Merge pull request #7620 from zzet/patch-11 · 22a7fcab
  Dmitriy Zaporozhets authored Aug 28, 2014
```
Add search in textarea
```
  22a7fcab
- Fix fork button for project home page · da55f2d9
  Dmitriy Zaporozhets authored Aug 28, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  da55f2d9
- Merge branch 'project-home-redesign' into 'master' · 0d525381
  Dmitriy Zaporozhets authored Aug 28, 2014
```
Project home redesign

* more focus for description and stars/forks
* rename activity -> to project tab
* put activity under tab: prepare place for README tab

Fixes #1534.

See merge request !1047
```
  0d525381
- fix tests · 2dc4c65a
  Dmitriy Zaporozhets authored Aug 28, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  2dc4c65a
- Improve project sidebutton colors · 48f8c5a8
  Dmitriy Zaporozhets authored Aug 28, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  48f8c5a8
- Merge branch 'redis_settings' · c1d2640b
  Dmitriy Zaporozhets authored Aug 28, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
```
  c1d2640b
- Fix tests · d4a2ef52
  Dmitriy Zaporozhets authored Aug 28, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d4a2ef52
- Restyle project home · 82893089
  Dmitriy Zaporozhets authored Aug 28, 2014
```
* more focus for description and stars/forks
* rename activity -> to project tab
* put activity under tab: prepare place for README tab
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  82893089
- Merge branch 'improve-search-output' into 'master' · db881906
  Dmitriy Zaporozhets authored Aug 28, 2014
```
Improve search output

See merge request !1046
```
  db881906
- Fix overflow in 'my projects' list · 7b9a1819
  dreis authored Aug 28, 2014
  
  7b9a1819
- Add missing ext for searchbox · f9c7f414
  Andrew Kumanyaev authored Aug 28, 2014
  
  f9c7f414
- Improve search results output. Fixes some markup issues · 1056d91c
  Dmitriy Zaporozhets authored Aug 28, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1056d91c
- Prevent possible XSS issues by seting text/plain for all text files in · 6f154c07
  Dmitriy Zaporozhets authored Aug 28, 2014
```
RAW feature
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  6f154c07
- Add search in textarea · 0534d75a
  Andrew Kumanyaev authored Aug 28, 2014
```
https://github.com/ajaxorg/ace/blob/master/lib/ace/commands/default_commands.js#L176-L181
```
  0534d75a
- Merge pull request #7619 from BlueBayTravel/taggable-migration · c9bf3581
  Jacob Vosmaer authored Aug 28, 2014
```
Delete invalid taggings during label migration
```
  c9bf3581
27 Aug, 2014 17 commits
- Fixes #7571 · 63e25c2b
  James Brooks authored Aug 27, 2014
  
  63e25c2b
- nicer block for oauth signin links · c9054319
  Dmitriy Zaporozhets authored Aug 27, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c9054319
- Mask password in import URL while importing. · e9015dfb
  uran authored Aug 26, 2014
  
  e9015dfb
- Add CHANGELOG entries for Redis fixes · fc626641
  Jacob Vosmaer authored Aug 27, 2014
  
  fc626641
- More entries to CHANGELOG · e38081e5
  Dmitriy Zaporozhets authored Aug 27, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e38081e5
- Hide configuration shenanigans in a block · 0a52b70b
  Jacob Vosmaer authored Aug 27, 2014
```
I'm feeling paranoid about the scope variables like redis_config_file
get defined in. Hiding it in a block to limit the scope.
```
  0a52b70b
- Rename resque_url to redis_url_string · 6d785aba
  Jacob Vosmaer authored Aug 11, 2014
  
  6d785aba
- Merge pull request #7616 from yglukhov/fix-parallel-diff-on-new-mr · d4d723ca
  Dmitriy Zaporozhets authored Aug 27, 2014
```
Fixed parralel diff button on 'merge_requests/new' page
```
  d4d723ca
- Tell travis what directory cache explicitly · c4a8663b
  Dmitriy Zaporozhets authored Aug 27, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c4a8663b
- Enable bundler caching for travis · a5eb6915
  Dmitriy Zaporozhets authored Aug 27, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a5eb6915
- Merge branch 'improve-search-page' into 'master' · f12fdf16
  Dmitriy Zaporozhets authored Aug 27, 2014
```
Improve search page

Fixes #1270

* added pagination support
* filter results by type
* when switch between context - search params stays
* redesign comment search results
* search Issues and MR by description too

## Screenshots:

![Screenshot 2014-08-27 09.56.18](https://dev.gitlab.org/uploads/gitlab/gitlabhq/2053220cd4/Screenshot_2014-08-27_09.56.18.png)

![Screenshot 2014-08-27 09.56.00](https://dev.gitlab.org/uploads/gitlab/gitlabhq/726c764da4/Screenshot_2014-08-27_09.56.00.png)

See merge request !1043
```
  f12fdf16
- Merge pull request #7611 from yglukhov/sticky-diff-headers · 67d96b0f
  Dmitriy Zaporozhets authored Aug 27, 2014
```
Diff headers made sticky.
```
  67d96b0f
- Merge pull request #7614 from yglukhov/toggle-line-wrap · f089fd5f
  Dmitriy Zaporozhets authored Aug 27, 2014
```
Added a checkbox to toggle line wrapping in diff.
```
  f089fd5f
- Fixed parralel diff button on 'merge_requests/new' page · f44a68a0
  uran authored Aug 27, 2014
  
  f44a68a0
- Fix tests · c5c906fe
  Dmitriy Zaporozhets authored Aug 27, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c5c906fe
- Forgot to save file :) · 7f4b9937
  Dmitriy Zaporozhets authored Aug 27, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  7f4b9937
- Skip description if not exist · 043f2759
  Dmitriy Zaporozhets authored Aug 27, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  043f2759