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
3594 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
Dmitriy Zaporozhets 0991d19c0d Merge branch 'user_ssh_keys_on_admin' into 'master' 
User ssh keys on admin

Show user ssh keys on admin user page.

See merge request !1362
 2014-12-30 12:02:16 +00:00
Marin Jankovski 607ea7c6e5 Share the key table between admin and profile resources. 2014-12-30 11:01:30 +01:00
Marin Jankovski 82829ed49e Move user key manipulation in admin section to a separate controller. 2014-12-30 10:15:11 +01:00
Dmitriy Zaporozhets da9d827904 Merge branch 'inline-protected-branches' into 'master' 
Improve UI for protected branches

See merge request !1361
 2014-12-29 21:08:21 +00:00
Dmitriy Zaporozhets 159ba9b958 Merge pull request #8496 from NARKOZ/644 
chmod -x
 2014-12-29 21:04:58 +02: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 f0085d034b Reuse show page for user keys. 2014-12-29 17:09:39 +01:00
Marin Jankovski 492f3a4779 Add user key actions to admins. 2014-12-29 17:07:23 +01: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 cf95736865 New feature: add 'Mention' notification level 
It does disable all emails expect system one or when you was @mentioned

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-29 15:55:21 +02:00
Dmitriy Zaporozhets 6aec286fca Fix navbar items for mobile biew 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-29 13:58:01 +02:00
Dmitriy Zaporozhets f0b8477cda Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-12-29 13:47:20 +02:00
Dmitriy Zaporozhets 7c737aa697 Merge branch 'vicvega-check_browser_version' into 'master' 
Check browser version

Fix conflicts and merge https://github.com/gitlabhq/gitlabhq/pull/8385

See merge request !1357
 2014-12-29 11:44:32 +00: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 6cf501004b Merge pull request #8442 from Hexide/dev-email-template-dates 
Add commit dates to repository-push email tempalte
 2014-12-28 22:16:32 +02:00
Dmitriy Zaporozhets 3d3c7e743f Merge branch 'check_browser_version' of https://github.com/vicvega/gitlabhq into vicvega-check_browser_version 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	app/assets/stylesheets/generic/common.scss
 2014-12-28 22:13:31 +02:00
Nihad Abbasov c2331d87e5 chmod -x 2014-12-27 19:22:15 +04: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
Dmitriy Zaporozhets 465f186954 Show assigned issues/mr be default on dashboard 
This was default before but now it fixed with providing assignee_id
parameter making url shareble and dont reset when other filters users.

Also this commit removes old methods that are not used any more.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-26 18:33:53 +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 a248efadf7 Fix links for no-ssh message 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-26 14:28:49 +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 d2bd5e833f Fix nav_link support for several path options 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-25 20:51:07 +02:00
Dmitriy Zaporozhets f9ece12e87 Merge branch 'master' into oauth2_provider 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/layouts/nav/_profile.html.haml
 2014-12-25 18:48:15 +02:00
Dmitriy Zaporozhets aadfb3665f Fix tests and add message if no oauth apps 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-25 18:46:19 +02:00
Dmitriy Zaporozhets 592e396869 Rework oauth2 feature 
* improve UI
* add authorization
* add separate page for oauth applications

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-25 18:35:04 +02: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 99e52c9ad0 Small UI imporovement for merge request accept widget and projects page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-25 14:58:43 +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 b4e6dec890 fold-subnav class for folded sidebar navigation. Dashboard and project nav adopted 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-24 18:34:14 +02:00
Francesco Coda Zabetta 84b40a346a check browser version, blacklisting outdated IE (version < 10) 2014-12-24 16:22:08 +01:00
Dmitriy Zaporozhets fe104386b1 Fix layout if broadcast message enabled 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-24 16:15:45 +02:00
Valery Sizov a61ccd4ad2 convert erb to haml 2014-12-24 15:44:17 +02:00
Valery Sizov e41dadcb33 Doorkeeper integration 2014-12-24 15:38:07 +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 7b792af872 Improvements to issues/mr filters: 
* use filter_params variable when set filter values
* fix project issues spinach tests

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-24 11:39:03 +02: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