home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 18:46:10 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,646 Commits 48 Branches 340 Tags
083662f618bbadd512f8c895d8a73687641118ad
Commit Graph
335 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets ae713ae8fc 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
	doc/README.md
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.12.md
	doc/workflow/README.md
 2015-06-17 11:25:59 +02:00
Dmitriy Zaporozhets 7300729190 Merge branch 'rs-dev-issue-2228' into 'master' 
Allow user to customize default Dashboard page

Renames the "Design" profile page to "Preferences" and adds a field to customize the default Dashboard page:

> ![Screen_Shot_2015-06-11_at_11.12.53_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b5282a3be7861d1148528c6bc9e7a0e0/Screen_Shot_2015-06-11_at_11.12.53_PM.png)

See merge request !778
 2015-06-15 11:29:36 +00:00
Dmitriy Zaporozhets 5c6d83b8e7 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-14 12:46:22 +02:00
Dmitriy Zaporozhets b645f0f432 Merge pull request #9340 from jvanbaarsen/update-noteable 
Update noteable after a new note is added
 2015-06-14 12:46:07 +02:00
Robert Speicher 422236c71e Change foo.should syntax to expect(foo).to in specs 2015-06-13 18:37:30 -04:00
Robert Speicher 75a40ad5bc Change foo.should_not syntax to expect(foo).not_to in specs 2015-06-13 18:19:24 -04:00
Robert Speicher 844d72716e Add Gitlab::Themes module; remove Gitlab::Theme 
Now we can simply loop through all themes, among other things.

This also removes the `dark_theme` / `light_theme` classes and the
`theme_type` helper, since they weren't used anywhere.
 2015-06-13 17:58:16 -04:00
Douwe Maan 844cca4a1e Add Git hook to validate maximum file size. 2015-06-09 10:23:38 +02:00
Dmitriy Zaporozhets a83d0034e3 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/services/files/base_service.rb
	app/services/files/create_service.rb
	app/services/files/delete_service.rb
	app/services/files/update_service.rb
	doc/workflow/README.md
 2015-06-08 18:24:34 +02:00
Dmitriy Zaporozhets c8a845b200 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee 2015-06-05 18:19:38 +02:00
Dmitriy Zaporozhets c9f1fb574f Remove upgrader test because it does not apply to ee tags set 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-05 17:19:48 +02:00
Dmitriy Zaporozhets f34e8a265a Fix JIRA integration 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-05 15:32:23 +02:00
Dmitriy Zaporozhets ada2be3c21 Fix spinach tests and some specs after merge CE into EE 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-05 15:24:36 +02:00
Jeroen van Baarsen fbdaf0e2a5 Update noteable after a new note is added 
**What does this do?**
It makes sure that whenever a new note is added to an noteable item, the
updated_at of that item is also updated.

**Why is this needed?**
At this moment when you post a comment on an issue or add a label to an issue,
the updated_at is not changed. Because of this the filtering for least recently
updated is not really useful (since it only takes in account the original text
from the noteable).

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-06-05 15:22:55 +02:00
Douwe Maan 3f59a8f0be Merge branch 'cernvcs/gitlab-ce-feature/auto_link_ldap_omniauth' 2015-06-05 13:34:25 +02:00
Dmitriy Zaporozhets 935fc796d1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/controllers/admin/application_settings_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/controllers/projects/project_members_controller.rb
	app/helpers/application_settings_helper.rb
	app/models/user.rb
	app/services/files/base_service.rb
	app/views/profiles/accounts/show.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.11.md
	doc/workflow/README.md
	lib/gitlab/markdown/external_issue_reference_filter.rb
	lib/gitlab/reference_extractor.rb
	lib/gitlab/upgrader.rb
 2015-06-05 11:40:36 +02:00
Alex Lossent 7a52573681 Prevent LDAP group sync from removing a group's last owner 2015-06-05 11:06:08 +02:00
Dmitriy Zaporozhets 9287865599 Merge branch 'fix-upgrader-script' into 'master' 
Fix upgrader script

This is a fix for upgrader script not guessing the latest version correctly.

Upgrader now handles versions where a version part (major/minor/patch) can have multi-digit number, also ensures that the latest version is chosen from git tags by converting tag to Gitlab::VersionInfo and than selecting the latest/greatest version.

Fixes: #1476

See merge request !695
 2015-06-04 16:01:13 +00:00
Alex Lossent dfcea8ed51 Add option to automatically link omniauth and LDAP identities 
Until now, a user needed to first sign in with his LDAP identity and then manually
link his/her account with an omniauth identity from their profile.
Only when this is done can the user authenticate with the omniauth provider and at
the same time benefit from the LDAP integration (HTTPS authentication with LDAP
username/password and in EE: LDAP groups, SSH keys etc.).
This feature automates the process by looking up a corresponding LDAP person when a
user connects with omniauth for the first time and then automatically linking the LDAP
and omniauth identities (of course, like the existing allow_single_sign_on setting,
this is meant to be used with trusted omniauth providers).
The result is identical to a manual account link.

Add config initializers for other omniauth settings.
 2015-06-03 11:46:20 +02:00
Dmitriy Zaporozhets 79aac2c128 Merge branch 'ignore-references' into 'master' 
Don't notify users mentioned in code blocks or blockquotes.

cc @rspeicher

See merge request !753
 2015-06-02 18:39:18 +00:00
Robert Speicher 9e7a9c63a5 Further limit the limited whitelist for project/group descriptions 2015-06-02 13:41:12 -04:00
Robert Speicher 79c4e3899f Rename ReferenceFilterSpecHelper to FilterSpecHelper 
And make it more generalized for all filter specs.
 2015-06-02 13:27:53 -04:00
Robert Speicher 023dd2907b Add a pipeline context option for SanitizationFilter 
When this option is `:description`, we use a more restrictive whitelist.
This is used for Project and Group description fields.
 2015-06-02 13:04:10 -04:00
Douwe Maan 94919c7ef6 Ignore references in blockquotes. 2015-06-02 13:17:21 +02:00
Douwe Maan fe78984f20 Actually ignore references in code blocks etc. 2015-06-02 13:17:11 +02:00
Martins Polakovs 6181160504 Update mocking/stubbing syntax to the new RSpec 3 syntax 2015-05-30 19:15:10 +03:00
Robert Speicher 7424d2fa5b Add ExternalLinkFilter to Markdown pipeline 
Forces a `rel="nofollow"` attribute on all external links.
 2015-05-27 15:39:08 -04:00
Robert Speicher 2c1bf71793 Fix ClosingIssueExtractor specs 2015-05-26 15:55:26 -04:00
Robert Speicher 5a9c5520d9 Make use of to_reference in more specs 2015-05-26 15:49:22 -04:00
Robert Speicher 81a09bc74c Support only double quotes for multi-word label references 2015-05-26 15:49:20 -04:00
Robert Speicher 94af050117 Use to_reference in reference filter specs 2015-05-26 15:48:32 -04:00
Robert Speicher 136ab73803 Update CommitRange#to_reference to use full SHAs 
We only want them shortened by the filter, which calls to_s
 2015-05-26 15:48:31 -04:00
Dmitriy Zaporozhets 08102ad748 Merge branch 'rs-issue-1690' into 'master' 
Better handle label references that aren't actually references

Fixes #1690

See merge request !705
 2015-05-26 14:35:54 +00:00
Robert Speicher b263a33c80 Better handle label references that aren't actually references 
Fixes #1690
 2015-05-25 16:06:34 -04:00
Martins Polakovs cfc9bff45e Fix upgrader script 2015-05-23 13:11:23 +03:00
Stan Hu 3b22cfe600 Remove Rack Attack monkey patches and bump to version 4.3.0 2015-05-22 16:25:03 -04:00
Robert Speicher 8ee382087d Subclass TaskList::Filter to fix a bug 
Instead of using a fork, we subclass the filter and only apply the
`task-list` class to list items that actually are task lists.

Closes #1645

See https://github.com/github/task_list/pull/60
 2015-05-20 12:08:33 -04:00
Jakub Jirutka b0659c1b07 Simplify and unify helpers for rendering markup 2015-05-18 22:52:13 +02:00
Jakub Jirutka daa0925016 Rename MarkdownHelper to MarkupHelper 2015-05-18 22:51:56 +02:00
Jakub Jirutka 8dbc4746fe Handle AsciiDoc better, reuse HTML pipeline filters (fixes #9263) 2015-05-18 20:48:03 +02:00
Dmitriy Zaporozhets 1af8b1e4f8 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	app/views/help/index.html.haml
	lib/gitlab/git_access.rb
	public/500.html
	public/502.html
 2015-05-15 13:29:58 +03:00
Robert Speicher 7f2fb72a0a Minor RelativeLinkFilter cleanup 2015-05-13 14:08:37 -04:00
Dmitriy Zaporozhets 8ad91d5840 Merge branch 'text-batch-1' into 'master' 
Batch 1 of text improvements

Batch 1 of changes from my effort at !635 to walk through every piece of text in GitLab and see if it can be improved.

This batch includes:

- Improve text on error pages.
- Improve Git access error messages.
- Improve description of branch protection levels.
- Improve OAuth signup error message.
- Improve OAuth application flash messages.

cc @rspeicher

See merge request !642
 2015-05-13 12:05:17 +00:00
Dmitriy Zaporozhets b2d45bb544 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	app/controllers/uploads_controller.rb
	app/helpers/application_helper.rb
	app/models/note.rb
	app/services/test_hook_service.rb
	db/schema.rb
	spec/models/note_spec.rb
 2015-05-13 14:10:14 +03:00
Dmitriy Zaporozhets 740716afd1 Merge pull request #9276 from jirutka/relative_link_filter 
Extract handling of relative file links to its own HTML filter
 2015-05-13 14:09:57 +03:00
Douwe Maan c5e4b443ff Fix GitAccess. 2015-05-13 09:46:22 +02:00
Douwe Maan 125cb9b866 Don't accidentally unblock auto created users from Active Directory. 2015-05-12 11:26:43 +02:00
Jakub Jirutka 44b82396d1 Add spec for RelativeLinkFilter 2015-05-12 02:12:47 +02:00
Robert Speicher 70bbf093aa Remove class and id attributes from SanitizationFilter whitelist 2015-05-08 12:31:34 -04: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