diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2016-07-15 15:30:26 +0800 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2016-07-15 15:30:26 +0800 |
commit | 0f7851b7beb868511d7208a8170be905aecc731b (patch) | |
tree | 83612a416b8d62cb52e80def25fcb6d6393ea287 /doc/workflow/img/forking_workflow_path_taken_error.png | |
parent | abd7943636715b0ea4c861135a02db97b6bcfb7e (diff) | |
parent | bdb6f1e6fa756ae0db57e0474706685b6115c1e1 (diff) | |
download | gitlab-ce-0f7851b7beb868511d7208a8170be905aecc731b.tar.gz |
Merge remote-tracking branch 'upstream/master' into new-issue-by-email
* upstream/master: (1547 commits)
Add margin between buttons if both retry and cancel are present
Add margin between labels; remove underline hover style on status button
udpated JS based on feedback
Use default cursor for table header of project files (!5165)
Fix duplicated entry in changelog [ci skip]
Improves left static sidebar behaviour
Include default callback URL (OAuth)
Cleanup feature proposal template
Simplify regex for string-based multi-word label surrounded in quotes
Revert "Merge branch '18193-developers-can-merge' into 'master'
"
Upgrade Rails from 4.2.6 to 4.2.7.
some JS magic to fix empty URL bug
formats my test properly
Update CHANGELOG
Doesn't match empty label references surrounded in quotes
Fix markdown rendering for label references that contains `.`
Fix markdown rendering for label references that begin with a digit
Fix markdown rendering for consecutive label references
Stub omniauth provider for GitLab
Update CHANGELOG
...
Diffstat (limited to 'doc/workflow/img/forking_workflow_path_taken_error.png')
-rw-r--r-- | doc/workflow/img/forking_workflow_path_taken_error.png | bin | 22380 -> 17978 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/doc/workflow/img/forking_workflow_path_taken_error.png b/doc/workflow/img/forking_workflow_path_taken_error.png Binary files differindex 7a3139506fe..a859155aef0 100644 --- a/doc/workflow/img/forking_workflow_path_taken_error.png +++ b/doc/workflow/img/forking_workflow_path_taken_error.png |