Commit Graph
26 Commits
Author SHA1 Message Date
Ciro Santilli 166c215a75 Make new and edit file submit more uniform 2014-10-08 10:01:07 +02:00
Dmitriy Zaporozhets 43217dd5dd Merge branch 'cirosantilli-factor-commit-msg-textarea'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/projects/edit_tree/show.html.haml
2014-10-03 14:38:33 +03:00
Sullivan SENECHAL 5d8be4438a Upgrade to Font Awesome v4.2 2014-10-03 12:19:24 +02:00
Ciro Santilli 3098e7a453 Factor commit message textareas. 2014-10-02 12:03:30 +02:00
Dmitriy Zaporozhets 218219abbd Refactoring inside refactoring. We need to go deeper
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-08 21:54:52 +03:00
Dmitriy Zaporozhets 531f16beb0 Use new diff parsing logic
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-08 16:27:12 +03:00
Andrew Kumanyaev 0534d75a84 Add search in textarea
https://github.com/ajaxorg/ace/blob/master/lib/ace/commands/default_commands.js#L176-L181
2014-08-28 11:40:05 +04:00
Robert Schilling d7701a263f Move calls to Gitlab::MarkdownHelper to application_helper 2014-08-11 11:59:36 +02:00
Robert Schilling 99eb283101 Use readme we support to render if there are multiple readmes 2014-08-11 08:50:56 +02:00
Jo Hund df3c466e37 Don't remove trailing newline when editing a file in web UI editor:
* populate ACE editor content via API instead of HTML element inner text (to preserve trailing whitespace).
* remove hack in EditTreeController#preview that replaces any removed \n.

Fixes #5936
2014-06-27 10:50:36 -07:00
Ciro Santilli 83f4735b57 Replace HTML5 obsolete center element with CSS.
Fix #6901. Would generate invalid HTML5.
2014-06-21 09:43:00 +02:00
Dmitriy Zaporozhets 1ad174fbcd Improve edit page UI/UX
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-22 12:25:44 +03:00
Dmitriy Zaporozhets 0401e19558 Merge pull request #6385 from cirosantilli/72-char-commit-msg
Commit message textareas have 72 char mark line.
2014-05-13 12:29:28 +03:00
Ciro Santillli 07a9d44de7 Commit message textareas have 72 char mark line. 2014-04-16 21:55:36 +02:00
skv-headless d859d08094 Editing preview 2014-04-15 19:02:02 +04:00
Dmitriy Zaporozhets a9280de11f Better redirect for edit blod from MergeRequest
If you cancel edit you will be redirected back to merge request
If you submit changes you will be redirected back to merge request

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-26 14:06:31 +02:00
Dmitriy Zaporozhets e39f0de8ee Add edit button to MergeRequest diff
It will redirect you to file edit page.
After submit changes you will be redirected back to merge request.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-20 16:39:13 +02:00
Dmitriy Zaporozhets 1794f606bd Use ace editor as gem
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-10 16:18:46 +02:00
Dmitriy Zaporozhets 8e90011369 Restyle wiki for for twbs3
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-01 22:44:30 +02:00
Dmitriy Zaporozhets 16eb3ac360 Update form classes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-31 01:27:02 +02:00
Jeroen van Baarsen bfacf13668 Fixed all the confirm: deprecation warnings 2013-12-10 20:33:21 +01:00
Hassan Amouhzi a38c6550db Fix bug in ace-src-noconflict with Relative url.
If we doesn't use a relative url we have this:
<pre>gon.relative_url_root=""</pre>
Else <pre>gon.relative_url_root="/gitlab"</pre>

Gitlab::Application.config.assets.prefix contains:
<pre>/assets</pre>
2013-08-21 09:13:50 +02:00
Dmitriy Zaporozhets 08bcf639a0 Add titles for blame view and Edit mode 2013-08-01 15:21:43 +03:00
Dmitriy Zaporozhets e97abfce3b Fix edit page crash. Minot UI imporvements 2013-07-13 20:00:46 +03:00
Dmitriy Zaporozhets 3805797cae scss: rename file_content to file-content etc 2013-07-13 09:52:47 +03:00
Dmitriy Zaporozhets 2ed7cbfba4 Move projects controllers/views in Projects module 2013-06-23 19:47:22 +03:00