home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-09 12:46:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,867 Commits 48 Branches 340 Tags
ce_upstream
Commit Graph
215 Commits
Author SHA1 Message Date
Valery Sizov 7b327b68e3 Merge remote-tracking branch 'origin/master' into ce_upstream 2015-12-01 19:54:45 +02:00
Douwe Maan 7458f97408 Mention repository mirroring for new projects in docs. 2015-11-30 13:50:28 +01:00
Eirik Lygre b982827812 Add reference to Microsoft's Git Credential Manager for Windows. 2015-11-24 20:55:18 +00:00
Valery Sizov 18c7336892 Merge remote-tracking branch 'origin/master' into ce_upstream 2015-11-24 18:06:46 +02:00
Dmitriy Zaporozhets f84fb81970 Merge branch 'required_version_and_docs_update' into 'master' 
Update required version of lfs client and separate the docs for users and admins.



See merge request !1855
 2015-11-23 14:47:35 +00:00
Dmitriy Zaporozhets 7ac112d8e8 Add few fixes to documentation based on comments from review 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-23 15:18:59 +01:00
Robert Speicher 85d76e665a Merge remote-tracking branch 'ce/8-2-stable' into 8-2-stable-ee 2015-11-21 13:17:11 -05:00
Robert Speicher d241253fff Add award_emoji.png doc image 
[ci skip]
 2015-11-21 13:16:39 -05:00
Robert Speicher c502695fdb Add award_emoji.png doc image 
[ci skip]
 2015-11-21 13:15:51 -05:00
Robert Speicher 115bbd8a00 Merge remote-tracking branch 'ce/8-2-stable' into 8-2-stable-ee 2015-11-21 12:19:45 -05:00
Robert SpeicherandRobert Speicher ae36d23497 Merge branch 'award-emoji-doc' into 'master' 
Use award emoticons in GitLab workflow

Remove the old voting slides and use the emoji bar.

[ci skip]

See merge request !1863
 2015-11-21 11:09:19 -05:00
Robert Schilling c113e23489 Use award emoticons in GitLab workflow [ci skip] 2015-11-21 16:50:37 +01:00
Marin Jankovski 899807f604 Update required version of lfs client and separate the docs for users and admins. 2015-11-20 16:10:08 +01:00
Dmitriy Zaporozhets 1f4dc0b14c Merge branch '8-2-stable' of gitlab.com:gitlab-org/gitlab-ce into 8-2-stable-ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-20 14:05:09 +01:00
Robert SchillingandDmitriy Zaporozhets 5ac2c3f0aa Update LFS docs for cloning [ci skip] 2015-11-20 11:23:05 +01:00
Robert Schilling 91a76957e3 Update LFS docs for cloning [ci skip] 2015-11-19 17:05:30 +01:00
Robert Speicher ed2a8ba600 Merge 8-2-stable into 8-2-stable-ee 
Conflicts remaining:

- app/controllers/groups/group_members_controller.rb
- app/controllers/projects/project_members_controller.rb
- app/models/ability.rb
- app/models/member.rb
- app/models/project.rb
 2015-11-19 10:33:18 -05:00
Job van der VoortandRobert Speicher 506e0be36b Merge branch 'lfs-client-doc' into 'master' 
Add link to git-lfs client  [ci skip]



See merge request !1832
 2015-11-19 09:57:04 -05:00
Job van der VoortandRobert Speicher 32771f06f1 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-19 09:48:38 -05:00
Robert Schilling d70da301f6 Add link to git-lfs client [ci skip] 2015-11-19 14:13:17 +01:00
Douwe MaanandRobert Speicher 834e440f70 Merge branch 'mirror-repository' into 'master' 
Add option to mirror an upstream repository.

Closes internal https://dev.gitlab.org/gitlab/gitlab-ee/issues/279

Depends on gitlab-org/gitlab-shell!29

To do:

- [x] Decide on what user should be the author of the activity feed events. The initial project creator perhaps? That makes sense for personal projects, but less so for group projects, where it's even possible that the creator has since left the team.
- [x] Write specs!
- [x] Write documentation
- [x] Port back relevant commits to CE: gitlab-org/gitlab-ce!1822

----

## Mirror status on project homepage

![Screen_Shot_2015-11-12_at_12.48.15](/uploads/39666b0e4a14723407b0f66e2aaddb46/Screen_Shot_2015-11-12_at_12.48.15.png)


## Settings navigation item

![Screen_Shot_2015-11-10_at_17.32.27](/uploads/116ece85f65681bbd3c7c5e282ab3b3c/Screen_Shot_2015-11-10_at_17.32.27.png)

## Mirroring settings

![Screen_Shot_2015-11-17_at_11.17.17](/uploads/ff57c89831524435ec6a063c3c470203/Screen_Shot_2015-11-17_at_11.17.17.png)


## Activity feed with new "pushes" (mirror updates)
![activity_feed](/uploads/04754251f2142fd06b1fddc2aae45232/activity_feed.png)

I have yet to decide on what user should be the author of these events. The initial project creator perhaps? That makes sense for personal projects, but less so for group projects, where it's even possible that the creator has since left the team.

## Warning that branch has diverged from upstream
![diverged](/uploads/ecf7ae6c5709f626c750695f45ca521a/diverged.png)

## Commits heading after failed update
![commits_failure](/uploads/d1b3e1f6796431c839ee9e2f67499283/commits_failure.png)

Link send user to the mirroring settings if they are a project admin.

## Mirroring settings after failed update

![Screen_Shot_2015-11-12_at_12.43.09](/uploads/ece68d5021c9a4c374bf6d973cf9fafa/Screen_Shot_2015-11-12_at_12.43.09.png)

## New project page
![new_project](/uploads/296beb6c7faf390a9b7e1facc9c1d4d6/new_project.png)

## Import form after failed import
(Screenshot outdated)

![new_import_failure](/uploads/ac0ebfc8ec23232603126fe0a6e10171/new_import_failure.png)

Shown when the initial import of a project fails, not when an update of an existing project fails.

cc @dzaporozhets @sytses @JobV

See merge request !51
 2015-11-18 16:50:49 -05: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
Marin Jankovski d27e400cb9 LFS doc, first draft 2015-11-17 12:39:06 +01:00
Achilleas Pipinellis 03cb8edb34 Merge branch 'http-to-https' into 'master' 
Rewrite HTTP links to force TLS, where possible

I got annoyed at the fact that the links on the profile page don't force the use of TLS, so I grepped through the entire source tree, tested all the links I found, and replaced them if possible.

See merge request !1806
 2015-11-17 06:24:36 +00:00
Alex Jordan 3300db70ff Rewrite HTTP links to force TLS, where possible 2015-11-16 16:50:05 -08:00
Dmitriy Zaporozhets b093f50986 Some code and doc improvements 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 19:55:58 +01:00
Dmitriy Zaporozhets 78d542fcd8 Add milestones documentation to workflow 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 15:56:50 +01:00
Valery Sizov 7d7691cd09 Merge remote-tracking branch 'origin/master' into ce-to-ee 2015-11-16 13:37:13 +02:00
Dmitriy Zaporozhets a43a218c98 Merge branch 'releases-feature' 2015-11-16 10:18:32 +01:00
Dmitriy Zaporozhets 743d66e4da Improve english text 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 10:11:16 +01:00
Robert Speicher 6afca45028 Merge remote-tracking branch 'ce/master' into ce-to-ee 2015-11-13 12:34:34 -05:00
Minsik Yoonand윤민식 3d0efa8e0a Add ignore white space option in merge request diff 
fix this issue(https://gitlab.com/gitlab-org/gitlab-ce/issues/1393).

Add ignore whitespace optoin to Commits Compare view
 2015-11-13 16:53:53 +09:00
Dmitriy Zaporozhets 2ac1193720 Add release notes documentation 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-12 15:22:59 +01:00
Sytse Sijbrandij 87ce149d93 Link blog post 2015-11-07 00:26:06 +00:00
Valery Sizov 93bcc9ca7f Merge remote-tracking branch 'origin/master' into ce_upsteram 2015-11-05 14:26:35 +02:00
Robert Schilling a1d0eca886 Gilab -> GitLab 2015-10-31 23:31:21 +01:00
Derek Robati b2663d1ca1 Added missing period. 2015-10-23 12:48:17 -04:00
Dmitriy Zaporozhets 1ba393de81 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 2015-09-16 10:26:10 +02:00
Jared Szechy e156f42079 FogBugz project import 2015-09-08 20:23:01 -04:00
Dmitriy Zaporozhets b6e061244b Add documentation for ff-merge and rebase 2015-09-07 10:31:32 +02:00
Achilleas Pipinellis e334ec0683 Ordering of GitHub issues import is now fixed 
See https://gitlab.com/gitlab-org/gitlab-ce/commit/4a203aab57c69ea402939cf8fc423a0e5aaa1cab
 2015-08-31 08:24:50 +03:00
Dmitriy Zaporozhets 243bf65124 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-26 17:15:12 +02:00
Job van der Voort 7bcce28df6 Merge branch 'fix' into 'master' 
Fixed text about HTTP

Fixed for text to be more clear. Because of tweet https://twitter.com/mystygage/status/630798770012323840

See merge request !1921
 2015-08-26 11:16:13 +00:00
Dmitriy Zaporozhets 067673fbe7 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into master-ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-19 11:13:30 +02:00
karen Carias 10491b5438 deleted line 2015-08-17 14:42:34 -07:00
Dmitriy Zaporozhets 680b087764 Merge master from CE 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-17 14:01:32 +02:00
Dmitriy Zaporozhets 3e259ea8bc Revert "Merge branch 'revert-satellites' into 'master' " 
This reverts commit 5daf44b7c8, reversing
changes made to 2f706fbd23.
 2015-08-11 14:33:31 +02:00
Dmitriy Zaporozhets c0bf026ed8 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-08-11 14:29:43 +02:00
Dmitriy Zaporozhets 84727fba96 Revert "Merge branch 'improve-merge-requests' into 'master' " 
This reverts commit 4773f38e28, reversing
changes made to 0d5d80b735.
 2015-08-11 10:26:19 +02:00