home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 05:36:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
23,943 Commits 48 Branches 340 Tags
54aa0969d40549014bee6e4e500276405fb055ee
Commit Graph
306 Commits
Author SHA1 Message Date
Douwe Maan ff28ac9c18 Merge branch 'see-and-sort-on-vote-count-mr-issues' into 'master' 
Add ability to see and sort on vote count from Issues and MR lists

Fixes #3763

* Sort options

![Sort Options](/uploads/df6543d574d4df8bf7e4496a876e2930/sort.png)

* Most popular

![Most popular](/uploads/bb92cc2fbef7b6b806dcdf8c52778fdd/most-popular.png)

* Least popular

![Least popular](/uploads/7988ed451922c81dc228419b5edbd7cd/least-popular.png)

See merge request !2781
 2016-02-17 17:20:35 +00:00
Douwe Maan 534d480993 Merge branch 'fix/13517-impossible-subsequent-issuable-edits-in-sidebar' into 'master' 
Fix a bug preventing from doing subsequent edits in any Issuable sidebar

Fixes #13517. Fixes #12572.

### Issue

![impossible-subsequent-issue-edits-in-sidebar](/uploads/bd45c0effb46848641932d9cd38d3fe2/impossible-subsequent-issue-edits-in-sidebar.gif)

---

### Merge request

![impossible-subsequent-mr-edits-in-sidebar](/uploads/b4e1e3e93df4ac0a3d962df8b6139de9/impossible-subsequent-mr-edits-in-sidebar.gif)

/cc @jschatz1 @sytses 

See merge request !2848
 2016-02-17 14:01:30 +00:00
Douglas Barbosa Alexandre 9823d00e0b Add ability to see and sort on vote count from Issues and MR lists 2016-02-17 11:32:02 -02:00
Rémy Coutable c569f8b480 Fix a bug preventing from doing subsequent edits in any Issuable sidebar 2016-02-17 10:17:57 +01:00
Alfredo Sumaran 6d80a4c4f9 Wrap issue details to prevent content misalignment 2016-02-16 11:06:15 -05:00
Alfredo Sumaran 18390c6a91 Change "opened by" to just "by" 2016-02-16 09:30:34 -05:00
Alfredo Sumaran 807765b6a7 Move issue details after action buttons 2016-02-15 16:29:22 -05:00
Robert Speicher 20e47eadae Correct indentation for issues/merge_requests partial render 
Prior, it would only be shown if the issue had been edited.
 2016-02-11 11:17:45 -05:00
Jacob Schatz 80812a5d46 Edited time ago location change. 
Change edited icon to word.
Change edited text color to gray
cc/ @creamzy
 2016-02-05 11:31:13 -05:00
Dmitriy Zaporozhets 9258636021 Re-use top-are css component for issues/mr pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-02-05 11:35:55 +01:00
Jacob Schatz bb81eff4bf Issue sidebar bug fix. 
Thanks @rspeicher.
 2016-02-03 15:49:30 -05:00
Jacob Schatz d6d3a132b8 Fix sidebar replacement for issues & MRs 2016-02-03 14:45:08 -05:00
Jacob Schatz 599e554ad4 Sidebar works after sidebar ajax calls. 2016-02-02 19:42:19 -05:00
Jacob Schatz e2b6e9c3c5 Add ajax calls to return JSON 
Fix subtitles on minimize.
Fix styles for show.
 2016-01-30 00:30:25 -05:00
Jacob Schatz 087abdf7fd New right side gutter design. 
[WIP]
 2016-01-27 17:38:19 -05:00
Dmitriy Zaporozhets 367cd8ac75 Remove gray background from issue/mr/milestone background 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-22 16:15:32 -08:00
Dmitriy ZaporozhetsandJacob Schatz 8367e4abeb Implement new UI for pagination 2016-01-20 21:27:01 -05:00
Dmitriy Zaporozhets 777771db28 Merge branch 'referenced-merge-requests' into 'master' 
merge request close message moved and merge request now refered by `!`.

Fixes #4161 

![Screen_Shot_2016-01-12_at_8.38.57_AM](/uploads/9390ce0ebd1d14bfc83130ff4913a823/Screen_Shot_2016-01-12_at_8.38.57_AM.png)

See merge request !2387
 2016-01-13 09:23:23 +00:00
Jacob Schatz 0bb37c1ff2 makes message plural for multiple MRs and removes from loop. Duh. 2016-01-12 20:49:43 -05:00
Jacob Schatz d82d3ecd48 adds back in discussion.haml.html for issues commenting and closing/reopening properly. 2016-01-12 15:45:48 -05:00
Jacob Schatz c0220198d1 removing last chunk of MR ajax changes, rest will be in another MR 2016-01-12 15:16:26 -05:00
Jacob Schatz eb3e7bdfd8 merge request close message moved and merge request now refered by !. 2016-01-12 08:40:02 -05:00
Jacob Schatz f2edb26a1e fixes conflicts 2016-01-11 18:06:15 -05:00
Robert Speicher 4408dc0bd1 Use xmlschema where even more appropriate! 2016-01-07 20:01:08 -05:00
Robert Speicher 6344493655 Use to_s(:iso8601) where appropriate 2016-01-07 20:01:08 -05:00
Robert Speicher bf249550d0 number_with_delimiter most of the things 2015-12-31 20:04:23 -05:00
Jacob Schatz 8e74460534 adds ajax to bottom discussion buttons. Now submits issue and closes via ajax. 2015-12-29 12:53:21 -05:00
Robert Speicher 98f77d2edc Merge branch 'close-open-ajax-issue' into 'master' 
open and close issue via ajax request. With tests

Close and Reopen issues with ajax request.

See merge request !2164
 2015-12-25 21:00:16 +00:00
Robert Speicher ab3d855c0e Add support for twitter:label meta tags 2015-12-24 17:11:08 -05:00
Jacob Schatz b3e4bc5911 resolves conflicts with new buttons 2015-12-23 17:05:29 -05:00
Robert Speicher b26eb782f5 Add page descriptions and images 
A limited number of pages have defined their own descriptions, but
otherwise we default to the Project's description (if `@project` is
set), or the old `brand_title` fallback.

The image will either be the uploaded project icon (never a generated
one), the user's uploaded icon or Gravatar, or, finally, the GitLab
logo.
 2015-12-23 16:56:27 -05:00
Andriy Dyadyura 5e0b989fca new button sizes 2015-12-23 15:46:13 +01:00
Dmitriy Zaporozhets a84ecf0e2e Fix close/reopen buttons 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-23 12:29:50 +01:00
Andriy Dyadyura f4dabf9795 new buttons issue 2015-12-22 21:37:11 +01:00
Andriy Dyadyura a72b71abcc new buttons issue 2015-12-22 21:29:31 +01:00
Jacob Schatz 1f5b8e88f3 changes data-url to href for javascript url grabbing 2015-12-21 16:45:52 -05:00
Jacob Schatz 70dfa3a721 open and close issue via ajax request. With tests 2015-12-21 13:06:09 -05:00
Drew Blessing 84caae7294 Do not display project group/name when issue and MR are in same project 2015-12-17 10:14:50 -06:00
Dmitriy Zaporozhets 4b7c9c7fe2 Revert sidebar position for issue and merge request 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-17 10:34:15 +01:00
Dmitriy Zaporozhets 3162a5a293 Fix ux issue with "This issue will be closed automatically" message 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-17 00:04:29 +01:00
Douwe Maan 79c90821ac Rename .issuable-details to .detail-page (and -header and -description) 2015-12-16 16:13:22 +01:00
Dmitriy Zaporozhets 1911811438 Move awards back to gray panel and few improvements to sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-11 20:12:18 +01:00
Dmitriy Zaporozhets b0591ff03a Redesign issue page for new sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-11 20:11:23 +01:00
Greg Smethells 0272f27401 display referenced merge requests in issue description with CI status 2015-12-11 10:14:55 -06:00
Douwe Maan 10387f6b8a Merge branch 'master' into tmp-reference-pipeline-and-caching 
# Conflicts:
#	spec/lib/gitlab/markdown/autolink_filter_spec.rb
#	spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/cross_project_reference_spec.rb
#	spec/lib/gitlab/markdown/emoji_filter_spec.rb
#	spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/external_link_filter_spec.rb
#	spec/lib/gitlab/markdown/issue_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/label_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/redactor_filter_spec.rb
#	spec/lib/gitlab/markdown/reference_gatherer_filter_spec.rb
#	spec/lib/gitlab/markdown/relative_link_filter_spec.rb
#	spec/lib/gitlab/markdown/sanitization_filter_spec.rb
#	spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/syntax_highlight_filter_spec.rb
#	spec/lib/gitlab/markdown/table_of_contents_filter_spec.rb
#	spec/lib/gitlab/markdown/task_list_filter_spec.rb
#	spec/lib/gitlab/markdown/upload_link_filter_spec.rb
#	spec/lib/gitlab/markdown/user_reference_filter_spec.rb
 2015-12-10 14:04:34 +01:00
Douwe Maan 31b4960eca Fix specs 2015-12-08 22:39:26 +01:00
Douwe Maan fae08104b4 Merge branch 'master' into mr-broken 
# Conflicts:
#	app/helpers/ci_status_helper.rb
 2015-12-08 22:38:29 +01:00
Douwe Maan f66454beaa Add indication to merge request list item that MR cannot be merged automatically 2015-12-08 21:43:11 +01:00
Robert Speicher 813c9b2aeb Make cross-project reference's clipboard target less naive 
See !2023
 2015-12-08 15:29:46 -05:00
Robert Speicher bcd89a58e7 Merge branch 'reference-pipeline-and-caching' into 'master' 
Implement different Markdown rendering pipelines and cache Markdown

Builds on !1090. 

Related to !1014.

Fixes #2054.

See merge request !1602
 2015-12-08 20:22:23 +00:00