Skip to content

GitLab

Why GitLab
Pricing
Contact Sales
Explore

Sign in
Get free trial

Primary navigation

Project

GitLab Community Edition
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Jira
- Environments
- Incidents

Snippets Groups Projects

Admin message

Do not update/delete: Banner broadcast message test data

Admin message

Do not update/delete: Notification broadcast message test data

42bdfd02

Commit 42bdfd02 authored 12 years ago by Valeriy Sizov

Downloads
- Patches
- Plain Diff

WebEditor: base implementation

parent 0b3e9fd2

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/tree_controller.rb 8 additions, 2 deletions

app/controllers/tree_controller.rb
app/views/tree/edit.html.haml 7 additions, 2 deletions

app/views/tree/edit.html.haml
lib/gitlab/file_editor.rb 38 additions, 4 deletions

lib/gitlab/file_editor.rb
lib/gitlab/merge.rb 2 additions, 2 deletions

lib/gitlab/merge.rb

with 55 additions and 10 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment