Merge branch 'master' into update_grack
Conflicts: Gemfile.lock
Showing
... | @@ -50,7 +50,7 @@ gem 'gitlab_omniauth-ldap', '1.2.0', require: "omniauth-ldap" | ... | @@ -50,7 +50,7 @@ gem 'gitlab_omniauth-ldap', '1.2.0', require: "omniauth-ldap" |
gem 'gollum-lib', '~> 4.0.0' | gem 'gollum-lib', '~> 4.0.0' | ||
# Language detection | # Language detection | ||
gem "gitlab-linguist", "~> 3.0.0", require: "linguist" | gem "gitlab-linguist", "~> 3.0.1", require: "linguist" | ||
# API | # API | ||
gem "grape", "~> 0.6.1" | gem "grape", "~> 0.6.1" | ||
... | ... |
![doc/workflow/web_editor/edit_file.png](https://lab.node.vifib.com/kazuhiko/gitlab-ce/-/raw/63c4f3ca7665d076ea143991823ec99c8f996a73/doc/workflow/web_editor/edit_file.png)
![doc/workflow/web_editor/new_file.png](https://lab.node.vifib.com/kazuhiko/gitlab-ce/-/raw/63c4f3ca7665d076ea143991823ec99c8f996a73/doc/workflow/web_editor/new_file.png)