Commit Graph

26 Commits

Author SHA1 Message Date
Kushal Pandya fb3e365412 HAMLLint: Fix `SpaceInsideHashAttributes` offences 2016-12-31 11:58:36 +05:30
Kushal Pandya dd5ffd9ca6 HAMLLint: Fix `ImplicitDiv` offences 2016-12-31 11:43:08 +05:30
Adam Niedzielski cb6f8cdfc2 Replace references to MergeRequestDiff#commits with st_commits
when we care only about the number of commits

We do not have to instantiate all objects in this case.
2016-12-01 12:17:30 +01:00
Dmitriy Zaporozhets 3dd7ad5064
Improve mr compare message when base is different
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-10-12 17:42:32 +03:00
Dmitriy Zaporozhets c65c800f8e Inform user when comparing 2 version with different base
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-10-12 16:32:57 +03:00
Clement Ho e23c1d88e2 Replace bootstrap caret with fontawesome caret 2016-10-05 17:39:52 -05:00
Dmitriy Zaporozhets 63d8270eb5
Fix duplicate master entries in the mr versions dropdown
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-09-28 15:02:01 +03:00
tauriedavis 283f9633cd fix dropdowns for mr-versions 2016-09-22 13:46:55 +03:00
Bryce Johnson 8e4b849974 Remove colons in dropdowns, use icon helper, and fix 'Show original' link.
(Also removes duplicate changelog entry.)
2016-09-22 11:07:39 +02:00
Bryce Johnson cb53eff8f4 Add 'Show latest version' button. 2016-09-14 19:08:29 +02:00
Bryce Johnson 8ecaa256f8 Style merge request diff dropdowns & disable comments. 2016-09-14 19:08:29 +02:00
Dmitriy Zaporozhets 6f7a3ee694 Refactor merge request version compare feature
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-09-07 10:24:48 +03:00
Dmitriy Zaporozhets 5f0535ac91 Improve merge request version feature
* Use version numbers instead of sha as more user-friendly
* Make it clear that we compare later version (left) with older one (right)
* Improve wording of version switch panel

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-09-07 10:24:48 +03:00
Dmitriy Zaporozhets ffdfdc27e5 Expand abbreviations in merge request version path helper
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-09-07 10:24:48 +03:00
Dmitriy Zaporozhets aacb4caf7d Refactor code for merge request version compare feature
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-09-07 10:22:57 +03:00
Dmitriy Zaporozhets 96b83a58cc Improve merge request version switch/compare dropdown
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-09-07 10:22:57 +03:00
Dmitriy Zaporozhets 8b2e065b7b Compare merge request version against other version on changes page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-09-07 10:22:57 +03:00
Dmitriy Zaporozhets 9b5a83816e Add link to compare merge request versions
It adds a dropdown to the right of merge request version dropdown and
allow you to choose older version for compare. Once clicked it will take
user to compare page with older and newer versions sha pre-filled

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-09-07 10:22:57 +03:00
Dmitriy Zaporozhets 70fe671c29
Make it more obvious when the user isn't currently viewing the latest mr version
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-08-25 11:16:03 +03:00
Dmitriy Zaporozhets d64c15c5c3
Add code improvements to merge request version feature
* Add MergeRequestDiff#latest?
* Remove unnecessary variable assignment

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-08-25 10:59:30 +03:00
Dmitriy Zaporozhets 445edcfacc
Remove unnecessary &nbsp; in merge request versions dropdown
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-08-12 13:08:16 +03:00
Dmitriy Zaporozhets 28e33df46b
Load merge request versions without loading whole diff from database
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-08-09 15:16:50 +03:00
Dmitriy Zaporozhets 5cad2d2902 Add improvements to merge request versions
* show commits count in the merge request version dropdown
* initialize base/start commit sha for old merge request diffs from repo

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-08-02 13:31:19 +03:00
Dmitriy Zaporozhets 6190216541 Add small visual improvements to merge request version switch
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-08-02 13:31:19 +03:00
Dmitriy Zaporozhets dbd58dc4bb Improve merge request version switcher
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-08-02 13:31:19 +03:00
Dmitriy Zaporozhets b8fef7eb59 Add ability to render different merge request versions
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-08-02 13:31:19 +03:00