Commit Graph
819 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 39a4bb2abd Cleanup and some test fixes after refactoring project home page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-08 16:55:04 +02:00
Dmitriy Zaporozhets 8404ab46b9 Add shortcut for project activity page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-08 12:43:46 +02:00
Dmitriy Zaporozhets c2f02fc1a4 Refactor star and fork buttons
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-08 12:25:34 +02:00
Dmitriy Zaporozhets d192f921c1 Move project activity to separate tab. Add more features to project home page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-07 16:01:12 +02:00
Dmitriy Zaporozhets 9860ab0f22 Remove sticky-diff functionality
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-06 11:34:37 +02:00
Dmitriy Zaporozhets 919e702c86 Revert "Diff headers made sticky"
This reverts commit af44c65030.
2015-07-06 11:30:30 +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 e4472cee78 Add "Requires Input" JS behavior 2015-06-26 22:06:42 -04:00
Dmitriy Zaporozhets 06ab7d89f9 Merge branch 'rs-issue-1887' into 'master'
Reorder MergeRequestTabs constructor

The tab was being activated before we set the `[commits|diffs]Loaded`
variable, so even when the `/diffs` route is accessed directly, like
from the "Side-by-side" link, the tab was being loaded from its default
source.

Fixes #1887

See merge request !892
2015-06-26 16:17:07 +00:00
Dmitriy Zaporozhets b9fa82daee Update tests and use js-issuable class for context form
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-26 15:05:30 +02:00
Robert Speicher d2b5c3f6ce Trigger sticky_kit:recalc when diffs are pre-loaded 2015-06-25 21:26:20 -04:00
Robert Speicher 4e7f23fe0b Reorder MergeRequestTabs constructor
The tab was being activated before we set the `[commits|diffs]Loaded`
variable, so even when the `/diffs` route is accessed directly, like
from the "Side-by-side" link, the tab was being loaded from its default
source.

Fixes #1887
2015-06-25 18:33:24 -04:00
Dmitriy Zaporozhets a9095280c7 UsersSelect is part of filter so I rather keep js executed in partial
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-25 16:54:35 +02:00
Dmitriy Zaporozhets cbb64a4f63 Fix js error on merge request page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-25 16:37:52 +02:00
Dmitriy Zaporozhets 5ff870a044 Move duplicate js functionality into IssuableForm
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-25 16:17:06 +02:00
Dmitriy Zaporozhets 2d31568b27 Refactor issue and merge request sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-25 16:04:50 +02:00
Valery Sizov af93d447b6 Explicit error when commit not found in the GitLab CI 2015-06-23 14:50:06 +03:00
Dmitriy Zaporozhets 29b6d465a7 Merge branch 'rs-dev-issue-2355' into 'master'
MergeRequest#show performance improvements

This is a first pass on improving the performance of the `MergeRequests#show` page. Notable changes:

- The "Commits" tab is loaded lazily, so the initial page load should be much faster for MRs with many commits.
- Relative timestamps via `timeago` are only initialized once per load instead of `O(n^2)`. This greatly improves frontend rendering times for a large number of commits.
- Refactored `User.find_for_commit` to use a single ARel-generated SQL query instead of the old method which resulted in one query, and could result in up to three.

See merge request !838
2015-06-22 09:48:49 +00:00
Robert Speicher e17020b907 Add MergeRequestTabs specs 2015-06-21 22:57:32 -04:00
Robert Speicher 8e72c65cda Minor style fixes in MergeRequestTabs 2015-06-21 18:57:04 -04:00
Robert Speicher 7f5b255c08 Minor style fixes for LineHighlighter 2015-06-19 16:43:09 -04:00
Robert Speicher e59aad6e83 Refactor LineHighlighter 2015-06-19 04:31:24 -04:00
Robert Speicher 32366d1811 Rename BlobView to LineHighlighter 2015-06-19 04:31:24 -04:00
Robert Speicher 15582293b9 Use pushState instead of the temporary div hack 2015-06-19 04:31:24 -04:00
Robert Speicher b3f9be0639 Refactor and spec BlobView JS 2015-06-19 04:31:23 -04:00
Robert Speicher ce20400628 Extract MergeRequest tab behavior to its own JS class 2015-06-17 16:59:50 -04:00
Robert Speicher 2efb0b6e93 Remove duplicate timeago call 2015-06-17 16:37:10 -04:00
Stan Hu a7932fe2fd Support commenting on a diff in side-by-side view
Closes https://github.com/gitlabhq/gitlabhq/issues/9283
2015-06-16 06:11:59 -07:00
Robert Speicher 6de3958364 Account for RootController for dashboard navigation and Dispatch JS 2015-06-13 17:59:11 -04:00
Robert Speicher 0e21436aaf Simplify the javascript behavior for Preference updating 2015-06-13 17:58:17 -04:00
Robert Speicher 0c0c31ff34 Move the "Design" templates and logic to Preferences 2015-06-13 17:58:16 -04:00
Dmitriy Zaporozhets 21a62bb995 Merge branch 'refactor-mr-widget' into 'master'
Refactor accept merge request widget

* make each case a simple view
* separate  merge request JS from merge request accept widget JS

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !799
2015-06-12 08:22:13 +00:00
Dmitriy Zaporozhets b63ef1a077 Merge branch 'fix-graph-width' into 'master'
Fix graph width on different screen sizes

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !802
2015-06-12 08:11:47 +00:00
Dmitriy Zaporozhets aa38dfe938 Fix graph width on different screen sizes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-11 23:00:38 +02:00
Dmitriy Zaporozhets f06f438044 Make commit calendar size depend on window size
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-11 22:52:21 +02:00
Dmitriy Zaporozhets 15cfa5ca20 Fix automerge
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-11 18:49:34 +02:00
Dmitriy Zaporozhets 00600a592b Extract merge request widget JS to separate class
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-11 18:27:03 +02:00
Dmitriy Zaporozhets d2d8037b1a Refactor merge request widget step 2
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-11 15:14:50 +02:00
Nicolas a68eabd212 Make submit hotkey available to all notes forms.
Addresses #2221.
2015-06-09 05:31:21 +02:00
Douwe Maan 5256b5cc06 Prefer jQuery on to bind, and don't use .js class. 2015-06-05 12:13:02 +02:00
Douwe Maan 4ae67fcaef Show warning when a comment will add 10 or more people to the discussion. 2015-06-05 12:07:13 +02:00
Robert Speicher 29626b0885 Remove unused showAndHide, simpleFormat, and linkify functions
Also removes redundant `unbind` call
2015-06-02 20:32:07 -04:00
Robert Speicher 4560954404 Move jQuery enable/disable extensions to extensions/jquery
Removes redundant enableButton/disableButton extensions, and adds specs
for the jQuery extensions.
2015-06-02 20:32:07 -04:00
Robert Speicher f76a3f3db7 Add ZenMode javascript specs 2015-06-02 20:32:07 -04:00
Dmitriy Zaporozhets 01f6ae2351 improve navbar collapse for mobile views
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-01 17:55:20 +02:00
Dmitriy Zaporozhets aa97325dea Merge branch 'rs-merge-request-tabs-the-third' into 'master'
Include location.search and location.hash in URL for replaceState

Forgot these 😊

See merge request !740
2015-05-29 10:23:33 +00:00
Robert Speicher 7f529ef0f7 Include location.search and location.hash in URL for replaceState 2015-05-29 05:15:09 -04:00
Dmitriy Zaporozhets acb7721fe8 Merge branch 'rs-teaspoon' into 'master'
Add Teaspoon for Javascript testing

Looking to expand our Javascript unit tests, and this gem makes things a bit better in that respect.

See https://github.com/modeset/teaspoon

See merge request !715
2015-05-29 09:10:46 +00:00
Robert Speicher 3f156ed482 Improve MergeRequest tab-persisting behavior
Now uses the path instead of the hash.

See discussion in #728.
2015-05-29 00:27:56 -04:00
Robert Speicher 73440b0364 Javascripts don't need to require jquery or bootstrap explicitly 2015-05-28 18:22:32 -04:00