home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 03:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
17,590 Commits 48 Branches 340 Tags
4ffa34a4d69930fa2c8f4ac8f4d7e6aa79102ced
Commit Graph
17590 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Douwe Maan 4ffa34a4d6 Only show historical active user cound when current doesn't exceed limit. 2015-05-07 22:52:52 +02:00
Douwe Maan 45ab4d10ef Validate historical active user count when uploading license. 2015-05-07 22:38:22 +02:00
Douwe Maan 85c04a8aa6 Track historical active user count. 2015-05-07 22:38:17 +02:00
Douwe Maan fbb011be38 Merge branch 'license' into 'master' 
Allow license to be uploaded and enforce its validity.

Addresses #274.

Still a work in progress, there are no tests yet, some things need extra validation or prettier error messages, and we're not doing anything to enforce active user count yet. Still, the flow stands! Let me know what you think :)

- [x] Check active user count at moment of upload
- [x] Prettier validation / error message when license is invalid
- [x] Prettier error when public key is invalid
- [x] Tests
- [x] Work on copy

These will go into separate MRs as they require more discussion:

- Check historic active user count over past year
- Add application setting to disallow creating/activating new user when limit is reached

-----

No license:

![no_license](https://dev.gitlab.org/gitlab/gitlab-ee/uploads/41168c7141b3c121f2d3137b8566f467/no_license.png)

Also shown when pushing code:

![no_license_shell](https://dev.gitlab.org/gitlab/gitlab-ee/uploads/bc11926a59b266d28ffd61b3de48d54b/no_license_shell.png)

The "Upload a new license in the admin area" part is only for admins, regular users will see "Ask an admin to upload a new license".

Upload page in admin area:

![upload_license](https://dev.gitlab.org/gitlab/gitlab-ee/uploads/44d28581dd0629e67fb014a817ca5675/upload_license.png)

License details in admin area:

![license](https://dev.gitlab.org/gitlab/gitlab-ee/uploads/8836f2b6e0bf8db28673d758eb57338b/license.png)

Notice of a license that will expire: Also notice the license history at the bottom.

![license_will_expire](https://dev.gitlab.org/gitlab/gitlab-ee/uploads/5396b6b3e46f5bb53d5ce33cf5bd23ea/license_will_expire.png)

Notice of an expired license:

![license_expired](https://dev.gitlab.org/gitlab/gitlab-ee/uploads/d4b582a212738054f52ed1909e45568d/license_expired.png)

cc @dzaporozhets @sytse

See merge request !383
 2015-05-07 18:54:47 +00:00
Douwe Maan f709f76877 Make sure test license is setup in all tests. 2015-05-07 20:01:45 +02:00
Marin Jankovski 13cabe8cb1 Revert "add 7.10.2-ee pkgs" 
This reverts commit 76383e9f02.
 2015-05-07 15:57:03 +02:00
Job van der Voort f91f583ff7 Merge branch '7102' into 'master' 
add 7.10.2-ee pkgs

See merge request !389
 2015-05-07 07:55:09 +00:00
Job van der Voort 76383e9f02 add 7.10.2-ee pkgs 2015-05-07 09:54:39 +02:00
Dmitriy Zaporozhets 201f867e69 Merge branch 'ce-to-ee' into 'master' 
CE to EE

See merge request !387
 2015-05-06 12:54:38 +00:00
Dmitriy Zaporozhets 23b4cc060f Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
 2015-05-06 14:28:11 +03:00
Dmitriy Zaporozhets 548b41bf6d Fix db schema 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-06 14:26:46 +03:00
Dmitriy Zaporozhets 12966fb62d Merge branch 'skip-commit-git-hook-for-tag' into 'master' 
Skip git hooks commit validation when pushing new tag.

Addresses gitlab/gitlabhq#2190.

See merge request !386
 2015-05-06 11:23:20 +00:00
Robert Schilling 7af59c54fc Merge pull request #9248 from rumpelsepp/fix-modal 
Fix a trailing new line
 2015-05-06 12:43:03 +02:00
Stefan Tatschner dc68179b59 Fix a trailing new line 
The "How to Merge" modal included a trailing new line in the code
block. This commit removes that disfigurement.
 2015-05-06 11:10:48 +02:00
Jeroen van Baarsen 2856d5f9fc Merge pull request #9241 from Soullivaneuh/button-type 
Fix missing button types
 2015-05-06 10:19:17 +02:00
Dmitriy Zaporozhets b4150137e9 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-06 11:16:01 +03:00
Dmitriy Zaporozhets f4de5d519d Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-05-06 11:15:41 +03:00
Dmitriy Zaporozhets bb3d7b0558 Merge branch 'refactor-project-page' into 'master' 
Improve project home page usability

I looked at project page and saw next problems with it:

* a lot of information but not separated on blocks - hard to understand
* unclear how to contribute to project

Instead of complete redesign I followed step-by-step changes.

### Step 1

First of all I separated Repository and Contribution blocks.
Contribution block should makes it easy for people to contribute. Even when we visit GitHub project page its not clear how to start. Our Contribution section should help with it. All repository stats and download button moved to Repository block.

![Screenshot_2015-05-05_11.49.16](https://gitlab.com/gitlab-org/gitlab-ce/uploads/e69977603acfdc381acb539b19e8cba1/Screenshot_2015-05-05_11.49.16.png)

### Step 2

Next step was to make top section less loaded. I moved clone panel to sidebar because it is very heavy element and rarely used. If you use web editor - you dont even use it. If you work via http/ssh you will copy remote only once. So my idea - it should be on home page but should not be in center of attention.

![Screenshot_2015-05-05_12.47.04](https://gitlab.com/gitlab-org/gitlab-ce/uploads/41633cc8915bb12c979230567b40aea4/Screenshot_2015-05-05_12.47.04.png)

See merge request !610
 2015-05-06 08:14:10 +00:00
Robert Schilling 9184657871 Merge branch 'fix-devise-email-display-name' into 'master' 
Use the configured display name in e-mails from Devise mailer

By default, it is set to "GitLab", but a user may configure the display name to something else.

See merge request !613
 2015-05-06 06:20:21 +00:00
Robert Schilling f78cd577e5 Merge branch 'improve-restricted-domains-help' into 'master' 
Improve help line for restricted domain signups

The setting may be misconstrued as only allowing access from certain domains. Add help to clarify this applies to e-mail domains.

See merge request !612
 2015-05-06 06:17:30 +00:00
Stan Hu 1dc906d586 Use the configured display name in e-mails from Devise mailer 2015-05-05 19:54:21 -07:00
Stan Hu a1c6f7ce20 Improve help line for restricted domain signups 2015-05-05 19:46:37 -07:00
Dmitriy Zaporozhets 16db90e5fc Fix project test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-05 21:43:33 +03:00
Dmitriy Zaporozhets cecfbd55de Restlye project sidebar a bit to make it more clear 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-05 19:38:53 +03:00
Dmitriy Zaporozhets 3b0cf49f33 Fix project description and avatar alignment 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-05 19:25:18 +03:00
Patricio Cano 69f3b40031 Fixed broken permissions link. 2015-05-05 16:14:54 +00:00
Dmitriy Zaporozhets 2a1be883c8 Add changelog item 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-05 18:34:49 +03:00
Dmitriy Zaporozhets ac7b12c0e8 Fix right margin for project description 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-05 18:34:05 +03:00
Dmitriy Zaporozhets ebcc810b9d Remove project dropdown and fix db sche,a 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-05 18:29:23 +03:00
Dmitriy Zaporozhets 5bff135fb3 Merge branch 'fix_ci_services' into 'master' 
Fix CI links on MR page

Fixes gitlab-org/gitlab-ci#145

See merge request !609
 2015-05-05 15:22:01 +00:00
Dmitriy Zaporozhets 30c6dbe36d Show CI link on project home page only if CI enabled 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-05 17:30:50 +03:00
Douwe Maan 359c039b6e Fix Git access check. 2015-05-05 16:27:21 +02:00
Douwe Maan fdcf8732e3 Use spec/support/license in feature specs. 2015-05-05 16:14:58 +02:00
Dmitriy Zaporozhets 040ee6f897 Reorganize elements in project sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-05 16:45:53 +03:00
Douwe Maan 4dfaed34b2 Skip git hooks commit validation when pushing new tag. 2015-05-05 15:44:36 +02:00
Douwe Maan c9d1a9d096 Move license setup to spec/support. 2015-05-05 15:20:28 +02:00
Douwe Maan 97bfd764b7 Add feature specs for license upload. 2015-05-05 14:13:57 +02:00
Douwe Maan 3a6b9ad85e Test license blocking changes. 2015-05-05 13:20:40 +02:00
Douwe Maan f00e1d3dda Add page titles. 2015-05-05 13:04:25 +02:00
Douwe Maan 2bb2ade50d Merge branch 'master' into license 
# Conflicts:
#	db/schema.rb
 2015-05-05 13:03:33 +02:00
Valery Sizov 2144cc710a fix gitlab CI links 2015-05-05 14:02:31 +03:00
Douwe Maan caa09e6951 Add License unit test. 2015-05-05 13:02:17 +02:00
Dmitriy Zaporozhets 68ee397208 Merge branch 'ce-to-ee' into 'master' 
CE to EE

See merge request !385
 2015-05-05 10:52:36 +00:00
Douwe Maan e715489882 Setup license in test env. 2015-05-05 12:44:06 +02:00
Douwe Maan 5a14f5a49e Tweak flash messages around license upload/removal. 2015-05-05 12:19:47 +02:00
Douwe Maan 60323c6143 Validate that new license hasn't expired already. 2015-05-05 12:19:33 +02:00
Dmitriy Zaporozhets 7da7a790fa Move clone panel to sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-05 13:09:50 +03:00
Douwe Maan 6d093d84b1 Show prettier error message when license file is invalid. 2015-05-05 11:49:28 +02:00
Douwe Maan 6ff860d1fe Show nice error when no license was selected. 2015-05-05 10:54:07 +02:00
Douwe Maan 10e6aa62b9 Validate number of active users at time of upload. 2015-05-05 10:53:51 +02:00