maxmustermann/gitlab
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
259043 commits 8724 branches 2008 tags 2 GiB
Commit graph

41 commits

Author SHA1 Message Date
Jerome Ng 1dee963e38 Add JH to License File 2021-06-18 00:55:31 +00:00
Marin Jankovski e480788a48
List licenses in the LICENSE file 
Move different licensing content from README to LICENSE file
 2019-08-13 17:19:32 +02:00
Marin Jankovski 901912d88e
Change the language in the Licensing section 
Include a line in the LICENSE file mentioning ee/LICENSE
 2019-08-12 12:11:00 +02:00
Marin Jankovski 821da4bf01
Remove outdated subscriber information 2019-08-12 12:11:00 +02:00
Marin Jankovski 770f2081f1
Changes to LICENSE and ee/LICENSE files 2019-08-12 12:11:00 +02:00
Marin Jankovski d2dbdc4f7c
LICENSE update making all frontend assets MIT 2019-08-12 12:10:59 +02:00
Lukas Eipert 7b1e9d0018
License: Drop end year in favor of "present" 2019-01-18 19:18:11 +01:00
Stan Hu 501c8e7e1c Resolve conflicts in LICENSE 2018-09-10 16:46:12 -07:00
GitLab Bot 3e9138e025 Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-10 
# Conflicts:
#	LICENSE

[ci skip]
 2018-09-10 23:41:42 +00:00
Lukas Eipert 6d076dd5b2
properly wrap LICENSE file 
[ci skip]
 2018-09-08 13:19:35 +02:00
Dmitriy Zaporozhets 9f3262ba64
Resolve conflict in LICENSE 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2018-05-16 20:10:40 +03:00
GitLab Bot 9a8f70d525 Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-16 
# Conflicts:
#	LICENSE

[ci skip]
 2018-05-16 15:36:49 +00:00
Andrea Kao e943c45800 edit GitLab license info in regards to CC licensing 
GitHub uses a library called Licensee to identify a project's license
type. It shows this information in the status bar and via the API if it
can unambiguously identify the license.

This commit moves the reference to Creative Commons licensing from
the LICENSE file to the README, which allows Licensee to successfully
identify the license type of GitLab CE as MIT.

Signed-off-by: Andrea Kao <eirinikos@gmail.com>
 2018-05-15 15:04:48 -07:00
Achilleas Pipinellis 52e8f61195
Change the docs license to CC BY-SA 
As discussed in https://gitlab.com/gitlab-org/gitlab-ce/issues/42891
 2018-05-03 17:11:11 +02:00
Achilleas Pipinellis ab68ad8749
Change the docs license to CC BY-SA 
As discussed in https://gitlab.com/gitlab-org/gitlab-ce/issues/42891
 2018-05-03 17:11:00 +02:00
Andrea Kao f0ef51729d edit GitLab license info so that GitHub recognizes it 
GitHub uses a library called Licensee to identify a project's license
type. It shows this information in the status bar and via the API if it
can unambiguously identify the license.

This commit updates the LICENSE file so that it contains the exact text
of the MIT license. It also moves the reference to third-party software
licensing to the README.

These changes allow Licensee to successfully identify the license
type of GitLab's codebase as MIT.

Signed-off-by: Andrea Kao <eirinikos@gmail.com>
 2018-04-10 11:13:07 -07:00
Jamie Hurewitz 2aa579f4f8 Update LICENSE to clean up formatting 2017-12-29 10:53:24 -05:00
Rémy Coutable 27c9c5e9f2
Resolve conflict in LICENSE 
Based on gitlab-org/gitlab-ce!14374 and gitlab-org/gitlab-ee!2935.

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-09-20 11:03:01 +02:00
Rémy Coutable 07ce00df32 Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-09-20 
# Conflicts:
#	LICENSE
#	app/controllers/projects/refs_controller.rb
#	spec/javascripts/vue_mr_widget/stores/mr_widget_store_spec.js
#	spec/lib/gitlab/ci/yaml_processor_spec.rb
#	spec/policies/project_policy_spec.rb
#	spec/requests/api/boards_spec.rb
#	spec/requests/api/v3/builds_spec.rb
[ci skip]
 2017-09-20 09:23:51 +02:00
Jamie Hurewitz 1534dbb7a2 Update LICENSE to carve out third party licenses. 2017-09-19 17:38:48 +00:00
Jamie Hurewitz 2ae4922561 Update LICENSE to expand development and testing rights 2017-09-15 16:42:38 +00:00
Jamie Hurewitz 05e550064a Expand EE license use for development and testing 2017-09-15 16:23:40 +00:00
Rémy Coutable 396941fa8c
Reolve conflicts 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-02-10 18:04:31 +01:00
Rémy Coutable 14f1175100
Merge remote-tracking branch 'ce/master' into rc/ce-to-ee-friday 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-02-10 17:30:40 +01:00
💃 Winnie 💃 a43709a343 Update LICENSE to 2017 2017-02-08 22:58:40 +00:00
Robert Speicher 74cbc27339 Update LICENSE copyright notice to 2016 
Also reformats paragraphs for a max width of 80 chars

[ci skip]
 2016-01-10 20:41:27 -05:00
Atul Bhosale befdc67707 Update copyright notice to 2016 [ci skip] 2016-01-03 18:28:52 +05:30
Darby 3623eed232 Changed the EE license with the lawyers updates 2015-08-17 15:35:58 -07:00
Sytse Sijbrandij 72e8e18f5d The not shouldn't have been in the opposite case. 2015-04-26 23:23:09 +00:00
Sytse Sijbrandij 044036e498 Implement the suggestions of Mike: The "in whole or in part" is important mostly because it removes ambiguity, but also because there may be code that is responsible for the generation of the JavaScript/CoffeeScript code. If a file generates non-trivial JavaScript, then that JavaScript code must be free; but it can't be free in and of itself, because it does not appear in the source code. You can otherwise: 2015-04-26 23:22:15 +00:00
Sytse Sijbrandij 1b9f7e6573 Make the client side javascript MIT so people can use GitLab.com in freedom. 2015-04-23 05:35:30 +00:00
Dmitriy Zaporozhets ef8d96e5de
Merge branch 'ce-to-ee-2' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	LICENSE
	app/assets/javascripts/dispatcher.js.coffee
	app/controllers/help_controller.rb
	app/models/user.rb
	app/views/groups/group_members/_new_group_member.html.haml
	config/gitlab.yml.example
	config/routes.rb
	features/groups.feature
	features/steps/dashboard/help.rb
 2015-04-14 15:08:19 +03:00
Andrew 227535761d LICENSE year update 2015-03-30 11:03:42 +03:00
dosire 51a5ffb2c0 Update license. 2014-05-28 09:59:45 +02:00
dosire 245c04c29a Change the license to B.V. 2014-05-23 15:01:02 +02:00
PatrickJS 10561f4c46 update copyright year to range 2014-02-16 23:06:35 -08:00
dosire 4f3de79fe3 Wrap license file. 2014-02-11 11:07:43 +01:00
dosire 31eb273c90 License change. 2014-02-11 10:50:38 +01:00
Dmitriy Zaporozhets f2bfda9bd2 LiCENSE to MIT 2013-08-12 13:33:01 +03:00
Sytse Sijbrandij 34b58cbd28 Add license. 2013-07-10 20:24:30 +02:00
gitlabhq 9ba1224867 init commit 2011-10-09 00:36:38 +03:00