home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 01:26:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
21,734 Commits 48 Branches 340 Tags
db7bbadf95d9f2266a055ee50a67fa895b0f21a9
Commit Graph
3037 Commits
Author SHA1 Message Date
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
Dmitriy Zaporozhets 664384e78b Merge remote-tracking branch 'origin/rs-simplify-status-icon' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-16 19:19:07 +01:00
Dmitriy Zaporozhets 3321f694b8 Merge branch 'fix-milestone-snippet-header' into 'master' 
Fix headers of milestone and snippet show pages

Fix layout, and move "Edit" button to very right just like issue/MR.

Before:

![Screen_Shot_2015-12-15_at_17.33.20](/uploads/dbbeb6868b80e21894159126a0feca6a/Screen_Shot_2015-12-15_at_17.33.20.png)

![Screen_Shot_2015-12-15_at_17.33.28](/uploads/53d10b42adc34e48b063889120e9a746/Screen_Shot_2015-12-15_at_17.33.28.png)

After:

![Screen_Shot_2015-12-15_at_17.34.25](/uploads/b0d0ea3f6a7b61d51b474419207f7a02/Screen_Shot_2015-12-15_at_17.34.25.png)

![Screen_Shot_2015-12-15_at_17.35.55](/uploads/65b922f5249655d3733740690577c9d7/Screen_Shot_2015-12-15_at_17.35.55.png)

cc @skyruler 

cc @rspeicher 8.3 please!

See merge request !2104
 2015-12-16 17:59:28 +00:00
Dmitriy Zaporozhets 747f0a328c Merge branch 'control-list-right-margin' into 'master' 
Fix right margin of control list

Before:

![Screen_Shot_2015-12-16_at_16.29.39](/uploads/7a6aa79b6af0900d9257ce86ab822a22/Screen_Shot_2015-12-16_at_16.29.39.png)

After:

![Screen_Shot_2015-12-16_at_16.29.45](/uploads/d52fdc70ecd63fc61ae6ae87b3b7d1a5/Screen_Shot_2015-12-16_at_16.29.45.png)


See merge request !2114
 2015-12-16 16:07:06 +00:00
Douwe Maan d8978acd39 Fix right margin of control list 2015-12-16 16:30:01 +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 9472d1372f Fix double border in MR discussion 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-16 15:41:50 +01:00
Douwe Maan e07c9c1ee1 Merge branch 'rs-clipboard-fixes' into 'master' 
Fix clipboard buttons on MR instructions and Commit#show



See merge request !2108
 2015-12-16 13:30:15 +00:00
Andrey 37a4e4945d Merge branch 'fix-profile-nav' into 'master' 
Make profile navigation full wide

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

## Before


![Administrator___GitLab](/uploads/a43e8992264ed78afa732e7a911ef154/Administrator___GitLab.png)

## After

![Administrator___GitLab1](/uploads/9e67e8af071d4879045311abe15a7bba/Administrator___GitLab1.png)

See merge request !2076
 2015-12-16 10:57:02 +00:00
Robert Speicher f49ac5c8d3 Fix clipboard buttons on MR instructions and Commit#show 2015-12-15 16:11:01 -05:00
Andrey 96a1558897 Merge branch 'wider-layout' into 'master' 
Increase fixed layout width to 1280px

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

cc @creamzy 

See merge request !2075
 2015-12-15 18:19:55 +00:00
Douwe Maan f31dfae28a Fix inline panel heading height 2015-12-15 17:31:07 +01:00
Valery Sizov 485e910085 Merge branch 'improve_emoji' 2015-12-14 10:10:57 +02:00
Robert Speicher 3084c8c370 Define CI status icon colors in SCSS instead of a helper 2015-12-12 13:18:51 -05:00
Dmitriy Zaporozhets 51c8d037d3 Make profile navigation full wide 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-11 20:39:26 +01:00
Dmitriy Zaporozhets d86e2f33a8 Increase fixed layout width to 1280px 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-11 20:33:24 +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 b4ea6ad16a Few UI improvements to new sidebar implementation 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-11 20:11:23 +01:00
Dmitriy Zaporozhets c6c244315a Implement new sidebar for merge request page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-11 20:11:23 +01:00
Dmitriy Zaporozhets aa5bf4097b Make edit link on issuable sidebar works 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-11 20:11:23 +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
Dmitriy Zaporozhets 76ff8eac26 Move awards css to separate file 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-11 20:09:04 +01:00
Robert Speicher 2bc821301d Merge branch 'mr-statuses' into 'master' 
Display referenced merge request statuses in the issue description

See gitlab-org/gitlab-ce#3180 for original issue.
Previously discussed in !1941 and in !1771 before that.

* [x] Show a "Related Merge Requests" list on the issue page under the Description as given by the UI mockup
* [x] Display `all_references.merge_requests` and `note.all_references.merge_requests` 
* [x] Consider displaying the merge request status in addition to the CI status to enable complete merge request status understanding.

See merge request !1991
 2015-12-11 18:25:43 +00:00
Robert Speicher 48eccdb2fc Merge branch 'fix-delete-notes-on-merge-request-diff' into 'master' 
Fix delete notes on merge request diff

Fixes #3971

See merge request !2061
 2015-12-11 12:49:55 -05:00
Greg Smethells 0272f27401 display referenced merge requests in issue description with CI status 2015-12-11 10:14:55 -06:00
Douwe Maan a2a68858c8 Merge branch 'feature/project_js_from_ee' into 'master' 
Aling project js with EE

The MR ports the changes introduced by gitlab-org/gitlab-ee!70 in `project.js.coffee`.  


See merge request !2054
 2015-12-11 15:13:26 +00:00
Valery Sizov eec4751bd0 Add hover-state for emoji in emoji-picker 2015-12-11 17:08:58 +02:00
Grzegorz Bizon d1211e0ada Fix award-emojis alert flash message 
This adds a new feature to `Flash` that allows to pin it after a
specified selector. This removes a fixed position from such award-emoji
alert, and makes it responsive by design of selector that this alert is
pinned to.

Closes #3996
 2015-12-11 13:50:14 +01:00
Valery Sizov 72b7d1f59d emoji aliases problem 2015-12-11 13:17:12 +02:00
Douglas Barbosa Alexandre 1f893022fd Remove note from MR discussion when deleting it in the changes tab 2015-12-10 22:07:25 -02:00
Robert Speicher 3f4715322e Merge branch 'fix-edit-notes-on-merge-request-diff' into 'master' 
Fix editing notes on a merge request diff

Fixes #3910

See merge request !2041
 2015-12-10 19:22:53 +00:00
Douglas Barbosa Alexandre 9d6e5f0a28 Make selectors more specific when scroll to element 2015-12-10 15:42:00 -02:00
Douglas Barbosa Alexandre 67913670dc Make selectors more specific when setting the tab content 
Reason: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2023
 2015-12-10 13:50:31 -02:00
Douglas Barbosa Alexandre 0c54c9a8a3 USe innerHtml to avoid slow performance on a MR with very large diff 2015-12-10 13:42:10 -02:00
Borja Aparicio 01cafa1d90 Aling project js with EE 2015-12-10 16:27:34 +01:00
Douwe Maan 3bfedbd25a Merge branch 'rs-snippets-clipboard' 2015-12-10 14:54:47 +01:00
Dmitriy Zaporozhets ab8ab9b10c Fix list with controls display 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-10 01:24:10 +01:00
Dmitriy Zaporozhets 7a4d468576 Merge remote-tracking branch 'origin/mr-broken' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-09 21:06:04 +01:00
Robert Speicher cbac31d923 Add copy-to-clipboard button to Snippets#show 
Closes #3701
 2015-12-09 14:54:54 -05:00
Douglas Barbosa Alexandre 4a29669dec Merge branch 'master' into fix-edit-notes-on-merge-request-diff 2015-12-09 16:31:15 -02:00
Dmitriy Zaporozhets 8440290f6a Merge branch 'rs-list-styling' into 'master' 
Improve styling for mixed list styles

Tasks in an ordered list will now also show their numbers.

Closes #2488

Related to #3921

See merge request !2026
 2015-12-09 17:06:30 +00:00
Douglas Barbosa Alexandre 429932a8b4 Ensure new notes are highlighted properly on a merge request diff 2015-12-09 12:17:00 -02:00
Douglas Barbosa Alexandre 05f06955ba Ensure existing notes are highlighted properly on a merge request diff 2015-12-09 12:16:54 -02:00
Douglas Barbosa Alexandre 9e5ac7285c Ensure notes are replaced on a merge request diff when they're updated 2015-12-09 11:30:21 -02:00
Douwe Maan eab086bde1 Merge branch 'master' into merge-if-green 
# Conflicts:
#	app/controllers/projects/merge_requests_controller.rb
#	config/routes.rb
 2015-12-09 09:00:25 +01:00
Robert Speicher 53fbb0ecda Improve styling for mixed list styles 
Tasks in an ordered list will now also show their numbers.

Closes #2488

Related to #3921
 2015-12-08 16:53:48 -05: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 8fb49a4b70 Merge branch 'master' into merge-if-green 
# Conflicts:
#	app/views/projects/merge_requests/widget/_heading.html.haml
#	app/views/projects/merge_requests/widget/open/_accept.html.haml
 2015-12-08 22:34:03 +01:00
Douwe Maan 23b6a98de0 Move Builds tab to the end 2015-12-08 22:28:28 +01:00