Commits · 35d3c6df50a34f421cc12c4ae48d73df62bff20a · Kazuhiko Shiozaki / gitlab-ce

12 Aug, 2015 15 commits
- Merge branch '7-13-5-stable-candidate' into '7-13-stable' · 35d3c6df
  Valery Sizov authored Aug 12, 2015
```
7-13-5-stable candidate



See merge request !1145
```
  35d3c6df
- update changelog · f4f6d60c
  Valery Sizov authored Aug 12, 2015
  
  f4f6d60c
- Fix file api tests · f181bc6e
  Dmitriy Zaporozhets authored Aug 11, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f181bc6e
- Revert "Fix editing files via API" · 18db872b
  Dmitriy Zaporozhets authored Aug 11, 2015
```
This reverts commit 7bde6ae5.
```
  18db872b
- Revert "Merge branch 'web-editor-rugged' into 'master'" · d4bf7848
  Dmitriy Zaporozhets authored Aug 11, 2015
```
This reverts commit 5a1aa49b, reversing
changes made to a675bea2.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d4bf7848
- Revert "Create and edit files in web editor via rugged" · b1958385
  Dmitriy Zaporozhets authored Aug 11, 2015
```
This reverts commit 734a4ba8.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b1958385
- Revert "Fix adding new file to empty repo" · aeec708f
  Dmitriy Zaporozhets authored Aug 11, 2015
```
This reverts commit 27a15850.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  aeec708f
- Revert "Use rugged in web editor for base64 encoding" · 3ffd6388
  Dmitriy Zaporozhets authored Aug 11, 2015
```
This reverts commit 54113319.
```
  3ffd6388
- Revert "Create activity event and execute hooks on web editor commit" · f22f7a6f
  Dmitriy Zaporozhets authored Aug 11, 2015
```
This reverts commit 3d416f16.
```
  f22f7a6f
- Revert "Make web editor work correctly after switch from satellites" · fac581b1
  Dmitriy Zaporozhets authored Aug 11, 2015
```
This reverts commit 435f680b.
```
  fac581b1
- Revert "Refactor web editor" · 60b3d2b7
  Dmitriy Zaporozhets authored Aug 11, 2015
```
This reverts commit dfccb06d.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  60b3d2b7
- Remove changelog items · 8e134f20
  Dmitriy Zaporozhets authored Aug 11, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8e134f20
- Fix conflict issue · 52d10d73
  Dmitriy Zaporozhets authored Aug 11, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  52d10d73
- Revert "Merge branches inside one repository using rugged instead of satellites" · 2258572b
  Dmitriy Zaporozhets authored Aug 11, 2015
```
This reverts commit d24c40ec.
```
  2258572b
- Revert "Merge branch 'refactor-can-be-merge' into 'master'" · 9a1ad8de
  Dmitriy Zaporozhets authored Aug 11, 2015
```
This reverts commit 459e6d34, reversing
changes made to 804168e1.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  9a1ad8de
07 Aug, 2015 9 commits
- Version 7.13.4 · 7c3e8bcd
  Valery Sizov authored Aug 07, 2015
  
  7c3e8bcd
- Merge branch 'update_7-13-stable' into '7-13-stable' · 8e067b6a
  Valery Sizov authored Aug 07, 2015
```
Update 7-13-stable with 7.13.4



See merge request !1113
```
  8e067b6a
- update changelog · ec19c6a9
  Valery Sizov authored Aug 07, 2015
  
  ec19c6a9
- Remove trailing lines · 6ffca630
  Dmitriy Zaporozhets authored Aug 06, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  6ffca630
- Add tests for abuse report feature · 864e2bb0
  Dmitriy Zaporozhets authored Aug 06, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  864e2bb0
- Improve wording in abuse report form · 92a0c329
  Dmitriy Zaporozhets authored Aug 06, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  92a0c329
- Remove selectbox from abuse form. Added pagination in admin area · 8b7a2690
  Dmitriy Zaporozhets authored Aug 06, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8b7a2690
- Add abuse report management in admin area · 3dc13281
  Dmitriy Zaporozhets authored Aug 06, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3dc13281
- Allow users to send abuse reports · 0a9c65c9
  Dmitriy Zaporozhets authored Aug 06, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  0a9c65c9
04 Aug, 2015 4 commits
- Version 7.13.3 · 55011aac
  Valery Sizov authored Aug 04, 2015
  
  55011aac
- Merge branch 'update_stable' into '7-13-stable' · 666e4437
  Valery Sizov authored Aug 04, 2015
```
Update stable 7.13.3



See merge request !1088
```
  666e4437
- update changelog · 1fb04bcd
  Valery Sizov authored Aug 04, 2015
  
  1fb04bcd
- Fix bug causing Bitbucket importer to crash when OAuth application had been removed. · c84350ab
  Douwe Maan authored Jul 28, 2015
  
  c84350ab
28 Jul, 2015 12 commits
- Version 7.13.2 · ce6fd30d
  Valery Sizov authored Jul 28, 2015
  
  ce6fd30d
- Merge branch 'update_stable-7-13' into '7-13-stable' · 78568b56
  Valery Sizov authored Jul 28, 2015
```
Update stable for 7.13.2



See merge request !1056
```
  78568b56
- update changelog · ab213276
  Valery Sizov authored Jul 28, 2015
  
  ab213276
- Render Note field hints consistently for "new" and "edit" forms · abefd20f
  Robert Speicher authored Jul 26, 2015
```
- The "Edit" form didn't have Markdown hints.
- The "New" form had a paperclip icon for attachments, the "edit" form
  didn't.

Closes #2010

Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2525
```
  abefd20f
- Remove docs and rake task for gmail actions to prevent problems with registration. · 0fc5c802
  Marin Jankovski authored Jul 22, 2015
  
  0fc5c802
- Use mdash to prevent breaking html emails. · 6e5209ba
  Marin Jankovski authored Jul 22, 2015
  
  6e5209ba
- Add rake task 'gitlab:update_commit_count' · 4a3f3c93
  Daniel Gerhardt authored Jul 24, 2015
```
Starting with migration `20150717130904` commit count is stored in the
database. For existing projects it defaults to `0` and is updated to the
correct value when commits are pushed.

The newly introduced rake task updates the commit count for all projects
which have not been updated yet.

Refs !986, !989, #2040.
```
  4a3f3c93
- Show the first tab automatically on MergeRequests#new · bf0a5cf3
  Robert Speicher authored Jul 18, 2015
```
Closes #2013
```
  bf0a5cf3
- Dynamically check `:admin_*` ability in IssuableBaseService · 42c36231
  Robert Speicher authored Jul 24, 2015
```
Closes #2092
```
  42c36231
- Dynamically check `:admin_*` ability on issuable form · 81c861cf
  Robert Speicher authored Jul 24, 2015
```
Closes #2092
```
  81c861cf
- Add Issuable#to_ability_name · 9079f4dd
  Robert Speicher authored Jul 24, 2015
  
  9079f4dd
- Fix Error 500 when browsing projects with no HEAD · 1dac44bf
  Stan Hu authored Jul 23, 2015
```
Steps to reproduce:
1. Create a project with a README
2. In the actual remote, type: `git symbolic-ref HEAD refs/heads/nowhere`
3. Check that HEAD is gone via `git ls-remote .`
4. Go to the projects page and see the Error 500

Closes https://github.com/gitlabhq/gitlabhq/issues/9484
```
  1dac44bf