home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 19:46:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
20,567 Commits 48 Branches 340 Tags
9b724baa7f03e02ca847d80eff4df529e63e79de
Commit Graph
20567 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Ferdinand Rosario 9b724baa7f Updated rails patch 2015-11-19 15:17:12 +05:30
Dmitriy Zaporozhets 61867abeec Merge branch 'fix-diff-stats-ui' into 'master' 
Fix huge line height for diff files list

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !1826
 2015-11-18 15:02:42 +00:00
Douwe Maan c7fde6a0d8 Merge branch 'ce-mirror-backport' into 'master' 
Backport relevant changes from gitlab-org/gitlab-ee!51

To do:

- [x] Update gitlab-shell

See merge request !1822
 2015-11-18 14:56:29 +00:00
Dmitriy Zaporozhets e6c6c2234b Fix huge line height for diff files list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-18 15:15:47 +01:00
Dmitriy Zaporozhets a5a5745231 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-11-18 14:01:55 +01:00
Douwe Maan fe8bb1f196 Merge pull request #9838 from evindor/master 
Fix github importer to handle empty issues
 2015-11-18 12:14:55 +01:00
Douwe Maan 7763e61ae5 Use gitlab-shell 2.6.7 2015-11-18 12:09:33 +01:00
Arseny Zarechnev e809669383 Fix github importer to handle empty issues 2015-11-18 11:02:25 +00:00
Douwe Maan 8937c5ff7a Load raw repository lazily to recover from failed read 2015-11-18 12:02:09 +01:00
Douwe Maan d0ec28827d Fix specs 2015-11-18 12:02:09 +01:00
Douwe Maan 5e8ddd3c2d Remove unused variable in repository import 2015-11-18 12:02:09 +01:00
Douwe Maan 5036d8d5d5 Fix styling of import error. 2015-11-18 12:02:09 +01:00
Douwe Maan 91fdbdcde7 Add tooltips to home panel buttons. 2015-11-18 12:02:09 +01:00
Douwe Maan b1f4d14f7d Clean up Repository cache code. 2015-11-18 12:02:08 +01:00
Douwe Maan 153085a93b Add Repository#is_ancestor? convenience method. 2015-11-18 12:02:08 +01:00
Douwe Maan a0519818cb Tweak code formatting. 2015-11-18 12:02:05 +01:00
Douwe Maan 7b405d3064 Fix redirect after import fails. 2015-11-18 12:00:57 +01:00
Douwe Maan 01d2b1943f Move import form to partial. 2015-11-18 12:00:56 +01:00
Douwe Maan 40470975e8 Add Project#safe_import_url helper. 2015-11-18 12:00:56 +01:00
Douwe Maan 841a7c6897 Store and show reason why import failed. 2015-11-18 12:00:56 +01:00
Douwe Maan 531177757e Add import_error to project. 2015-11-18 12:00:48 +01:00
Job van der Voort 21a59b23fe Merge branch 'add_lfs_doc' into 'master' 
Documentation for Git LFS

Doc explaining how to use Git LFS, how to use Git LFS with GitLab, known issues and troubleshooting tips.

See merge request !1813
 2015-11-18 10:03:27 +00:00
Job van der Voort 60e4565142 missing . 2015-11-18 10:03:08 +00:00
Marin Jankovski 6c62f182c6 Updates to the lfs doc. 2015-11-18 10:32:29 +01:00
Sytse Sijbrandij 3b1f68e4b9 Merge branch 'issue-labels' into 'master' 
More labels since we get more specializations.

/cc @creamzy @ernstvn @dzaporozhets 

See merge request !1821
 2015-11-17 22:45:17 +00:00
Sytse Sijbrandij 1e74a12c2f Example workflow. 2015-11-17 14:43:51 -08:00
Sytse Sijbrandij 3d762c2e92 More labels since we get more specializations. 2015-11-17 12:19:04 -08:00
Robert Speicher df6bb57921 Merge branch 'compare-first-commit' into 'master' 
Correctly set comparison first commit when range includes a merge commit

Fixes #3207.

See merge request !1814
 2015-11-17 18:51:40 +00:00
Robert Speicher 632f60cc76 Fix CHANGELOG 
[ci skip]
 2015-11-17 13:48:45 -05:00
Robert Speicher 354f244059 Merge branch 'contributor-graph-by-email' into 'master' 
See merge request !1705
 2015-11-17 13:48:28 -05:00
Robert Speicher b1abe90aeb Merge branch 'adamliesko/gitlab-ce-notification-upon-unassignment' into 'master' 
Add notification to the former assignee upon unassignment

Replaces !1769

Fixes #3395

See merge request !1818
 2015-11-17 18:28:09 +00:00
Robert Speicher d431f3ec40 Merge branch 'james11/gitlab-ce-removable-group-owner' into 'master' 
Prevent the last owner of a group from being able to delete themselves
by 'adding' themselves as a master

Replaces !1708.

Fixes #1111.

See merge request !1815
 2015-11-17 18:23:27 +00:00
Dmitriy Zaporozhets 5098ad9d3c Merge branch 'remove-code-duplication' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-17 19:17:15 +01:00
Robert Speicher 6f6c75cb85 Bump VERSION 
[ci skip]
 2015-11-17 11:59:22 -05:00
Robert Speicher b7b49dab92 Merge branch 'param-view' into 'master' 
See merge request !1816
 2015-11-17 11:43:47 -05:00
Douwe Maan f008b2d2df Remove extra space 2015-11-17 17:19:31 +01:00
Robert Speicher 85102d094f Update CHANGELOG 
[ci skip]
 2015-11-17 11:03:02 -05:00
Robert Speicher 4597f8ef20 Update monthly release template 
[ci skip]
 2015-11-17 11:03:02 -05:00
Robert Speicher 475a5b5ab7 Merge pull request #9833 from huacnlee/fix/pr-9820-missings 
Don't render note edit forms for visitors
 2015-11-17 10:58:17 -05:00
Douwe Maan 931c56f822 Add tests for merge request update. 2015-11-17 16:53:15 +01:00
Douwe Maan 0fbf47a219 Add credits to changelog 2015-11-17 16:51:49 +01:00
Douwe Maan 80a2eb5d50 Fix spec 2015-11-17 16:51:39 +01:00
Douwe Maan 8c308e3df6 Don't fail when there was no previous assignee 2015-11-17 16:51:35 +01:00
Douwe Maan 1ca550823b Merge branch 'master' into adamliesko/gitlab-ce-notification-upon-unassignment 2015-11-17 16:41:42 +01:00
Douwe Maan e49190cad9 Don't use params[:view] directly. 2015-11-17 16:33:38 +01:00
Jason Lee 3ae1dee475 Avoid render edit_form when visitor can't edit them. 
Reverted #9820, github/task_list need a form, textarea for update.
 2015-11-17 23:21:03 +08:00
Robert Speicher df0110ba81 Merge branch 'rs-revert-gh-9820' into 'master' 
Revert "Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list"

This reverts commit 63144cd062, reversing
changes made to 8ab5df9d87.

Reverts https://github.com/gitlabhq/gitlabhq/pull/9820

See merge request !1804
 2015-11-17 15:09:22 +00:00
Douwe Maan d60a23b718 Add changelog item 2015-11-17 15:53:53 +01:00
Douwe Maan e3fe3da63d Use project member abilities more extensively 2015-11-17 15:51:40 +01:00
Douwe Maan ecb83afabc Refactor ability changes 2015-11-17 15:49:37 +01:00