home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-27 13:36:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
17,773 Commits 48 Branches 340 Tags
v7.13.5
Commit Graph
17773 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Valery Sizov 92af40205e Version 7.13.5 v7.13.5 2015-08-12 18:05:22 +03:00
Valery Sizov 35d3c6df50 Merge branch '7-13-5-stable-candidate' into '7-13-stable' 
7-13-5-stable candidate



See merge request !1145
 2015-08-12 13:44:16 +00:00
Valery Sizov f4f6d60ca8 update changelog 2015-08-12 14:17:26 +03:00
Dmitriy ZaporozhetsandValery Sizov f181bc6e1e Fix file api tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-12 13:53:16 +03:00
Dmitriy ZaporozhetsandValery Sizov 18db872bc5 Revert "Fix editing files via API" 
This reverts commit 7bde6ae540.
 2015-08-12 13:53:10 +03:00
Dmitriy ZaporozhetsandValery Sizov d4bf7848cb Revert "Merge branch 'web-editor-rugged' into 'master'" 
This reverts commit 5a1aa49b55, reversing
changes made to a675bea2c1.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-12 13:53:01 +03:00
Dmitriy ZaporozhetsandValery Sizov b1958385cd Revert "Create and edit files in web editor via rugged" 
This reverts commit 734a4ba87d.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-12 13:51:48 +03:00
Dmitriy ZaporozhetsandValery Sizov aeec708f53 Revert "Fix adding new file to empty repo" 
This reverts commit 27a158506e.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-12 13:51:07 +03:00
Dmitriy ZaporozhetsandValery Sizov 3ffd63888d Revert "Use rugged in web editor for base64 encoding" 
This reverts commit 541133197b.
 2015-08-12 13:50:28 +03:00
Dmitriy ZaporozhetsandValery Sizov f22f7a6f51 Revert "Create activity event and execute hooks on web editor commit" 
This reverts commit 3d416f1682.
 2015-08-12 13:50:20 +03:00
Dmitriy ZaporozhetsandValery Sizov fac581b170 Revert "Make web editor work correctly after switch from satellites" 
This reverts commit 435f680b89.
 2015-08-12 13:50:11 +03:00
Dmitriy ZaporozhetsandValery Sizov 60b3d2b704 Revert "Refactor web editor" 
This reverts commit dfccb06dda.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-12 13:49:51 +03:00
Dmitriy ZaporozhetsandValery Sizov 8e134f20cc Remove changelog items 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-12 13:49:03 +03:00
Dmitriy ZaporozhetsandValery Sizov 52d10d73ea Fix conflict issue 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-12 13:48:56 +03:00
Dmitriy ZaporozhetsandValery Sizov 2258572b80 Revert "Merge branches inside one repository using rugged instead of satellites" 
This reverts commit d24c40ec21.
 2015-08-12 13:48:47 +03:00
Dmitriy ZaporozhetsandValery Sizov 9a1ad8deec Revert "Merge branch 'refactor-can-be-merge' into 'master'" 
This reverts commit 459e6d3467, reversing
changes made to 804168e1de.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-12 13:48:16 +03:00
Valery Sizov 7c3e8bcd5e Version 7.13.4 v7.13.4 2015-08-07 11:12:04 +03:00
Valery Sizov 8e067b6ab4 Merge branch 'update_7-13-stable' into '7-13-stable' 
Update 7-13-stable with 7.13.4



See merge request !1113
 2015-08-07 07:33:30 +00:00
Valery Sizov ec19c6a9e7 update changelog 2015-08-07 10:15:14 +03:00
Dmitriy ZaporozhetsandValery Sizov 6ffca63004 Remove trailing lines 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-07 10:10:41 +03:00
Dmitriy ZaporozhetsandValery Sizov 864e2bb082 Add tests for abuse report feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-07 10:10:33 +03:00
Dmitriy ZaporozhetsandValery Sizov 92a0c329f6 Improve wording in abuse report form 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-07 10:10:26 +03:00
Dmitriy ZaporozhetsandValery Sizov 8b7a269008 Remove selectbox from abuse form. Added pagination in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-07 10:10:19 +03:00
Dmitriy ZaporozhetsandValery Sizov 3dc13281ee Add abuse report management in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-07 10:10:11 +03:00
Dmitriy ZaporozhetsandValery Sizov 0a9c65c9a0 Allow users to send abuse reports 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-07 10:10:03 +03:00
Valery Sizov 55011aac47 Version 7.13.3 v7.13.3 2015-08-04 14:45:24 +03:00
Valery Sizov 666e4437bb Merge branch 'update_stable' into '7-13-stable' 
Update stable 7.13.3



See merge request !1088
 2015-08-04 10:43:26 +00:00
Valery Sizov 1fb04bcd74 update changelog 2015-08-04 13:25:44 +03:00
Douwe MaanandValery Sizov c84350ab68 Fix bug causing Bitbucket importer to crash when OAuth application had been removed. 2015-08-04 13:19:58 +03:00
Valery Sizov ce6fd30dbf Version 7.13.2 v7.13.2 2015-07-28 15:32:17 +03:00
Valery Sizov 78568b5611 Merge branch 'update_stable-7-13' into '7-13-stable' 
Update stable for 7.13.2



See merge request !1056
 2015-07-28 12:00:38 +00:00
Valery Sizov ab21327628 update changelog 2015-07-28 14:57:54 +03:00
Robert SpeicherandValery Sizov abefd20fa1 Render Note field hints consistently for "new" and "edit" forms 
- 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
 2015-07-28 14:42:14 +03:00
Marin JankovskiandValery Sizov 0fc5c80207 Remove docs and rake task for gmail actions to prevent problems with registration. 2015-07-28 14:41:53 +03:00
Marin JankovskiandValery Sizov 6e5209baca Use mdash to prevent breaking html emails. 2015-07-28 14:41:43 +03:00
Daniel GerhardtandValery Sizov 4a3f3c938a Add rake task 'gitlab:update_commit_count' 
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.
 2015-07-28 14:41:14 +03:00
Robert SpeicherandValery Sizov bf0a5cf358 Show the first tab automatically on MergeRequests#new 
Closes #2013
 2015-07-28 14:40:45 +03:00
Robert SpeicherandValery Sizov 42c362313e Dynamically check :admin_* ability in IssuableBaseService 
Closes #2092
 2015-07-28 14:39:54 +03:00
Robert SpeicherandValery Sizov 81c861cf11 Dynamically check :admin_* ability on issuable form 
Closes #2092
 2015-07-28 14:39:45 +03:00
Robert SpeicherandValery Sizov 9079f4dd72 Add Issuable#to_ability_name 2015-07-28 14:39:38 +03:00
Stan HuandValery Sizov 1dac44bf85 Fix Error 500 when browsing projects with no HEAD 
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
 2015-07-28 14:39:15 +03:00
Robert SpeicherandValery Sizov 7cf651eb27 Add "Manage merge requests" permission to docs 2015-07-28 14:38:41 +03:00
Robert SpeicherandValery Sizov 997c991ae6 Add admin_merge_request ability to Developer level and up 
This was necessary because this permission is checked dynamically by
`app/views/shared/issuable/_context` when on a Merge Request.

Closes #2058
 2015-07-28 14:38:34 +03:00
Robert SpeicherandValery Sizov 064a0774b7 Create project services on Project creation 2015-07-28 14:37:59 +03:00
Robert SpeicherandValery Sizov 67c4586406 Only create :admin user in the one test where it's used 2015-07-28 14:37:49 +03:00
Valery Sizov 6cb800a087 Merge branch 'test_stabilize_stable' into '7-13-stable' 
Fix randomly failed spec

https://gitlab.com/gitlab-org/gitlab-ce/issues/2069

See merge request !1035
 2015-07-23 14:46:22 +00:00
Valery Sizov 6150bf32d7 fix randomly failed spec 2015-07-23 16:55:39 +03:00
Valery Sizov 0687441b91 Version 7.13.1 v7.13.1 2015-07-23 16:38:04 +03:00
Valery Sizov ad2bd1939e Merge branch 'update-7-13-stable' into '7-13-stable' 
Update 7-13-stable (7.13.1)



See merge request !1033
 2015-07-23 11:32:51 +00:00
Valery Sizov 494c672e61 update changelog 2015-07-23 14:29:57 +03:00