home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-18 00:56:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
8955 Commits
Author SHA1 Message Date
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 8045d96ea8 Fix diff comments 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-24 13:39:35 +02:00
Dmitriy Zaporozhets 97d7c06f78 Fix scroll problems and disable authorized_only filter 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-24 12:56:03 +02: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 016981c009 Refactor issuable list pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-24 11:04:33 +02:00
Jason Lippert 1fa19401e9 Teamcity interaction using 8.1 rest api 2014-12-23 12:38:25 -05: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 ad85f1ea78 Merge branch 'remove_extra_css_class_from_markdown' into 'master' 
Remove extra css class from markdown

Extra css class prevented attachments uploader from functioning correctly.

This caused dropzone wrapper classes to be appended to the wrong class and further prevented the dropzone gem from functioning correctly.

Removing this extra class allows attachment upload to function again while keeping the feature introduced here intact.

Fixes #1831

See merge request !1338
 2014-12-23 14:45:02 +00:00
uranandyglukhov b34e83d261 Corrected validation of 'Create branch' and 'Create tag' buttons 2014-12-23 16:04:39 +02:00
Dmitriy Zaporozhets 90ed76ac3c Prevent 500 after merge MR if you check remove source branch 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-23 11:22:12 +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 fb7be3238d For API compatibility still generate path from name if only name provided 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-22 17:09:48 +02: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 1f2628fe21 Allow Group path to be changed at the same time as name 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-22 15:02:47 +02:00
Dmitriy Zaporozhets 52a8e5c01a Set group name from path in admin controller 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-22 13:55:32 +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
Dmitriy Zaporozhets bcc04adb13 Css/views cleanup after layout restyle 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-21 01:11:08 +02:00
Dmitriy Zaporozhets abd83baeab Admin area using side nav 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-21 00:23:17 +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 a978673362 Merge pull request #8451 from skv-headless/transfer-error-handler 
transfer error handler
 2014-12-20 19:46:04 +02:00
Dmitriy Zaporozhets b136976ab1 Merge pull request #8452 from dblessing/feature/theme_class 
Add theme type css class
 2014-12-19 22:28:18 +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 c0d589dedb Improve sidenav colors 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-17 13:10:58 +02:00
Dmitriy Zaporozhets d6eda842a9 Sidenav for profile area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-17 12:44:36 +02:00
Dmitriy Zaporozhets 51ee71d8e0 Migrate public layouts to new design 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-17 12:26:33 +02:00
Dmitriy Zaporozhets eb2face2cb Dashboard layout uses sidenav 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-17 12:20:05 +02:00
Dmitriy Zaporozhets 06a219baa5 Restyle group page and event filter 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-16 18:15:48 +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
Drew Blessing f06f69b9da Add theme type css class 2014-12-15 13:21:26 -06:00
Dmitriy Zaporozhets 7b71a9e221 Add icons to project sidenav 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-15 20:00:44 +02:00
Dmitriy Zaporozhets 5f797be0e8 Mobile UI fixes for sidebar nav 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-15 18:06:03 +02:00
Dmitriy Zaporozhets 5f63c00598 Fix graph and settings highlight 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-15 17:46:36 +02:00
Dmitriy Zaporozhets 4ab728bfe8 Fix random Argument error when update note 
In some strange cases Ruby thinks `system` is not AR field but
Kernel.system call and raises exception during save. It should prevent
this random wierd behaviour

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-15 16:31:23 +02:00
skv-headless c4a56797a4 transfer error handler 2014-12-15 16:10:56 +03:00
Jeroen van Baarsen 4eb3c47d4e Fixed a lot of already defined notices 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-12-14 15:13:09 +01:00
Dmitriy Zaporozhets 6ef75dc778 Style app logo for sidenav 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-12 22:13:59 +02: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
Dmitriy Zaporozhets 118bd7178b Sanitize snippet file name in raw headers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-12 13:28:48 +02:00
Dmitriy Zaporozhets f28a12a559 Add strict validation to snippet file names 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-12 13:15:42 +02:00
Dmitriy Zaporozhets 9a3ae331ad Merge branch 'dropdown_icon_not_clickable' into 'master' 
Dropdown icon not clickable

Fixes #1642 by using `pointer-events` property supported by [modern browsers](http://caniuse.com/#search=pointer-events)

See merge request !1319
 2014-12-11 15:02:01 +00:00