summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Don't execute git hooks if you create branch as part of other changeidea-to-production-demoKamil Trzcinski2016-11-034-6/+10
| | | | | | | | | | | Currently, our procedure for adding a commit requires us to execute `CreateBranchService` before file creation. It's OK, but also we do execute `git hooks` (the `PostReceive` sidekiq job) as part of this process. However, this hook is execute before the file is actually committed, so the ref is updated. Secondly, we do execute a `git hooks` after committing file and updating ref. This results in duplicate `PostReceive` jobs, where the first one is completely invalid. This change makes the branch creation, something that is intermediate step of bigger process (file creation or update, commit cherry pick or revert) to not execute git hooks.
* Update gitlab-ci-ymlKamil Trzcinski2016-10-131-4/+3
|
* Fix encoding issues on pipeline commitsAnnabel Dunstone Gray2016-10-131-1/+1
|
* Fix 500 when last_deployment is missingKamil Trzcinski2016-10-121-4/+5
|
* Improve vendored OpenShift scriptKamil Trzcinski2016-10-121-3/+3
|
* Enhance deployment terminal viewKamil Trzcinski2016-10-124-19/+27
|
* Fix terminal supportKamil Trzcinski2016-10-124-4/+7
|
* Fix deploy serviceKamil Trzcinski2016-10-121-5/+5
|
* Update vendored OpenShift templateKamil Trzcinski2016-10-121-9/+9
|
* Fix deployments controllerKamil Trzcinski2016-10-122-6/+8
|
* Hack support for DockerfilesKamil Trzcinski2016-10-127-2/+56
|
* Add Dockerfile templatesKamil Trzcinski2016-10-123-1/+35
|
* Fix terminal deployment pathKamil Trzcinski2016-10-123-3/+6
|
* terminal supportKamil Trzcinski2016-10-121-2/+12
|\
| * Access variables through Ci::BuildJacob Vosmaer2016-10-121-2/+12
| |
* | terminal supportKamil Trzcinski2016-10-127-55/+76
|\ \ | |/
| * fixed terminal buttonDimitrie Hoekstra2016-10-113-4/+11
| |
| * Wrap gl.Terminal with a IIFE.Fatih Acet2016-10-111-46/+50
| |
| * Add project path as a data attribute and use it in gl.Terminal.Fatih Acet2016-10-113-4/+5
| |
| * Send openshift credentials to workhorseJacob Vosmaer2016-10-111-4/+10
| |
| * Fix CI variable lookup for terminalJacob Vosmaer2016-10-111-3/+4
| |
* | terminal supportKamil Trzcinski2016-10-124-5/+7
|\ \ | |/
| * HTMLEntityFilter -> HtmlEntityFilterNick Thomas2016-10-113-3/+3
| |
| * Pass Openshift project/app to workhorseJacob Vosmaer2016-10-111-2/+4
| |
* | mattermost commandsKamil Trzcinski2016-10-1110-43/+69
|\ \
| * | Fix deploy slash commandzj-mattermost-slash-commandsZ.J. van de Weg2016-10-101-27/+0
| | |
| * | WIPKamil Trzcinski2016-10-103-14/+89
| | |
| * | Improve and test /issue commandZ.J. van de Weg2016-10-103-44/+154
| | |
| * | Start for /deploy commandZ.J. van de Weg2016-10-102-1/+34
| | |
| * | Support for creation of issuesZ.J. van de Weg2016-10-101-0/+37
| | |
| * | WIP: Mattermost slash commandsZ.J. van de Weg2016-10-1010-7/+168
| | |
| * | Merge branch 'explain-0600' into 'master' Robert Speicher2016-10-101-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain the extra chmod There is confusion about what passing `0600` to File.open does. ``` $ touch /tmp/foobar $ ls -l /tmp/foobar -rw-r--r-- 1 jacobvosmaer wheel 0 Sep 26 14:20 /tmp/foobar $ ruby -e 'File.open("/tmp/foobar", "w", 0600)' $ ls -l /tmp/foobar -rw-r--r-- 1 jacobvosmaer wheel 0 Sep 26 14:20 /tmp/foobar $ $ $ rm /tmp/foobar $ ruby -e 'File.open("/tmp/foobar", "w", 0600)' $ ls -l /tmp/foobar -rw------- 1 jacobvosmaer wheel 0 Sep 26 14:21 /tmp/foobar ``` See merge request !6523
| | * | Explain the extra chmodJacob Vosmaer2016-09-261-1/+1
| | | |
| * | | Merge branch 'jerdog/gitlab-ce-update-start-using-git-documentation' into ↵2529-error-502-when-creating-mrAchilleas Pipinellis2016-10-102-11/+10
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Changes to make Git basics more intuitive From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6420 See merge request !6777
| | * | | Updating changes based on feedback from @connorsheaJerdog2016-10-101-5/+5
| | | | |
| | * | | Changes to make Git basics more intuitiveJerdog2016-10-102-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - updated verbiage where appropriate - changed "git config" commands to include quotes for variables to be more in line with standard practive and to avoid issues with spaces - updated CHANGELOG as part of commit
| * | | | Merge branch 'tnir/gitlab-ce-23068-cleanup-ci-application-controller'Rémy Coutable2016-10-104-9/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Ci::ApplicationController. See gitlab-org/gitlab-ce!6757.
| | * | | | Remove Ci::ApplicationControllerTakuya Noguchi2016-10-104-9/+3
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Merge branch 'gtrafimenkov/gitlab-ce-clarify-runners-delete-token' into ↵Achilleas Pipinellis2016-10-102-2/+5
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Clarify which token should be used to delete a Runner See merge request !6775
| | * | | Clarify which token should be used to delete a runnerGennady Trafimenkov2016-10-102-2/+5
| |/ / /
* | | | runner tokenKamil Trzcinski2016-10-112-3/+68
|\ \ \ \
| * | | | Fixes broken testsFilipa Lacerda2016-10-112-3/+53
| | | | |
| * | | | Adds tests to verify if tabs are renderedFilipa Lacerda2016-10-101-0/+15
| | | | |
* | | | | terminal supportKamil Trzcinski2016-10-114-14/+33
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Add terminal access check / metadata endpointJacob Vosmaer2016-10-102-1/+13
| | | | |
| * | | | Add current user check to terminal template.Fatih Acet2016-10-101-12/+13
| | | | |
| * | | | Change websocket url to use gitlab-workhorse.Fatih Acet2016-10-101-5/+3
| | | | |
| * | | | Implement real terminal with xterm.Fatih Acet2016-10-1010-27/+7623
| | | | |
| * | | | Display fake terminal.Fatih Acet2016-10-106-0/+58
| | | | |
* | | | | latest masterKamil Trzcinski2016-10-1151-284/+703
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | # Conflicts: # app/models/commit_status.rb
View Lorry Controller Status