home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 13:46:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,235 Commits 48 Branches 340 Tags
884352294deab0c11845547ce2ab96b60f468458
Commit Graph
1295 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 6e217bd55c Improve accept mr widget UI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-30 17:28:34 +02:00
Dmitriy Zaporozhets 2010ae11f3 Merge branch 'merge-request-commits-view' into 'master' 
Merge request commits view

Changes the commits view of a merge request to use the same layout as used in the project commits view.

As noticed from #923.

This also changes the commits icon on the tab to be fa-history, the same as used in the sidebar

Screenshots [Before](https://gitlab.com/uploads/stephanvl/gitlab-ce/8785737424/Screenshot_from_2014-12-29_20_39_25.png) - [After](https://gitlab.com/uploads/stephanvl/gitlab-ce/a3bf2a790f/Screenshot_from_2014-12-29_20_40_23.png)

See merge request !271
 2014-12-30 13:40:13 +00:00
Stephan van Leeuwen b97b854963 Updated merge request commits view 
The merge request commits tab now uses the same layout as used in the project commits view
 2014-12-29 19:10:53 +01:00
Dmitriy Zaporozhets 95c0393789 Inline protected branches list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-29 19:30:27 +02:00
Marin Jankovski e005d4191a Merge branch 'master' into developer_can_push_to_protected_branches_option 2014-12-29 15:39:03 +01:00
Dmitriy Zaporozhets 86a7787a15 Merge pull request #8324 from cirosantilli/rm-commit 
Remove commit indicator from path on Commits tab [UI]
 2014-12-29 13:41:32 +02:00
Marin Jankovski 42fb42aed4 Merge branch 'master' into developer_can_push_to_protected_branches_option 
Conflicts:
	db/schema.rb
 2014-12-29 09:30:55 +01:00
Dmitriy Zaporozhets 4adc033761 Improve UI for group milestone and project milestone pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-27 16:03:02 +02:00
Marin Jankovski 78865a0c99 Move styling to css. 2014-12-26 17:16:38 +01:00
Marin Jankovski 2cbfc515f2 Move protected branches list to a partial. 2014-12-26 15:36:35 +01:00
Dmitriy Zaporozhets aa54482a37 Fix no-ssh message for non logged in user 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-26 14:53:50 +02:00
Dmitriy Zaporozhets f1c39763c9 Fix UI for no-ssh-key message 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-26 14:25:37 +02:00
Marin Jankovski 92eb3974ac Add option to disable/enable developers push to already protected branches. 2014-12-26 11:39:12 +01:00
Marin Jankovski b7eb0d178e Add checkbox for protected branch developer can push to. 2014-12-26 09:14:53 +01:00
Dmitriy Zaporozhets fca161f5c5 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-25 15:55:12 +02:00
Dmitriy Zaporozhets 7c5bf9372c Merge branch 'master' into ui-improvements 2014-12-25 14:46:58 +02:00
Dmitriy Zaporozhets 88b480174c Improve issue/mr page for tablets 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-25 14:46:18 +02:00
Dmitriy Zaporozhets 5140a4cd13 Set of UI changes mostly for issue and merge request 
* return edit/close buttons to old position (right of title)
* make 'Issue #1' header smaller
* move mr commits to separate tab
* change inline/side diff switcher to buttons from tabs
* make issue sidebar start with dicsussion block

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-25 14:32:49 +02:00
Dmitriy Zaporozhets f0d0b19393 Fold sidebar for mobile devices and expand for desktop 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-25 10:13:45 +02:00
Dmitriy Zaporozhets 5cf2bd4c99 Merge branch 'project-path' into 'master' 
Project path

Fixes gitlab/gitlabhq#1781, gitlab/gitlabhq#1763

See merge request !1337
 2014-12-24 13:27:26 +00:00
Dmitriy Zaporozhets dc24b4d7a2 Merge branch 'sidebar-nav' into 'master' 
Sidebar navigation

This MR changes layout of the GitLab to sidebar navigation.

Layouts:

- [x] Project layout
- [x] Project settings layout
- [x] Dashboard layout
- [x] Profile layout
- [x] Group layout
- [x] Snippets layout
- [x] Admin layout

Pages:

- [x] Activity pages
- [x] Issue/mr pages
- [x] Issues/merge requests pages

Common:

- [x] Fix tests

See merge request !1329
 2014-12-24 13:18:43 +00:00
Dmitriy Zaporozhets 47634e392f Refactor issues and merge requests lists 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-23 18:49:39 +02:00
Dmitriy Zaporozhets 32eb5de510 One column issue/mr lists for project 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-23 17:31:38 +02:00
Dmitriy Zaporozhets 9a8ac2accc Show issuable context labels as blocks 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-23 10:51:14 +02:00
Dmitriy Zaporozhets a2d188f688 Render MR diff full size of screen 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-22 20:36:15 +02:00
Marin Jankovski 8be0c60e40 Remove extra css class markdown-area which prevented attachments upload. 2014-12-22 16:44:14 +01:00
Dmitriy Zaporozhets 5b49bb208a Fix issueable context update and fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-22 16:42:26 +02:00
Dmitriy Zaporozhets ed2bcf952b Set group path during creation 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-22 13:50:58 +02:00
Dmitriy Zaporozhets 59bb635e0e Set project path & name in one field without transforamtion 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-22 13:27:48 +02:00
Dmitriy Zaporozhets e45e6ba2c3 Merge branch 'master' into sidebar-nav 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/layouts/group.html.haml
 2014-12-21 01:20:51 +02:00
Drew Blessing a9761ac1b8 Differentiate system notes 2014-12-20 16:20:29 -06:00
Dmitriy Zaporozhets dc0879ac9e Merge pull request #7882 from cirosantilli/blob-instance-to-local 
Use blob local instead of instance.
 2014-12-20 20:19:59 +02:00
Dmitriy Zaporozhets e007d810c9 Merge pull request #7886 from cirosantilli/disable-blob-edit-mr 
Disable / hide MR edit blob button if cannot edit.
 2014-12-20 20:19:38 +02:00
Dmitriy Zaporozhets b667a45942 Restyle issue/mr/milestone to new layout 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-18 17:22:10 +02:00
Dmitriy Zaporozhets f3f27fee88 Left-side navigation for group layout 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-16 16:58:15 +02:00
skv-headless c4a56797a4 transfer error handler 2014-12-15 16:10:56 +03:00
Dmitriy Zaporozhets 2f13d4daa3 Implement sidebar navigation for project area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-12 21:49:51 +02:00
Vinnie Okada 742e6eeed2 Merge branch 'upstream-master' into markdown-preview 
Conflicts:
	spec/routing/project_routing_spec.rb
 2014-12-07 20:25:58 -07:00
Dmitriy Zaporozhets 8c727feea6 Merge branch 'small-fixes' into 'master' 
Small fixes

Improve application stability over unexpected cases

See merge request !1310
 2014-12-07 12:49:48 +00:00
Dmitriy Zaporozhets 7cefd9c6ef Prevent 500 on MR page if merge_event missing 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-05 18:10:25 +02:00
Dmitriy Zaporozhets e0f30c605b Add author filter for issues & merge requests pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-05 17:13:07 +02:00
Dmitriy Zaporozhets ed2eaf55c1 Move issues/mr filter to partial 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-05 16:59:17 +02:00
Dmitriy Zaporozhets 6487419364 Automatically close merge requests that were locker for 1 day 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-05 16:02:08 +02:00
Dmitriy Zaporozhets d31d711a70 DRY and refactor atom code 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-04 22:14:20 +02:00
Dmitriy Zaporozhets d80a59c7b1 Create helper for sort drowdown option names 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-04 12:10:38 +02:00
Dmitriy Zaporozhets 279952bb78 Show issue/mr id in the list below title 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-03 17:29:52 +02:00
Dmitriy Zaporozhets ac04665a8c Merge branch 'show-cross-project-ref' into 'master' 
Show cross project ref

Fixes #1661

See merge request !1292
 2014-12-03 11:02:34 +00:00
Dmitriy Zaporozhets ed1c22568a Add cross-project reference tooltip for merge request 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-03 11:40:04 +02:00
Dmitriy Zaporozhets ba51a1dd32 Render cross reference in issue title 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-03 11:15:00 +02:00
Dmitriy Zaporozhets a70e7d61ac Merge branch 'improve-form-links-ux' into 'master' 
Improve issuable form links UX

> The create new label / milestone links should open in a new window / popup to avoid losing information already filled in for a new issue.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/855

See merge request !1291
 2014-12-02 21:36:38 +00:00