Commit Graph
392 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 2008361b8e Merge pull request #5889 from skv-headless/master
coffee interpolation for template of user select
2013-12-22 00:53:04 -08:00
skv ae3cb2d6ce coffee interpolation for template of user select 2013-12-20 21:31:45 +04:00
Dmitriy Zaporozhets aef944ba7f Merge branch 'atomaka/feature/message-colors' of https://github.com/atomaka/gitlabhq into 6-5-dev 2013-12-19 19:58:40 +02:00
Andrew Tomaka 0760ba3efb Customization and previewing of broadcast messages 2013-12-18 17:43:45 -05:00
Jason Blanchard 65448e2ff7 Added dropdown menus to issue#show page for assignee and milestone 2013-12-17 09:39:50 -05:00
Dmitriy Zaporozhets 3221dc5381 Merge pull request #5681 from chopmann/patch-2
FIX: Browser back button breaks "Loading..." visual
2013-12-16 02:51:23 -08:00
Dmitriy Zaporozhets bc663a7383 remove GET window.updatePage method that do dataType script
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-02 14:33:27 +02:00
Dmitriy Zaporozhets e3464a54d8 Remove .js format for MergeRequest controller
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-02 14:27:36 +02:00
Dmitriy Zaporozhets da10cad1da Drop rjs from Issues#index
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-29 15:05:32 +02:00
Dmitriy Zaporozhets 596e64e5d7 Drop rjs from Notes#index
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-29 14:46:40 +02:00
Dmitriy Zaporozhets db0c353a78 Merge pull request #5708 from jhollingsworth/feature/multiline-blob-select
Enable multiline select for blobs.
2013-11-29 00:18:34 -08:00
Dmitriy Zaporozhets 33aea41708 Drop rjs from Infinite scrolling
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-28 11:38:20 +02:00
Jason Hollingsworth 568e05a73b Enable multiline select for blobs.
Holding shift will allow users to click and select multiple lines.
The behavior is similar to GitHub.
Complete with tests.
2013-11-27 20:08:37 -06:00
Cornelio Hopmann f10a156669 FIX: Browser back button breaks "Loading..." visual
From: https://github.com/rails/turbolinks/
page:change the page has been parsed and changed to the new version and on DOMContentLoaded
2013-11-24 21:38:11 +01:00
Dmitriy Zaporozhets dcea191314 Select2 tag for namespaces with ajax loading
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-15 15:25:09 +02:00
Dmitriy Zaporozhets 00d6ac299e Fix no-ssh-key-message path for cookie
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-12 10:36:09 +02:00
Dmitriy Zaporozhets b983e9ef0a Add ability to hide no ssh key message
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-12 10:19:23 +02:00
Cornelio Hopmann 92b7c569a7 FIX: note-original-content appending itself too many times 2013-11-10 13:01:29 +00:00
Andrey Kumanyaev 6173d0a92f Show branches list (which branches contains commit) on commit page 2013-10-21 22:54:37 +04:00
Dmitriy Zaporozhets 36a69b0a30 Update git-clone js. Use new style on wiki git access too 2013-10-21 13:07:16 +03:00
Steven Thonus 65cad57a35 avatar upload on profile page 2013-10-09 09:05:09 +02:00
Dmitriy Zaporozhets e219cf7246 Annotate! 2013-10-01 15:15:28 +03:00
Marin Jankovski 91e112ffe2 Replace remote url on selection. 2013-09-13 10:12:42 +02:00
Dmitriy Zaporozhets e0ca2adafd Improve Merge Request form
* added description
* simplified form
* enabled gfm autocomplete
2013-09-09 17:11:58 +03:00
Boyan Tabakov 01ff084a4d Improved large commit handling.
Previously, only number of changed files mattered. Now, number of lines to render in the diff are also taken into account.

A hard limit is set, above which diffs are not rendered and users are not allowed to override that. This prevents high server
resource usage with huge commits.

Related to #1745, #2259

In addition, handle large commits for MergeRequests and Compare controllers.

Also fixes a bug where diffs are loaded twice, if user goes directly to merge_requests/:id/diffs URL.
2013-09-07 14:44:03 +03:00
Dmitriy Zaporozhets 643a6e5824 Improve admin user show page
Show permissions for all project.
Add ability to remove user from group if not an owner
Remove unnecessary admin controller
2013-08-27 21:39:34 +03:00
Dmitriy Zaporozhets a2a7c8093b Use flash message for notification across app 2013-08-27 12:18:53 +03:00
Dmitriy Zaporozhets 17af835387 Add event filter for group and project show pages 2013-08-26 16:30:03 +03:00
Dmitriy Zaporozhets 20397091f1 Show iid in event feed and uatocomplete as default id for issues, mr 2013-08-19 22:12:59 +03:00
Dmitriy Zaporozhets a410bc1289 Merge pull request #4670 from anezi/relative-url-patch
More fixes for supporting Relative URL
2013-08-19 05:42:20 -07:00
Mike Bajur 798f7db24f Update flash message timeout to 5 seconds 2013-08-17 16:36:44 +02:00
GitLab 533ef87b13 Make flash messages fixed and sticked to bottom 2013-08-17 06:32:59 -04:00
amouhziandHassan Amouhzi 39d8a64d25 Fixes grack authentification under relative_url_root
Ref: https://github.com/gitlabhq/gitlabhq/commit/e6159b8725f99af78f446f8d33fa0e52b7780430
Ref: https://github.com/gitlabhq/gitlabhq/pull/3204
Ref: https://github.com/gitlabhq/gitlabhq/issues/1228

Add Rails' variable in application.rb to support relative url

This variable is used by assets compilation and other modules.

Note that user needs to change application.rb too

Restrict session cookie to the relative path if set.

Ref: https://github.com/gitlabhq/gitlabhq/commit/2c2f1e31856a4decdae469974f5bea8245316f7e

Fix Update attachment_uploader.rb bug with relative URL

See: https://github.com/gitlabhq/gitlabhq/commit/161afda3fa4fca58f396e9c3acbd72bc14490ace

Fix Wall relative bug with attachement files (javascript)
2013-08-15 21:25:09 +02:00
Dmitriy Zaporozhets 6579ba3e77 Increase graphs height 2013-08-14 15:14:08 +03:00
Dmitriy Zaporozhets 31e9f82ebc Improve repository graph 2013-08-13 16:26:48 +03:00
Dmitriy Zaporozhets a0228f94a1 Reload page during repo import 2013-08-12 19:28:10 +03:00
Dmitriy Zaporozhets f79b210061 Fix wiki popup for new page 2013-08-08 11:40:42 +03:00
Dmitriy Zaporozhets 65eddc00ad toggle content instead of disabling button for group members editing 2013-08-06 18:49:37 +03:00
Dmitriy Zaporozhets 6eabf90b80 Ability to edit group member permissions 2013-08-06 18:45:45 +03:00
Dmitriy Zaporozhets 498a9ce3d2 more space for months names in network graph 2013-08-05 19:10:20 +03:00
Dmitriy Zaporozhets a2501d1586 more space for days in network graph 2013-08-05 19:08:51 +03:00
Dmitriy Zaporozhets 65197b8a8a Sanitize issues title in autocomplete for comment 2013-08-04 17:14:15 +03:00
Dmitriy Zaporozhets 263b301f66 Merge pull request #4663 from jackbot/autocomplete_in_editable_notes
Show autocomplete list when editing notes.
2013-08-04 06:36:36 -07:00
Dmitriy Zaporozhets 6af4223a27 Fixed Diff suppressed link for MR 2013-08-02 12:49:20 +03:00
Dmitriy Zaporozhets ce5fca4828 Fix MR modal 2013-08-01 15:59:57 +03:00
Dmitriy Zaporozhets 8290e7cc70 Autofocus to project name at projects#new. Added description field to projects#new. Increased timeout for flash message 2013-07-29 21:06:59 +03:00
Jack Weeden 1458dea9fe Show autocomplete list when editing notes. 2013-07-29 14:16:36 +01:00
Johannes Schleifenbaum cd19f82e51 Fix typos 2013-07-29 12:47:06 +02:00
Dmitriy Zaporozhets 7a167cf1f7 Move branches list to own controller with pagination. Ability to remove branches from UI 2013-07-16 22:19:07 +03:00
Dmitriy Zaporozhets 16c3925927 Determine network height based on window size 2013-07-15 15:03:56 +03:00