Commits · 228386d15da884a7c8663193942a23352f35afcd · Kirill Smelkov / gitlab-ce · GitLab

14 Jun, 2014 9 commits
- Merge branch 'cleanup-help' into 'master' · 228386d1
  Dmitriy Zaporozhets authored Jun 14, 2014
```
Cleanup help

Remove a lot of unused help files.
Apply `wiki` css to help content
```
  228386d1
- Remove garbage and apply wiki style · 6a7990c0
  Dmitriy Zaporozhets authored Jun 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  6a7990c0
- Merge branch 'ui-ux-improvements' into 'master' · 68e4df70
  Dmitriy Zaporozhets authored Jun 14, 2014
```
UI/UX improvements
```
  68e4df70
- Improve MR message for huge diffs · 054d68a3
  Dmitriy Zaporozhets authored Jun 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  054d68a3
- Merge remote-tracking branch 'origin/issue_closing_widget' · 49506fc7
  Dmitriy Zaporozhets authored Jun 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
```
  49506fc7
- Merge branch 'ce_issues_sentence' into 'master' · 55d4e264
  Dmitriy Zaporozhets authored Jun 14, 2014
```
Issues sentence helper

This will make merging CE into EE later easier.
```
  55d4e264
- Merge branch 'more-secure-api' into 'master' · 87fd342a
  Dmitriy Zaporozhets authored Jun 14, 2014
```
More secure api

Dont expose user email via API. Fixes #1314
```
  87fd342a
- Refactor snippets views · 9be5425a
  Dmitriy Zaporozhets authored Jun 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  9be5425a
- Fix snippet dev fixtures · 600f4c68
  Dmitriy Zaporozhets authored Jun 14, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  600f4c68
13 Jun, 2014 22 commits
- Improve files/snippets action buttons · eb784568
  Dmitriy Zaporozhets authored Jun 13, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  eb784568
- Add /api/users test for admin role. Updated CHANGELOG · 47d6f705
  Dmitriy Zaporozhets authored Jun 13, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  47d6f705
- Fix api specs · 8ff171f6
  Dmitriy Zaporozhets authored Jun 13, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8ff171f6
- Fix helper specs · e8f222e3
  Dmitriy Zaporozhets authored Jun 13, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e8f222e3
- Add a test for issue sentence generation · d6985358
  Jacob Vosmaer authored Jun 13, 2014
  
  d6985358
- Small UI fixes · 2af8ace1
  Dmitriy Zaporozhets authored Jun 13, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  2af8ace1
- Detect closing issues in Merge Request description · 3f1ece26
  Jacob Vosmaer authored Jun 13, 2014
  
  3f1ece26
- Merge branch 'git-2-docs' into 'master' · 342b7b62
  Dmitriy Zaporozhets authored Jun 13, 2014
```
Git 2 docs

Related to #1318
```
  342b7b62
- Fix gravatar size and update docs for new users API · a7345e36
  Dmitriy Zaporozhets authored Jun 13, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a7345e36
- Dont expose user email via API · ae564c97
  Dmitriy Zaporozhets authored Jun 13, 2014
```
To prevent leaking of users info we reduce amount of user information
retrieved via API for normal users.

What user can get via API:

* if not admin: only id, state, name, username and avatar_url
* if admin: all user information
* about himself: all informaion
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ae564c97
- Move gravatar url compose to separate service · d5b0f29c
  Dmitriy Zaporozhets authored Jun 13, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d5b0f29c
- Merge branch 'fix-new-mr-502' into 'master' · 5fdcaadf
  Dmitriy Zaporozhets authored Jun 13, 2014
```
Fix 502 error on new merge request page

When diff is huge we try to render it that cause 502 error often.
After this patch we apply soft limits to diffs. So if diff is huge - we doing show it

Fixes #1323
```
  5fdcaadf
- Small ui fix · 273093a9
  Dmitriy Zaporozhets authored Jun 13, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  273093a9
- Merge branch 'remove-wall' · 15c27192
  Dmitriy Zaporozhets authored Jun 13, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
```
  15c27192
- Exclude info rows from milestone sorting items · d3d0775a
  Dmitriy Zaporozhets authored Jun 13, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d3d0775a
- Recommend setup git 2.0 for installation docs · 76e25640
  Dmitriy Zaporozhets authored Jun 13, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  76e25640
- Apply soft diff limits to MergeRequest#new page · 59e18195
  Dmitriy Zaporozhets authored Jun 13, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  59e18195
- Merge branch 'check_ldap_filter' into 'master' · 04e8b518
  Dmitriy Zaporozhets authored Jun 13, 2014
```
Check LDAP user filter during sign-in
```
  04e8b518
- Delete wall notes tests · d593c98f
  Dmitriy Zaporozhets authored Jun 13, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d593c98f
- Wipe wall notes feature · 1355ede4
  Dmitriy Zaporozhets authored Jun 13, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1355ede4
- Check LDAP user filter during sign-in · 8761dd2a
  Jacob Vosmaer authored Jun 12, 2014
  
  8761dd2a
- Merge branch 'autolink-in-project-description' into 'master' · a5cbb4cb
  Dmitriy Zaporozhets authored Jun 13, 2014
```
Autolink in project/group description

Group:

![Screenshot 2014-06-12 22.58.07](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/b5a95eff8a/Screenshot_2014-06-12_22.58.07.png)

Project:

![Screenshot 2014-06-12 22.58.36](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/51e516fb41/Screenshot_2014-06-12_22.58.36.png)

- - -

Fixes http://feedback.gitlab.com/forums/176466-general/suggestions/4110570-group-description-should-support-markdown
```
  a5cbb4cb
12 Jun, 2014 9 commits
- Add autolink to project/group description render · afe47e26
  Dmitriy Zaporozhets authored Jun 12, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  afe47e26
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 92ccc687
  Dmitriy Zaporozhets authored Jun 12, 2014
  
  92ccc687
- Prevent timeout for Commits#stats page for huge repos · 6c6cdd23
  Dmitriy Zaporozhets authored Jun 12, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  6c6cdd23
- Merge pull request #7123 from skv-headless/fix_double_check_all_issues · 5d9feb60
  Dmitriy Zaporozhets authored Jun 12, 2014
```
fix double check for all issues
```
  5d9feb60
- Restyle git tags page · 1bde9277
  Dmitriy Zaporozhets authored Jun 12, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1bde9277
- Show proper message for new MR when satellite fails · 98416ec9
  Dmitriy Zaporozhets authored Jun 12, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  98416ec9
- Remove unnecessary padding · c827af21
  Dmitriy Zaporozhets authored Jun 12, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c827af21
- fix double check for all issues · 1f3a69c1
  skv-headless authored Jun 12, 2014
  
  1f3a69c1
- Fix blob highlight tests · 11728851
  Dmitriy Zaporozhets authored Jun 12, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  11728851