Commit Graph
412 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 38d8d749d7 Merge branch 'feature/merge_commit_message' of /home/git/repositories/gitlab/gitlabhq 2014-01-15 10:36:12 +00:00
Dmitriy Zaporozhets e19d05ddd6 Fix issues selects
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-14 21:07:59 +02:00
Dmitriy Zaporozhets 99a2b31e98 Dont allow merge without commit message
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-14 19:56:52 +02:00
Jeroen van Baarsen d5bb466fe4 Fix for #5767
In the branch graph, uploaded images where not rendered
correctly. Fixed this by not filling the rect, instead
i've put an image over it
2014-01-13 22:22:46 +01:00
Dmitriy Zaporozhets 9c7d821cf7 Show selected attachment in comment form
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-12 18:47:58 +02:00
Dmitriy Zaporozhets 4434f93aa9 Select2 dropdown autoWidth
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-11 12:36:10 +02:00
Dmitriy Zaporozhets 8a17961126 Replace chosen with select2
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-11 12:11:54 +02:00
Jason Hollingsworth 04baf0b569 Update clone panel to use input group.
Use clone panel in `Git Access` section of wiki.
2014-01-08 10:06:03 -06:00
Dmitriy Zaporozhets ac6c050773 Fix network tests. Removed console.log
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-05 13:41:09 +02:00
Dmitriy Zaporozhets b765d7d739 Scale graphs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-04 19:25:35 +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 010a770b3f Migrate forms and inputs pt1
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-31 02:50:36 +02:00
Dmitriy Zaporozhets 9a7e2399dd Use jquery timeago plugin
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-30 14:38:42 +02:00
Dmitriy Zaporozhets 00056c82f2 Update votes ferom comments dynamically
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-27 14:25:03 +02:00
Dmitriy Zaporozhets 32c7310f4a Clear refresh interval for notes. Fixes duplicate note rendering
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-27 14:11:19 +02:00
Dmitriy Zaporozhets d4ec23b8b5 fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-26 09:39:55 +02:00
Dmitriy Zaporozhets 21b028b548 Improve tests and make preview for notes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-25 23:21:26 +02:00
Dmitriy Zaporozhets 9305ef8940 Remove old methods and classes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-25 22:33:40 +02:00
Dmitriy Zaporozhets 923bd2ecd2 Write new Notes coffee class to handle comments
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-25 22:31:18 +02:00
Dmitriy Zaporozhets f7e7dc7ebb Make note anchors actually work
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-25 13:32:43 +02:00
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