home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-25 20:46:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,045 Commits 48 Branches 340 Tags
7b928de03bc2baf7edbd087971d82e07bd5c1957
Commit Graph
3701 Commits
Author SHA1 Message Date
Valery Sizov 8a7993194e Kerberos support 2014-12-15 18:06:17 +02:00
Dmitriy Zaporozhets 177c89b8b8 Merge branch 'ce-changes' into 'master' 
CE changes from upstream

See merge request !266
 2014-12-12 12:25:36 +00:00
Marin Jankovski d991e0b2e9 Merge branch 'fix/project_show_also_ldap_users' into 'master' 
Fix/project show also ldap users

In 336b7b8 a feature was (silently) added which broke our use case of using LDAP synced groups as a common base for user <-> project mapping 😒

Although
>v 7.4.0
>  - [...]
>  - Do not show ldap users in dropdowns for groups with enabled ldap-sync
>  - [...]

indicates that the drop down boxes for groups have changed, it does not for projects in such a group. To be clear: It totally makes sense to not manually manage users for LDAP synced groups, on a project basis however it is very useful and an essential feature to allow self-service in organizations.

Please consider making the `skip_ldap` flag optional for the dropdown boxes.
[Also, make sure that the provider you're excluding actually is called `ldap`, which might not be the case for installations with multiple LDAP backends.](https://gitlab.com/subscribers/gitlab-ee/blob/master/lib/api/users.rb#L16)

This MR is a quick fix to disable this feature for projects.

See merge request !25
 2014-12-12 08:12:52 +00:00
Dmitriy Zaporozhets 1c93d0df7a Merge branch 'master' into ce-changes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
 2014-12-11 18:12:45 +02:00
Dmitriy Zaporozhets 633fb8ab6b Prevent 500 error on ldap group links page 
If group has links to ldap servers that are disabled or removed from
gitlab config.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-08 15:58:01 +02:00
Dmitriy Zaporozhets f5d3e47e39 Hide ldap group links if ldap is not enabled 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-08 15:45:55 +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 3bd66989de Merge branch 'master' into ee-master 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile
	Gemfile.lock
	VERSION
	app/models/project.rb
	app/models/user.rb
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.5.md
	doc/update/7.4-to-7.5.md
	lib/gitlab/git_access.rb
	spec/factories.rb
	spec/lib/gitlab/git_access_spec.rb
 2014-12-05 13:28:32 +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 a46fe875c6 Feature: atom feed for user activity 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-04 21:49:19 +02:00
Dmitriy Zaporozhets e1f1e062a8 Merge branch 'multi_provider' into 'master' 
Supporting for multiple omniauth provider for the same user

fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/1721

and https://dev.gitlab.org/gitlab/gitlabhq/issues/1760

See merge request !1296
 2014-12-04 16:03:04 +00:00
Valery Sizov b56b96d438 added helper 2014-12-04 13:03:55 +02:00
Valery Sizov 3a5ed5260b Supporting for multiple omniauth provider for the same user 2014-12-04 13:03:55 +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 6eb944e52b Merge branch 'rebase_on_merge_request' into 'master' 
Rebase on merge request

Introduces merge request option to rebase before merging.

Issue #185

See merge request !254
 2014-12-03 10:15:41 +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
Dmitriy Zaporozhets 300311f395 Merge branch 'improve-search-ux' into 'master' 
Improve search ux

When I use search from merge requests page I usually want to see merge requests results. If I do search from wiki pages -> I want to see wiki results first.

With this patch search scope is set to issues if you are on issues controller and same for merge requests and wikis

See merge request !1290
 2014-12-02 21:36:10 +00:00
Dmitriy Zaporozhets c5bdc7e13a New label/milestone link from issue form opens in new window 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-02 22:47:19 +02:00
Dmitriy Zaporozhets 5f15ed04fc Respect current controller scope when using search from project area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-02 22:38:45 +02:00
Dmitriy Zaporozhets 12f8699296 Fix safari 8 ui issue 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-02 22:30:06 +02:00
Dmitriy Zaporozhets f447aed26a Merge branch 'improve-mobile-ui' into 'master' 
Improve mobile UI pt2

Next UI elements were improved for mobile view

* comments
* comment form
* issues navigation
* removed duplicate MR sidebar btn
* tabs

Desktop improvements:

* increase comment author username font size
* dark colour for comment author name

Related to #1493

See merge request !1285
 2014-12-02 12:22:26 +00:00
Dmitriy Zaporozhets bf39347970 Merge branch 'larger-avatar' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-12-02 12:44:18 +02:00
Sytse Sijbrandij 8f60144782 Change avatar file size to 200kb. 2014-12-02 10:32:24 +01:00
Dmitriy Zaporozhets 4cbe72d767 UI improvements mostly for mobile screens 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-02 11:31:57 +02:00
Robert Schilling 86c55106a0 Change twitter handle from gitlabhq -> gitlab 2014-12-01 17:45:25 +01:00
Marin Jankovski 27e75a1393 UI fixes for events table 2014-12-01 16:47:36 +01:00
Dmitriy Zaporozhets f53e0fff47 Show username in comment header for easier mention 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-01 17:40:45 +02:00
Dmitriy Zaporozhets 9d93729313 Move projects import to separate resource. Add bare repo creation to repository controller 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-30 00:50:25 +02:00
Dmitriy Zaporozhets a8df4ee9e2 Separate web page for projects without repository 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-30 00:49:51 +02:00
Dmitriy Zaporozhets 674cbe939c Dont allow project creation without repository 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-29 21:34:18 +02:00
Marin Jankovski e4f5b6df0c Do a simpler rebase, show rebase check box only for users how can push code. 2014-11-28 16:48:03 +01:00
Marin Jankovski bd2a29a878 Add option of rebasing before merging. 2014-11-28 10:02:55 +01:00
Marvin Frick ffc7148dd3 kind of reverts 336b7b8 for projects 
For projects one would want to be able do add users from LDAP.
 2014-11-27 14:40:14 +01:00
Marin Jankovski 298ae61dac Add rebase merge request setting to project settings page. 2014-11-26 13:46:34 +01:00
Marin Jankovski 07925be296 Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee 2014-11-24 11:41:27 +01:00
Drew Blessing c65e4f9449 Fix icons for enterprise project settings 2014-11-21 17:12:55 -06:00
Marin Jankovski 8f1190f7c7 Use hash instead of json. 2014-11-21 15:58:21 +01:00
Marin Jankovski e4af2b3db5 Merge branch 'milestones_labels' into 'master' 
Possibility to create Milestones or Labels when Issues are disabled

https://dev.gitlab.org/gitlab/gitlabhq/issues/1682

See merge request !1270
 2014-11-21 11:11:52 +00:00
Marin Jankovski e3d96fc2da Remove table duplication. 2014-11-21 11:28:25 +01:00
Valery Sizov e683d9c087 Possibility to create Milestones or Labels when Issues are disabled 2014-11-20 18:18:16 +02:00
Marin Jankovski f90db27e2a Add audit events feature spec for project. 2014-11-20 11:54:05 +01:00