gitlab | 易学教程

Can changes be conflictless overwritten when using git merge with recursive strategy?

阅读更多关于 Can changes be conflictless overwritten when using git merge with recursive strategy?

问题 I am managing the source code of a project in my company with Git (GitLab) to be precise. Two developers work on the project, create a branch for every task then create a merge request. I mostly merge these directly via the UI which should be the same as doing this in the command line: git checkout master git merge --no-ff 1224-cool-feature-branch From time to time I have seen small features or parts of pages disappear. Consider the following case Dev A branches from master at ab12 -> new

gitlab can't deliver email normally

阅读更多关于 gitlab can't deliver email normally

问题 I have installed the gitlab-omnibus version in my centos.It seems that everything is OK.But when a newer want to sign up, he/she must recieve the comfirm enalbe which send from gitlab.I have config the /etc/gitlab/gitlab.rb according to the gitlab's office document. And I check my var/log/email ,I found the message is as follow: Apr 22 15:05:39 iZ23syflhhzZ postfix/cleanup[5899]: 9789EC3907: message-id=<201504220705.t3M75dkU005893@iZ23syflhhzZ> Apr 22 15:05:39 iZ23syflhhzZ sendmail[5893]:

22.13-22.17 搭建git服务器,安装gitlab,使用gitlab,gitlab备份与恢复

阅读更多关于 22.13-22.17 搭建git服务器,安装gitlab,使用gitlab,gitlab备份与恢复

【推荐】2019 Java 开发者跳槽指南.pdf(吐血整理) >>> 22.13-22.17 搭建git服务器,安装gitlab,使用gitlab,gitlab备份与恢复转载 weixin_34413357 发布于2018-09-05 16:31:52 阅读数 1 收藏展开 22.13 搭建git服务器 22.14 22.15 安装gitlab 22.16 使用gitlab 22.17 gitlab备份与恢复 22.13 搭建git服务器 github毕竟是公开的，而私有仓库又得花钱买。所以我们可以想办法搭建一个私有的，只自己公司使用的。Gitlab是个不错的选择。在介绍它之前，先讲述一下命令行的git服务器搭建准备工作 1 找一台服务器，首先要安装git， yum install -y git 2 添加git用户，并且设置shell为/usr/bin/git-shell,目的是为了不让git用户远程登陆 useradd -s /usr/bin/git-shell git cd /home/git 3 创建authorized_keys文件，并更改属主、属组和权限，用来存客户端机器上的公钥 mkdir .ssh touch .ssh/authorized_keys chown -R git.git .ssh chmod 600 .ssh/authorized_keys 4

Gitlab-CI 手动搭建、实战体验

阅读更多关于 Gitlab-CI 手动搭建、实战体验

【推荐】2019 Java 开发者跳槽指南.pdf(吐血整理) >>> 开源代码托管平台 Gitlab ，从10.0版本开始内置了 CI 功能，开始向 Jenkins看齐。那么看过了那么多 Gitlab 相关的文章，是时候动手体验它了。好，咱们从零开始、探其本质之旅…… 概述本篇文章介绍使用Docker快速搭建Gitlab环境，用于安全的学习它的功能。最大的特点是：快速搭建、最少资源。若在生产上使用，需要更多考虑可维护性、高可用、数据安全等因素。环境 # uname -a Linux 3.16.0-4-amd64 #1 SMP Debian 3.16.7-ckt11-1+deb8u3 (2015-08-04) x86_64 GNU/Linux # cat /etc/docker/daemon.json # 使用国内DaoCloud加速Docker镜像下载的加速 {"registry-mirrors": ["http://f1361db2.m.daocloud.io"]} # docker info Containers: 3 Running: 3 Paused: 0 Stopped: 0 Images: 10 Server Version: 18.06.3-ce Storage Driver: aufs Root Dir: /mnt/docker/aufs

Gitlab CI running Angular Jasmine tests crashing without error

阅读更多关于 Gitlab CI running Angular Jasmine tests crashing without error

问题 Having just setup Gitlab CI to run the Jasmine tests in my Angular project, I found the pipeline would bomb out with very little indication of the cause. All my tests would pass when run locally using ng test or locally in headless Chrome (having followed docs and another guide to set that up). However, the pipeline would get to around 13/90 tests and then disconnect. Here's a sample of the debug output (with logLevel: config.LOG_DEBUG in karma.conf.js ): HeadlessChrome 74.0.3723 (Linux 0.0.0

How to change the Tagger name and email of a Git Tag

阅读更多关于 How to change the Tagger name and email of a Git Tag

问题 Long story short I'm writing a script to migrate a very large project from (gasp) Microsoft SourceSafe to Git and I'm trying to retain the authors of the SourceSafe project's labels(which are essentially tags in Git). I know you can modify the author and committer name/date of a Git Commit but can you do the same to a Git Tag? 回答1: TL;DR Re-create the tags with the new desired data. But if anyone else had them before, they may not accept your new ones. Or they may! It's up to them , though.

GitLab rendering the wrong README in Project & Public views

阅读更多关于 GitLab rendering the wrong README in Project & Public views

问题 I'm using R markdown ( README.Rmd ) to knit/render to README.md at the top level of a project directory. GitLab (both in Project and Public views) chooses the .Rmd file to render vs the .md file and produces a visual mess instead of a nicely-formatted project description. Is there any way to tell GitLab to ignore .Rmd files when picking the "right" one to use for the project/public view or am I left with a workflow that will mean keeping the README.Rmd in a separate directory then having the

GitLab rendering the wrong README in Project & Public views

阅读更多关于 GitLab rendering the wrong README in Project & Public views

ERROR: Job failed (system failure): Cannot connect to the Docker daemon at unix:///var/run/docker.sock. Is the docker daemon running? on windows 10

阅读更多关于 ERROR: Job failed (system failure): Cannot connect to the Docker daemon at unix:///var/run/docker.sock. Is the docker daemon running? on windows 10

问题 I'm trying to set up gitlab CI on a windows 10 PC. I have created a docker container for gitlab (volumes are docker volumes) docker run --detach --name gitlab --hostname gitlab.mod --publish 4443:443 --publish 4480:80 --publish 8222:22 --volume gitlab-conf:/etc/gitlab --volume gitlab-logs:/var/log/gitlab --volume gitlab-data:/var/opt/gitlab gitlab/gitlab-ce Another for the runner docker run -d --name gitlab-runner -v gitlab-runner-conf:/etc/gitlab-runner gitlab/gitlab-runner:latest registered

GitLab on Docker: how to persist user data between deployments?

阅读更多关于 GitLab on Docker: how to persist user data between deployments?

问题 I am using the official GitLab Docker image. I want to have pre-configured user accounts available in my GitLab container to be used for tests. But user accounts are saved in a volume, so I can't just commit and push the GitLab image after having created my test users. So: how should I persist them? One way would be to create them on startup using the API after each new deployment, but this is quite slow/cumbersome. 回答1: As you said, it's not going to be as easy as committing and pushing a