home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 08:36:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
15,484 Commits 48 Branches 340 Tags
5fa7be3ab40de4cb411bf47e1afd417023e54bc9
Commit Graph
15484 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schilling 5fa7be3ab4 Remove superseeded changelog entry for commit calendar 2015-04-13 20:35:50 +02:00
Robert Schilling 1265dccb6b Fix wrong merged changelog entries 2015-04-13 20:01:43 +02:00
Dmitriy Zaporozhets 4ab717ea6a Merge branch 'ldap_migration' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
 2015-04-13 17:18:02 +03:00
Dmitriy Zaporozhets ecb58dacd6 Merge branch 'reference-access-control' into 'master' 
Only allow users to reference groups, projects, issues, MRs, commits they have access to.

Addresses https://dev.gitlab.org/gitlab/gitlabhq/issues/2183.

See merge request !1742
 2015-04-13 14:10:25 +00:00
Dmitriy Zaporozhets 8cf1a6f0a3 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-13 17:00:24 +03:00
Dmitriy Zaporozhets f57dac2712 Bump gitlab-shell version 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-13 16:59:56 +03:00
Jacob Vosmaer f39b150a02 Call your existing LDAP server 'main' 
By imposing this rule we avoid having to demand that 'ldapmain' exists
in the settings initializer.
 2015-04-13 15:45:19 +02:00
Dmitriy Zaporozhets 6e88d9335b Merge branch 'skip-email-reconfirmation' into 'master' 
Skip email confirmation when set by admin or via LDAP.

Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2203.

See merge request !494
 2015-04-13 13:44:56 +00:00
Dmitriy Zaporozhets 7f04a4174e Merge branch 'shell-version-warning' into 'master' 
Warn when gitlab-shell version doesn't match requirement.

Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/1791.

See merge request !495
 2015-04-13 13:05:47 +00:00
Dmitriy Zaporozhets 3092e7f86a Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-04-13 15:52:07 +03:00
Dmitriy Zaporozhets c543cd1ed3 Fix performance issue when browse big diffs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-13 15:51:28 +03:00
Jacob Vosmaer 65a3928b0b Remove test for 'ldap' provider special case 2015-04-13 12:58:10 +02:00
Jacob Vosmaer afa47eddcc Also ldap_group_links where provider='ldap' 2015-04-13 11:56:35 +02:00
Jacob Vosmaer 8476d171cc Merge branch 'ldap_migration' of dev.gitlab.org:gitlab/gitlabhq into ldap_migration 2015-04-13 11:52:05 +02:00
Jacob Vosmaer ec7a68a1a5 Simplify legacy LDAP config interpretation 2015-04-13 11:50:44 +02:00
Jacob Vosmaer 8b4705fea6 Make migration work if LDAP is disabled 2015-04-13 11:50:00 +02:00
Dmitriy Zaporozhets 04f05ac1fb Check for table instead of class 2015-04-13 12:26:14 +03:00
Jacob Vosmaer f64db1fab9 Try to explain what we are doing 2015-04-13 11:22:31 +02:00
Dmitriy Zaporozhets 9e848bcd5a Merge pull request #9104 from jdsn/fix-issue9098-clean_path 
Fix issue9098 clean path
 2015-04-13 12:17:35 +03:00
Dmitriy Zaporozhets 9c14ed0689 Merge branch 'public-deploy-keys' into 'master' 
Allow admin to create public deploy keys that are accessible to any project.

Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/1774.

Project settings:

![Screen_Shot_2015-03-27_at_14.46.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/01799ff912671ba6db3f828ea1aca1a6/Screen_Shot_2015-03-27_at_14.46.48.png)

The "Public deploy keys" section is only shown when there are any. If there are public deploy keys but no project deploy keys, only public deploy keys are shown. If there are no public deploy keys and no project deploy keys, the current "Deploy keys from projects you have access to will be displayed here" placeholder is shown.

The list of projects below the public key has been changed to only show projects the user has access to.

"Public deploy key" seems to be repeated on the left, but the first is just the title. The label is always visible for public deploy keys.

Admin index:

![Screen_Shot_2015-03-27_at_14.47.06](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ea889d274cfd3f0694d47d602f4f3e94/Screen_Shot_2015-03-27_at_14.47.06.png)

Admin detail page:

![Screen_Shot_2015-03-27_at_14.47.16](https://gitlab.com/gitlab-org/gitlab-ce/uploads/8c8475e05bf6b497da3b9f1bc102329f/Screen_Shot_2015-03-27_at_14.47.16.png)

Projects using the deploy key are listed on the left and can be disabled easily.

See merge request !469
 2015-04-13 09:08:13 +00:00
Jacob Vosmaer 325b66365b Remove special cases for the 'ldap' provider 2015-04-13 11:04:31 +02:00
Dmitriy Zaporozhets 0c24192fb1 Merge branch 'fix-group-project-list-cache' into 'master' 
Bust group page project list cache when namespace name or path changes.

Fixes gitlab-com/support-forum#144.

See merge request !509
 2015-04-13 09:01:03 +00:00
Dmitriy Zaporozhets 896ea2482b Change migration to SQL 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-13 11:50:21 +03:00
Dmitriy Zaporozhets 3723a9dcd1 Merge pull request #9117 from bbodenmiller/patch-12 
document support for inline HTML
 2015-04-12 22:16:33 +03:00
Robert Schilling efd519d762 Merge pull request #9120 from bbodenmiller/patch-4 
fix link to details on how to run the tests
 2015-04-12 14:11:05 +02:00
Ben Bodenmiller f59a2e2dd6 fix link to details on how to run the tests 
[ci skip]
 2015-04-12 04:50:43 -07:00
Dmitriy Zaporozhets 8d9d63b250 Merge branch 'arbitrary-local-repo-import' into 'master' 
Prevent arbitary local repos from being imported.

Fixes gitlab/gitlab-ee#263.

See merge request !1763
 2015-04-12 10:21:15 +00:00
Dmitriy Zaporozhets 73269a0a3a Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-12 12:54:48 +03:00
Dmitriy Zaporozhets f244914402 Merge branch 'regex-start-of-string' into 'master' 
Fix persistent XSS vulnerability around profile website URLs.

Fixes gitlab/gitlab-ee#268

See merge request !1761
 2015-04-12 07:36:40 +00:00
Dmitriy Zaporozhets 9df1476305 Merge branch 'rs-issue-1942' into 'master' 
Upon successful login, clear `reset_password_token` field

Closes #1942

See merge request !1757
 2015-04-12 07:33:06 +00:00
Dmitriy Zaporozhets 0e09cb2805 Merge branch 'rs-issue-2214' into 'master' 
Rename all uses of Buildbox to Buildkite

Closes #2214

See merge request !1759
 2015-04-12 07:29:43 +00:00
Robert Schilling 52db4e8a98 Merge branch 'fix-typo-starred-projects' into 'master' 
Fix typo

See merge request !511
 2015-04-12 07:21:43 +00:00
Stan Hu 8ce69bdc8e Fix typo 2015-04-11 21:13:14 -07:00
Robert Speicher bb5f3e7897 Add CHANGELOG entry for Buildkite service renaming 2015-04-11 14:05:23 -04:00
Robert Speicher 1fd03a9b79 Add migration to rename BuildboxService to BuildkiteService 2015-04-11 14:05:23 -04:00
Robert Speicher 307962a046 Rename last uses of Buildbox to Buildkite 2015-04-11 14:05:22 -04:00
Robert Speicher 93b1767799 Move buildbox_service files to buildkite_service 2015-04-11 14:05:22 -04:00
Robert Speicher 4077f66beb Sort available_services_names array alphabetically 2015-04-11 14:05:22 -04:00
Valery Sizov 8666f497ff fix ldap identities 2015-04-11 17:56:45 +03:00
Douwe Maan 0988be4efa Fix a whoopsie daisy in the changelog. 2015-04-11 11:40:51 +02:00
Douwe Maan 9e52a2dcab Don't use URI.regexp to validate since it doens't have start/end anchors. 2015-04-11 11:38:14 +02:00
Douwe Maan cebb74a0c0 Fix project import URL regex to prevent arbitary local repos from being imported. 2015-04-11 11:37:58 +02:00
Douwe Maan 940150dc9a Merge branch 'bump-gitlab-shell' into 'master' 
Bump gitlab-shell

Fix git over ssh errors 'fatal: protocol error: bad line length character'

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

cc @DouweM @patricio

See merge request !506
 2015-04-11 09:19:25 +00:00
Ben Bodenmiller efe023e795 document support for inline HTML 2015-04-11 01:38:34 -07:00
Dmitriy Zaporozhets 5155b9794d Merge pull request #9076 from dsander/event-title-width 
Fix event-title max-width in the dashboard
 2015-04-10 21:29:52 +03:00
Dmitriy Zaporozhets 0d881c7873 Merge pull request #9114 from dreis2211/dreis2211-patch-1 
Include creator_id in project info of API
 2015-04-10 21:29:10 +03:00
Christoph Dreis d570d0a280 Update API documentation of projects with creator_id 2015-04-10 20:05:01 +02:00
Dmitriy Zaporozhets 705e43bf04 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-10 19:39:11 +03:00
Christoph Dreis 1fdc610fa5 Include creator_id in project info of API 2015-04-10 18:35:05 +02:00
Douwe Maan 0ece6bd828 Use \A and \z in regexes instead of ^ and $. 2015-04-10 18:31:07 +02:00