Commit Graph
50 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 65e88f1e1a Fixed few tests and improved css style 2015-01-26 22:39:48 -08:00
Dmitriy Zaporozhets 8ecf7d3207 Improve web editor filename placeholder 2015-01-26 20:58:38 -08:00
Dmitriy Zaporozhets a3d879d427 Refactor web editor 2015-01-26 20:57:42 -08:00
Dmitriy Zaporozhets 752cb506c0 Refactor blob views 2015-01-26 15:03:30 -08:00
Stefan Tatschner bf079c24af Replace highlight.js with rouge-fork rugments
I decided to create a fork of rouge as rouge lacks a HTML formatter with
the required options such as wrapping a line with <span> tags.
Furthermore I was not really convinced about the clarity of rouge's
source code.

Rugments 1.0.0beta3 for now only includes some basic linting and a new
HTML formatter. Everything else should behave the same.
2015-01-15 13:41:11 +01:00
Dmitriy Zaporozhets dc0879ac9e Merge pull request #7882 from cirosantilli/blob-instance-to-local
Use blob local instead of instance.
2014-12-20 20:19:59 +02:00
Dmitriy Zaporozhets e007d810c9 Merge pull request #7886 from cirosantilli/disable-blob-edit-mr
Disable / hide MR edit blob button if cannot edit.
2014-12-20 20:19:38 +02:00
Valeriy Sizov f84772875e Merge pull request #7863 from cirosantilli/rm-blob-link-to-button
Transform remove blob link into button.
2014-11-05 14:09:32 +02:00
Dmitriy Zaporozhets b23b78ada1 Merge pull request #7866 from cirosantilli/input-button-to-tag
Use button type=submit instead of input.
2014-10-28 12:11:15 +02:00
Ciro Santilli e4912243c1 Transform remove blob link into button. 2014-10-24 23:44:30 +02:00
Sullivan SENECHAL c0e2eee38b Fix fa-download icon 2014-10-04 16:58:59 +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
Robert Schilling 06fd4bf7e1 Merge pull request #7922 from cirosantilli/improve-remove-file-commit-placeholder
Improve remove file oommit message textarea placeholder.
2014-10-03 00:00:33 +02:00
Ciro Santilli 81eacd1b2a Disable / hide MR edit blob button if cannot edit. 2014-10-02 12:12:51 +02:00
Ciro Santilli 3098e7a453 Factor commit message textareas. 2014-10-02 12:03:30 +02:00
Ciro Santilli 6294033024 Use button type=submit instead of input. 2014-10-01 11:12:56 +02:00
Ciro Santilli e2e4dc5942 Use blob local instead of instance. 2014-10-01 09:04:25 +02:00
Ciro Santilli 0d4ae0e392 Titleize blob action buttons. 2014-09-30 23:32:03 +02:00
Ciro Santilli 0c84ffad1c Improve remove file textarea placeholder. 2014-09-30 21:15:33 +02:00
Robert Schilling 233d89a9e7 Disable buttons if required forms are empty 2014-09-11 19:48:02 +02:00
Marin Jankovski 9c3935c5b0 Use the new path to the partial, move the diff related methods to the new helper. 2014-09-09 11:10:40 +02:00
Ciro Santilli 81336bd2b5 Add permalink to fixed SHA URL on blob view. 2014-09-01 10:26:47 +02:00
skv 4e40800166 diff unfold 2014-08-14 15:48:14 +04:00
Dmitriy Zaporozhets 6aa3e7ba0b Merge pull request #7169 from cirosantilli/remove-center-elem
Replace HTML5 obsolete center element with CSS.
2014-06-24 10:28:06 +03: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 91c38a199f Add some semantic to our html
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-17 17:13:30 +03:00
Dmitriy Zaporozhets 72f0a6b286 Fix blob breadcrumb
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-14 20:01:56 +03:00
Dmitriy Zaporozhets eb7845682d Improve files/snippets action buttons
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-13 20:21:48 +03:00
Dmitriy Zaporozhets 55ab7a2a95 Remove color-named css classes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-03 14:49:50 +03:00
Dmitriy Zaporozhets 0505a88299 Hide control elements and last login for xs display
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-15 16:30:21 +03:00
Ciro Santillli 07a9d44de7 Commit message textareas have 72 char mark line. 2014-04-16 21:55:36 +02:00
Dmitriy Zaporozhets 32ecb02784 Refactor scss
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-20 13:51:22 +02:00
Dmitriy Zaporozhets 9a3d665919 Show last commit for Blob#show
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-10 21:46:46 +02:00
Dmitriy Zaporozhets 78b2fb5de9 Add highlight.js support to markdown, snippets etc
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-27 13:12:58 +02:00
Dmitriy Zaporozhets 76be57fcf2 Init highlgiht js and render for blob. Improve css for it
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-26 21:34:22 +02:00
Dmitriy Zaporozhets d6c037de81 Dont render README with markup if format is not compatible
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-08 16:32:03 +02:00
Dmitriy Zaporozhets 70f705887a Fix blob remove modal style
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-05 13:45:03 +02:00
Dmitriy Zaporozhets a9fba2cd0a Fix modal dialogs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-01 21:59:45 +02:00
Dmitriy Zaporozhets 8c1d414674 Include tw bootstrap manually. Fix hide class
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-01 21:42:42 +02:00
Dmitriy Zaporozhets 0392669cbc Fix some css after bootstrap 3
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-31 03:15:58 +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
Dmitriy Zaporozhets 6cbadc953f css class .hide has \!important so use gl-hide instead
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-31 00:38:53 +02:00
Dmitriy Zaporozhets bd20ec1a34 Remove file from repository feature
After click on remove file button you will be asked for commit message
via modal window. After submitting modal form file will be removed from
repository

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-19 16:14:56 +02:00
Johannes Schleifenbaum cc505f550d Check if a file is editied "on" a branch or a commit.
The previous behavior was a "disabled" link, which was still clickable
and linked to the edit file action.

If the 	user accesses a path like "/edit/master/README" show the file
edit form (just like before).

If the user accesses a path like
"/edit/8d5c1f375ce99e5df84e26b0eafbf1448c6a001e/README", redirect the
user to the file detail page with a note, that he cannot edit a file
"on" a commit.

fixes #5482
2013-10-30 11:34:26 +01:00
Dmitriy Zaporozhets 1d3f03fb69 Fix blob and repo stuff after gitlab_git v3 2013-10-01 18:26:55 +03:00
Dmitriy Zaporozhets e834742407 Dont load bootstrap buttons. Modified css with new buttons 2013-08-01 22:35:40 +03:00
Dekadence d331b3f912 Fixed download link from blob for other files 2013-07-15 23:12:18 +02: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