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
13,235 Commits 48 Branches 340 Tags
884352294deab0c11845547ce2ab96b60f468458
Commit Graph
6420 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 c957285727 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-12-30 16:39:10 +02:00
Dmitriy Zaporozhets 0930086bea Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-30 16:38:27 +02:00
Dmitriy Zaporozhets 792b9920fc Merge pull request #8513 from dblessing/fix_hipchat 
Fix HipChat Server
 2014-12-30 16:38:03 +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
Dmitriy Zaporozhets 5d2e637c17 Group selectbox js 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-30 11:46:48 +02:00
Dmitriy Zaporozhets 27ee0fc57b Helper for ajax group selectbox 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-30 11:46:47 +02:00
Marin Jankovski 82829ed49e Move user key manipulation in admin section to a separate controller. 2014-12-30 10:15:11 +01:00
Drew Blessing 9f9f1b3b87 Fix HipChat Server 2014-12-29 18:51:39 -06: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 95cd5b275a Prevent content overflow for notes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-29 22:59:08 +02:00
Dmitriy Zaporozhets a9cf84e5ac Merge pull request #7675 from yglukhov/patch_notes_api 
Implemented notes (body) patching in API.
 2014-12-29 21:06:49 +02: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
Dmitriy Zaporozhets a0c4fa3174 Use same font size for all sidenav items 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-29 19:11:34 +02:00
Dmitriy Zaporozhets e0459da2a6 Merge branch 'fix-services' into 'master' 
Fix async services execution broken in 7.6

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

See merge request !1360
 2014-12-29 16:31:49 +00: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
Dmitriy Zaporozhets ed4e682eb8 Fix async services execution broken in 7.6 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-29 17:48:43 +02:00
Dmitriy Zaporozhets b07802ab68 Rescue Net::OpenTimeout exception in web hook 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-29 16:41:10 +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 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
Marin Jankovski 1c089a8561 Use shorter search for protected branch status. 2014-12-29 09:04:31 +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 803ca9e8cc Merge pull request #7957 from cirosantilli/rm-unused-project-code 
Remove unused Project#code function [failure unrelated]
 2014-12-28 22:15:43 +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
Dmitriy Zaporozhets 25a42a56cf Merge pull request #8439 from glasspelican/Teamcity 
Teamcity integration using 8.1 rest api
 2014-12-28 22:11:29 +02:00
Dmitriy Zaporozhets afccd3245a Merge branch 'ui-fixes' into 'master' 
Ui fixes

Fixes the ui bugs described in #925.

Also added the suggestion to keep the header at the top of the page.

Fixes #925

Some before/after screenshots:

- Border doesn't reach bottom on smaller pages
  - [Before](https://gitlab.com/uploads/gitlab-org/gitlab-ce/5096094d94/Screenshot_from_2014-12-27_19_49_24.png)
  - [After](https://gitlab.com/uploads/gitlab-org/gitlab-ce/551c1924e4/Screenshot_from_2014-12-27_19_51_43.png)

- Ability to always scroll 48px (visible by the scrollbar)
  - [Before](https://gitlab.com/uploads/gitlab-org/gitlab-ce/ea591bf7b3/Screenshot_from_2014-12-27_19_53_41.png)
  - [After](https://gitlab.com/uploads/gitlab-org/gitlab-ce/97df62b40d/Screenshot_from_2014-12-27_19_53_17.png)

- Mobile sidebar icons off screen (Visible by the scrollbar on the after picture)
  - [Before](https://gitlab.com/uploads/gitlab-org/gitlab-ce/b6d9a4d076/Screenshot_from_2014-12-27_19_49_05.png)
  - [After](https://gitlab.com/uploads/gitlab-org/gitlab-ce/fc52ac31ba/Screenshot_from_2014-12-27_19_48_16.png)

- Header fixed at top
  - [Before](https://gitlab.com/uploads/gitlab-org/gitlab-ce/5d74dc1ea5/Screenshot_from_2014-12-27_19_59_28.png)
  - [After](https://gitlab.com/uploads/gitlab-org/gitlab-ce/57c4c3ea7d/Screenshot_from_2014-12-27_20_00_05.png)

See merge request !269
 2014-12-28 19:48:29 +00:00
Stephan van Leeuwen 6342bc2994 Changed header to stay at the top of the page. 2014-12-27 20:08:29 +01: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 9fd061807e Update on the correct checkbox. 2014-12-26 15:55:58 +01:00
Marin Jankovski 16ebeedef2 Update branch status with ajax call. 2014-12-26 15:37:04 +01:00
Marin Jankovski 2cbfc515f2 Move protected branches list to a partial. 2014-12-26 15:36:35 +01:00
Stephan van Leeuwen 071ad02c02 Updated mobile sidebar to allow scrolling 2014-12-26 15:29:19 +01:00
Stephan van Leeuwen 1b6ebd1717 Updated sidebar style to span the whole height. 2014-12-26 15:29:02 +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 573d554c69 set z-index for navbar and sidebar explicitly 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-26 14:34: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