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

02 7月, 2013 6 次提交
- D
  Merge branch 'master' into 6-0-dev · ee890f2b
  由 Dmitriy Zaporozhets 提交于 7月 02, 2013
```
Conflicts:
	app/views/dashboard/projects.html.haml
	app/views/layouts/_head_panel.html.haml
	config/routes.rb
```
  ee890f2b
- D
  
  Merge branch 'warning_relative_url' of /home/git/repositories/gitlab/gitlabhq · 7588186e
  由 Dmitriy Zaporozhets 提交于 7月 02, 2013
  
  7588186e
- D
  
  Fix header avatar · 66e10f05
  由 Dmitriy Zaporozhets 提交于 7月 02, 2013
  
  66e10f05
- D
  Merge pull request #4440 from jackbot/editable-notes · 47f78a2c
  由 Dmitriy Zaporozhets 提交于 7月 02, 2013
```
Editable notes
```
  47f78a2c
- J
  
  Warn that relative URL's are unsupported · 9e86f3b1
  由 Jacob Vosmaer 提交于 7月 02, 2013
  
  9e86f3b1
- D
  
  Fix error when reassign issue/merge_request from non-assigned. Fixes #3201 · f49fb5dc
  由 Dmitriy Zaporozhets 提交于 7月 01, 2013
  
  f49fb5dc
01 7月, 2013 14 次提交
- D
  
  Merge branch 'feature/shortcuts' of /home/git/repositories/gitlab/gitlabhq into 6-0-dev · ef9298fe
  由 Dmitriy Zaporozhets 提交于 7月 01, 2013
  
  ef9298fe
- J
  
  Add editable notes feature · 6fa06893
  由 Jack Weeden 提交于 6月 25, 2013
  
  6fa06893
- J
  
  Changed 'javascript:;' links to '#' · af81ff4e
  由 Jack Weeden 提交于 6月 30, 2013
  
  af81ff4e
- J
  
  Removed before_filter as authentication is done within update method · 22c00e64
  由 Jack Weeden 提交于 6月 26, 2013
  
  22c00e64
- J
  
  Authorize user on note update · 1216a62e
  由 Jack Weeden 提交于 6月 26, 2013
  
  1216a62e
- J
  
  Ability to edit comments · 20b2a0b2
  由 Jack Weeden 提交于 6月 26, 2013
  
  20b2a0b2
- J
  
  Prevent 'toplevel constant SnippetsController referenced by Project::SnippetsController' warning · b62c9e59
  由 Jack Weeden 提交于 6月 26, 2013
  
  b62c9e59
- J
  
  Added update and delete_attachment actions to note controller · 6a84d926
  由 Jack Weeden 提交于 6月 25, 2013
  
  6a84d926
- J
  
  Merge remote-tracking branch 'upstream/master' · 5ffc90d9
  由 Jack Weeden 提交于 7月 01, 2013
  
  5ffc90d9
- D
  
  Show shotcut dialog on ? · 6e550af1
  由 Dmitriy Zaporozhets 提交于 6月 30, 2013
  
  6e550af1
- D
  Merge pull request #4415 from jackbot/master · 315d4cc8
  由 Dmitriy Zaporozhets 提交于 6月 30, 2013
```
Couple of UI additions
```
  315d4cc8
- D
  Merge pull request #4442 from 1ed/projects-helper-fix · 9b181dc6
  由 Dmitriy Zaporozhets 提交于 6月 30, 2013
```
fixed nav bar for empty repos (fixes #4375)
```
  9b181dc6
- D
  
  Remove capistrano files since its very problematic to deploy gitlab with it · 0f84833c
  由 Dmitriy Zaporozhets 提交于 6月 30, 2013
  
  0f84833c
- D
  
  Update gitlab_git version · a54f2d51
  由 Dmitriy Zaporozhets 提交于 6月 30, 2013
  
  a54f2d51
30 6月, 2013 3 次提交
- D
  Merge branch 'master' into 6-0-dev · f438bd41
  由 Dmitriy Zaporozhets 提交于 6月 30, 2013
```
Conflicts:
	app/controllers/admin/teams/projects_controller.rb
	app/views/team_members/_team_member.html.haml
	app/views/teams/members/_member.html.haml
```
  f438bd41
- D
  Merge pull request #4460 from tstone2077/feature_help_markdown · d9c02f30
  由 Dmitriy Zaporozhets 提交于 6月 30, 2013
```
Adding detailed documentation of the markdown syntax.
```
  d9c02f30
- D
  
  Fixed db/schema.rb · c7da44d6
  由 Dmitriy Zaporozhets 提交于 6月 30, 2013
  
  c7da44d6
29 6月, 2013 12 次提交
- A
  
  Doc: set permission on config.database.yml · 2b4bebd9
  由 Ariejan de Vroom 提交于 6月 29, 2013
  
  2b4bebd9
- A
  Merge branch 'bbodenmiller-master' · b8ce5447
  由 Ariejan de Vroom 提交于 6月 29, 2013
```
Closes #4331
```
  b8ce5447
- A
  
  Tweak wording and phrasing · ab36cdec
  由 Ariejan de Vroom 提交于 6月 29, 2013
  
  ab36cdec
- A
  
  Merge branch 'master' of git://github.com/bbodenmiller/gitlabhq into bbodenmiller-master · 729c7432
  由 Ariejan de Vroom 提交于 6月 29, 2013
  
  729c7432
- A
  Merge branch 'muskox-master' · 7fb90472
  由 Ariejan de Vroom 提交于 6月 29, 2013
```
Closes #4424
```
  7fb90472
- S
  
  fixed typo in assgned · 2000f013
  由 Scott Pustay 提交于 6月 25, 2013
  
  2000f013
- D
  
  Classic theme: Dark color for header links. White color for loading spinner · 0904cc48
  由 Dmitriy Zaporozhets 提交于 6月 29, 2013
  
  0904cc48
- T
  Adding detailed documentation of the markdown syntax. · 2a601d26
  由 Thurston Stone 提交于 6月 27, 2013
```
This includes standard markdown as well as GitLab extended markdown as well as references to documents used.
```
  2a601d26
- D
  
  Reduce the size of main nav · 28d517f5
  由 Dmitriy Zaporozhets 提交于 6月 29, 2013
  
  28d517f5
- D
  Merge pull request #4323 from axilleas/update_docs · 7ae72e65
  由 Dmitriy Zaporozhets 提交于 6月 28, 2013
```
Create uploads dir otherwise backup fails. Fix #4304
```
  7ae72e65
- D
  
  Use triangle for current tab highlight · 3e4de1de
  由 Dmitriy Zaporozhets 提交于 6月 28, 2013
  
  3e4de1de
- D
  
  better align for main-nav · f15e8a0c
  由 Dmitriy Zaporozhets 提交于 6月 28, 2013
  
  f15e8a0c
27 6月, 2013 5 次提交
- G
  
  fixed nav bar for empty repos (fixes #4375) · 45ecbb03
  由 Gábor Egyed 提交于 6月 23, 2013
  
  45ecbb03
- D
  
  Fixed showing files, commits tabs for empty project · b143976b
  由 Dmitriy Zaporozhets 提交于 6月 26, 2013
  
  b143976b
- D
  
  Test user page with spinach · 49fcbdbd
  由 Dmitriy Zaporozhets 提交于 6月 26, 2013
  
  49fcbdbd
- D
  
  Add scenario for expired password · 6c0fd9f2
  由 Dmitriy Zaporozhets 提交于 6月 26, 2013
  
  6c0fd9f2
- D
  
  Add profile notification spinach · 318b50a0
  由 Dmitriy Zaporozhets 提交于 6月 26, 2013
  
  318b50a0