Commit Graph

71 Commits

Author SHA1 Message Date
Dmitriy Zaporozhets 3e259ea8bc Revert "Merge branch 'revert-satellites' into 'master' "
This reverts commit 5daf44b7c8, reversing
changes made to 2f706fbd23.
2015-08-11 14:33:31 +02:00
Dmitriy Zaporozhets 9d029a05f1
Revert "Merge branch 'web-editor-rugged' into 'master'"
This reverts commit 5a1aa49b55, reversing
changes made to a675bea2c1.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-11 13:04:38 +02:00
Dmitriy Zaporozhets d4cfa0bf76
Revert "Refactor web editor"
This reverts commit dfccb06dda.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-11 11:49:09 +02:00
ngentile dbff6bc106 Gitlab Issue 707: Indent unfolded code 1 character 2015-07-22 09:58:17 -04:00
Dmitriy Zaporozhets f0e1da04f0
Show last push widget on several project pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-08 23:21:35 +02:00
Robert Speicher f6503f71f9 Remove disableButtonIf[Any]EmptyField calls from forms
These have been replaced by the "requiresInput" behavior.
2015-06-26 22:07:59 -04:00
Robert Speicher e3c1818a3e Bootlint: Modals no longer need a '.hide' class 2015-06-16 13:32:33 -04:00
Robert Speicher 7400cfc114 Bootlint: Use offset grid classes instead of empty divs 2015-06-16 13:32:32 -04:00
Dmitriy Zaporozhets dfccb06dda
Refactor web editor
* fix problem with editing non-master branch
* before commit make sure branch exists
* dont allow user change file in one branch and commit to another existing branch
* remove a lot of code duplication
* remove outdated statellite errors

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-05 15:01:38 +02:00
Dmitriy Zaporozhets d9d9c7d7bc
Allow base64 for edit blobs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-01 23:43:08 +02:00
Alex Connor 3c892f3554 Disabled expansion of top/bottom blobs for new file diffs 2015-05-21 09:25:07 +02:00
Jakub Jirutka b0659c1b07 Simplify and unify helpers for rendering markup 2015-05-18 22:52:13 +02:00
Douwe Maan ae09c2a6db Capitalize "X" in "New X". 2015-04-30 21:33:02 +02:00
Douwe Maan 26ad250989 Add a page title to every page. 2015-04-30 19:12:15 +02:00
Sullivan SENECHAL 8ef7220c23 Improve file icons rendering on tree 2015-03-28 16:49:05 +01:00
Dmitriy Zaporozhets 30ca451fd4 Refactor buttons 2015-03-14 00:29:32 -07:00
Dmitriy Zaporozhets 2da2720584 Improve css for file actions 2015-03-13 19:20:25 -07:00
Dmitriy Zaporozhets e2b8025abe Increase input padding and fit issue form in laptop screen 2015-03-07 01:06:16 -08:00
Dmitriy Zaporozhets 3bfd53149c Replace bs-callout with alert 2015-03-06 18:36:22 -08:00
Valery Sizov 71a844cdae Web Editor: save to new branch 2015-02-24 11:43:20 +02:00
Vinnie Okada 76aad9b76e Upgrade to Rails 4.1.9
Make the following changes to deal with new behavior in Rails 4.1.2:

* Use nested resources to avoid slashes in arguments to path helpers.
2015-02-14 11:09:23 -07:00
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