提交 · d43d7ffd6f41fa51f8314f2bcabd7ee9d19ecb9b · 李少辉-开发者 / gitlab-foss

21 8月, 2015 4 次提交

Merge branch 'hide-recent-push' into 'master' · d43d7ffd

由 Dmitriy Zaporozhets 提交于 8月 21, 2015

Only show recent push event if the branch still exists or a recent merge request has not been created

Closes #2277

See merge request !1167

d43d7ffd

Merge branch 'comment-case-insensetive-search' into 'master' · 59525d6b

由 Dmitriy Zaporozhets 提交于 8月 21, 2015

Case-insensitive search for comments
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !1174

59525d6b

Merge branch 'issue-2306-repo-size-display' into 'master' · 677bf661

由 Dmitriy Zaporozhets 提交于 8月 21, 2015

Add size information back to project summary screen.

![gitlab-with-size](https://gitlab.com/nneul/gitlab-ce/uploads/84d15169aa7ee4e966465a71ca383f24/gitlab-with-size.png)

See merge request !1178

677bf661

Merge branch 'fix-blame-lines-grouping' into 'master' · 2de0935e

由 Douwe Maan 提交于 8月 20, 2015

Fix blame view line groupings

Before:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b84f75183244e58683b9172c772591d6/image.png)

After:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/12ef635deefd3616142e65f064252020/image.png)

Closes #2305

See merge request !1176

2de0935e

20 8月, 2015 17 次提交
- N
  
  Add size information back to project summary screen. · 3930ec44
  由 Nathan Neulinger 提交于 8月 20, 2015
  
  3930ec44
- D
  
  Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · 8819007c
  由 Dmitriy Zaporozhets 提交于 8月 20, 2015
  
  8819007c
- D
  Merge branch 'top-menu-improvements' into 'master' · 90071a08
  由 Dmitriy Zaporozhets 提交于 8月 20, 2015
```
Navigation improvements

- [x] make explore area as part of dashboard
- [x] move navigation links from top right corner to sidebar
- [x] group navigation items on dashboard
- [x] cleanup UI after such changes
- [ ] fix tests

cc @sytses @JobV

See merge request !1177
```
  90071a08
- D
  Merge pull request #9563 from Telekom-PD/feature/control-import-options · eb057209
  由 Dmitriy Zaporozhets 提交于 8月 20, 2015
```
Feature/control import options
```
  eb057209
- D
  Cleanup groups pages UI a bit · 6a91e32a
  由 Dmitriy Zaporozhets 提交于 8月 20, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  6a91e32a
- D
  Small ui improvements to snippet page · 8129e2f3
  由 Dmitriy Zaporozhets 提交于 8月 20, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8129e2f3
- D
  Cleanup snippets index pages · 0d8ad2dd
  由 Dmitriy Zaporozhets 提交于 8月 20, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  0d8ad2dd
- D
  Fix test · e06e9623
  由 Dmitriy Zaporozhets 提交于 8月 20, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e06e9623
- A
  
  Import sources: changelog · bdae9bbe
  由 Artem Sidorenko 提交于 8月 20, 2015
  
  bdae9bbe
- A
  
  Import sources: show only enabled sources · e238a8da
  由 Artem Sidorenko 提交于 8月 14, 2015
  
  e238a8da
- D
  Rebuild navigation for dashboard · f82c1425
  由 Dmitriy Zaporozhets 提交于 8月 20, 2015
```
* projects from explore page are available from dashboard
* use dashboard sidebar for both logged in and not users
* move explroe projects under projects tab
* move explore groups under groups tab
* move public snippets under snippets tab
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f82c1425
- A
  
  Import sources: settings in the admin interface · 55dca86b
  由 Artem Sidorenko 提交于 8月 12, 2015
  
  55dca86b
- D
  Refactor sidebar navigation for dashboard · b1c1a3d3
  由 Dmitriy Zaporozhets 提交于 8月 20, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b1c1a3d3
- S
  Only show recent push event if the branch still exists or a recent merge... · 98eb89be
  由 Stan Hu 提交于 8月 16, 2015
```
Only show recent push event if the branch still exists or a recent merge request has not been created

Closes #2277
```
  98eb89be
- S
  Fix blame view line groupings · 0a5b005d
  由 Stan Hu 提交于 8月 20, 2015
```
Closes #2305
```
  0a5b005d
- S
  Merge branch '2fa-message-improvement' into 'master' · 55fc58bd
  由 Sytse Sijbrandij 提交于 8月 19, 2015
```
Improved 2FA warning message about lost codes

Fixes internal issue: https://dev.gitlab.org/gitlab/gitlabhq/issues/2472

The warning message now clearly states that access will be lost of the 2FA recovery codes are not saved.

/cc @sytses @JobV

See merge request !1175
```
  55fc58bd
- P
  
  Improved 2FA warning message about lost codes · 475bb00b
  由 Patricio Cano 提交于 8月 19, 2015
  
  475bb00b
19 8月, 2015 17 次提交
- D
  Merge pull request #9551 from Telekom-PD/feature/search-for-archived-projects · 4df4097e
  由 Douwe Maan 提交于 8月 19, 2015
```
Feature/search for archived projects
```
  4df4097e
- D
  Case-insensetive search for comments · b7e6ae03
  由 Dmitriy Zaporozhets 提交于 8月 19, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b7e6ae03
- A
  
  Spinach tests · 07190227
  由 Artem Sidorenko 提交于 8月 18, 2015
  
  07190227
- A
  
  Show colored icons like in the admin listing · 15cdf551
  由 Artem Sidorenko 提交于 8月 10, 2015
  
  15cdf551
- A
  
  Show label on archived projects · 10d2281d
  由 Artem Sidorenko 提交于 8月 10, 2015
  
  10d2281d
- A
  Allow listing of archived projects · 3ebbed25
  由 Artem Sidorenko 提交于 8月 10, 2015
```
Resolves #9285
```
  3ebbed25
- J
  Merge branch 'security' into 'master' · 3659d3b5
  由 Job van der Voort 提交于 8月 19, 2015
```
Added note about backing up recovery codes

Several people have tried to recover their 2FA codes. I think we could be more clear about it in the docs.

This is why I added a section about it at the top, so they read it before enabling them.

https://twitter.com/deathgreps/status/632006221814464512
https://twitter.com/benniemosher/status/633768429313372160

See merge request !1923
```
  3659d3b5
- D
  Merge branch 'remove-satellites' · 72a425fa
  由 Dmitriy Zaporozhets 提交于 8月 19, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  72a425fa
- D
  
  Merge branch 'master' of github.com:gitlabhq/gitlabhq · a3e1d7cf
  由 Dmitriy Zaporozhets 提交于 8月 19, 2015
  
  a3e1d7cf
- S
  Merge pull request #9567 from bigsurge/bigsurge-patch-1 · e56fd693
  由 Stan Hu 提交于 8月 19, 2015
```
add CommitNote field expose :created_at
```
  e56fd693
- R
  
  Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · 51e64356
  由 Robert Schilling 提交于 8月 19, 2015
  
  51e64356
- R
  
  Time for 8.0.0.pre · 7f19d55c
  由 Robert Schilling 提交于 8月 19, 2015
  
  7f19d55c
- B
  add CommitNote field expose :created_at · cecc1861
  由 bigsurge 提交于 8月 19, 2015
```
add CommitNote field expose :created_at
```
  cecc1861
- S
  Merge branch 'wip-blog-post' into 'master' · a1bd164e
  由 Sytse Sijbrandij 提交于 8月 18, 2015
```
Make sure blog post MR has WIP keyword

cc @sytses @rspeicher

See merge request !1172
```
  a1bd164e
- K
  
  added note about backing up recovery codes · b04914ab
  由 karen Carias 提交于 8月 18, 2015
  
  b04914ab
- D
  Merge branch 'rs-help-path-traversal' into 'master' · 91fa82d1
  由 Douwe Maan 提交于 8月 18, 2015
```
Fix path traversal in HelpController

Closes #2543

See merge request !1922
```
  91fa82d1
- R
  
  Use File.join instead of Rails.root.join in HelpController · a42c548a
  由 Robert Speicher 提交于 8月 18, 2015
  
  a42c548a
18 8月, 2015 2 次提交
- R
  Merge branch 'fix-authhash-infinite-loop' into 'master' · 20491498
  由 Robert Speicher 提交于 8月 18, 2015
```
Fix infinite loop when SAML was incorrectly configured.

See merge request !1170
```
  20491498
- R
  Merge branch 'fix-rake-info' into 'master' · 04e1c4d3
  由 Robert Speicher 提交于 8月 18, 2015
```
Fix gitlab:env:info rake task.

Found doing QA.

See merge request !1169
```
  04e1c4d3