home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,239 Commits 48 Branches 340 Tags
bbcb70a9dc6d494ec0bd2d4e298075a2ebcec1d5
Commit Graph
14239 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets bbcb70a9dc Add group filtering by name for API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-30 11:30:56 +02:00
Dmitriy Zaporozhets bdac5ddda8 Merge branch 'ee-from-ce' into 'master' 
CE changes from master

Sidebar navigation, OAuth and other changes from CE

See merge request !275
 2014-12-26 15:20:10 +00:00
Dmitriy Zaporozhets 01f7734fd7 Fix EE UI for new layout 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-26 15:16:44 +02:00
Dmitriy Zaporozhets fd1f54b8ab Merge branch 'master' into ee-from-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile
	app/controllers/application_controller.rb
	app/views/admin/groups/_form.html.haml
	app/views/groups/edit.html.haml
	app/views/groups/show.html.haml
	app/views/layouts/nav/_admin.html.haml
	app/views/projects/_settings_nav.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.6.md
 2014-12-26 15:05:43 +02:00
Dmitriy Zaporozhets b01c5d993c New CHANGELOG items 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-25 21:31:04 +02:00
Dmitriy Zaporozhets ed932d82db Merge branch 'oauth2_provider' into 'master' 
Oauth2 provider

Please update #1713

See merge request !1346
 2014-12-25 19:27:07 +00: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 7fe8d41d88 Improve code style 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-25 16:46:28 +02:00
Dmitriy Zaporozhets 6428698580 Merge branch 'ui-improvements' into 'master' 
UI improvements

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

See merge request !1351
 2014-12-25 14:36:34 +00:00
Dmitriy Zaporozhets 40ff1bc8ba Align sidebar navigation differently 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-25 15:55:23 +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 e46f546b4c Merge branch 'fold-sidenav' into 'master' 
Fold sidenav for mobile devices

Fold sidebar for xs and sm displays.

See merge request !1350
 2014-12-25 09:01:37 +00: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
Job van der Voort 4f0d2d3320 Merge branch 'updated-git-packages' into 'master' 
Updated Packages with git fix

See merge request !274
 2014-12-24 16:01:06 +00:00
Patricio Cano 0b4b9e432b Added the new 7.6 packages links 2014-12-24 10:58:49 -05: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
Dmitriy Zaporozhets 63be16008e Hide rack profiler by default 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-24 15:43:45 +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 fe68c45aa5 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-12-24 15:19:44 +02: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 35eec009e5 Fix spinach tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-24 14:34:37 +02:00
Sytse Sijbrandij cdd8adcb10 Link to LDAP doc. 2014-12-24 12:48:40 +01: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 2dece41bd7 Merge branch 'package-dependencies' into 'master' 
Package dependencies documentation

/cc @valery @patricio

See merge request !1349
 2014-12-24 11:02:52 +00: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
Sytse Sijbrandij b3198b61b9 Note what has to be updated for new packages. 2014-12-24 11:45:03 +01: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
Sytse Sijbrandij 2df09c6415 Merge branch 'update-release-steps' into 'master' 
Update release steps

Updated release steps to mention that packages should be built the day before release and that the blog post should mention CI changes.

See merge request !1348
 2014-12-24 07:46:14 +00:00
Patricio Cano 4386c210a1 Updated the monthly release steps 2014-12-23 17:28:09 -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
Jeroen van Baarsen 334f240899 Merge pull request #8362 from bbodenmiller/patch-3 
add missing password prompt to mysqldump
 2014-12-23 16:41:20 +01: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
Dmitriy Zaporozhets 91bb995029 Merge branch 'note-env-variables-in-installation' into 'master' 
Note env variables in installation

See merge request !1342
 2014-12-23 14:44:15 +00:00
Marin Jankovski a2676069b9 Merge branch '7-6-2-ee' into 'master' 
7 6 2 ee packages

The older packages are just moved down instead of sorted. This makes it easier for the person releasing and easier to find the right version.

See merge request !273
 2014-12-23 14:03:01 +00:00
Job van der Voort d4f89dfc62 add 7.6.2 packages 2014-12-23 14:55:04 +01:00
Job van der Voort eb02ef47ae Merge branch 'double-check-blog-post-mention' into 'master' 
Double check blog post mention

See merge request !1347
 2014-12-23 12:46:02 +00:00
Sytse Sijbrandij 6f4332725d Release manager should doublecheck the everyone has been mentioned in the blog post. 2014-12-23 13:39:31 +01:00
Dmitriy Zaporozhets a113ce48e3 Merge branch 'fix-500-after-merge' into 'master' 
Fix 500 on MR diff page after merge and branch was removed

Fixes #1847

See merge request !1345
 2014-12-23 11:18:46 +00:00