root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
56,859 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

56859 Commits

Author SHA1 Message Date
Michael Kozono 72d8b1e40a Move backwards compatibility logic out of the code 
And closer to the configuration setup. The code doesn’t need to know about this.
 2017-07-26 02:43:36 -07:00
Michael Kozono 2d7d1fa69d Pass configured `ssl_version` to `omniauth-ldap` 2017-07-26 02:43:36 -07:00
Michael Kozono c8dd77de81 Pass configured `ca_file` to `omniauth-ldap` 2017-07-26 02:43:35 -07:00
Michael Kozono cd13e4ae73 Verify certificates in `omniauth-ldap` 2017-07-26 02:43:35 -07:00
Michael Kozono 612b386450 Set `Net::LDAP` `ssl_version` option 2017-07-26 02:43:34 -07:00
Michael Kozono dcc12505aa Set `Net::LDAP` `ca_file` option 2017-07-26 02:43:34 -07:00
Michael Kozono b67c007842 Set `Net::LDAP` encryption properly 2017-07-26 02:43:33 -07:00
Michael Kozono 94b4c9f34f Use encryption instead of method 
The method key is deprecated in the `gitlab_omniauth-ldap` gem.
 2017-07-26 02:43:33 -07:00
Michael Kozono 6dbff9663d Add LDAP config options 2017-07-26 02:43:32 -07:00
Michael Kozono 8ab29d569e Upgrade omniauth-ldap gem (and some dependencies) 
Most notably, the net-ldap gem.
 2017-07-26 02:43:32 -07:00
Robert Speicher 886b074494 Merge branch 'docs/remove-outdated-label-from-contributing-guide' into 'master' 
Remove outdated ~Frontend label in CONTRIBUTING.md

See merge request !13087
 2017-07-25 17:46:24 +00:00
Clement Ho 3f21d03f26 Merge branch 'fix-conflict-pluralized' into 'master' 
FIX #35027 : conflict pluralized

Closes #35027

See merge request !13051
 2017-07-25 17:23:52 +00:00
Rémy Coutable 96479cba5a
Remove outdated ~Frontend label in CONTRIBUTING.md 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-07-25 19:00:49 +02:00
Rémy Coutable c07dfe668e Merge branch '35204-doc-api-ci-lint-typo' into 'master' 
Add link to doc/api/ci/lint.md

Closes #35204

See merge request !12914
 2017-07-25 16:09:05 +00:00
Rémy Coutable 9d1b9d8972 Merge branch 'upgrade_re2' into 'master' 
Upgrade re2 to support seperate CXX and CC passing

See merge request !13064
 2017-07-25 15:50:22 +00:00
Drew Blessing ba24fa87d1 Merge branch 'patch-23' into 'master' 
Add instructions for enabling the `pg_trgm` during HA setup.

See merge request !13057
 2017-07-25 15:29:16 +00:00
Phil Hughes 2a572d2634 Merge branch '2971-multiproject-grah-ce-port' into 'master' 
Fix vertical alignment in firefox and safari for pipeline mini graph

See merge request !13071
 2017-07-25 15:15:26 +00:00
Kamil Trzciński 22e54c9718 Merge branch '30634-protected-pipeline' into 'master' 
Implement "Block pipelines on protected branches"

Closes #30634, #34616, and #33130

See merge request !11910
 2017-07-25 15:05:22 +00:00
Kamil Trzciński ac948684fc Merge branch '30634-protected-pipeline' into 'master' 
Implement "Block pipelines on protected branches"

Closes #30634, #34616, and #33130

See merge request !11910
 2017-07-25 15:04:23 +00:00
James Edwards-Jones 3f59e354a7 Update CHANGELOG.md for 9.4.1 
[ci skip]
 2017-07-25 15:28:13 +01:00
Dmitriy Zaporozhets c68f83335e Merge branch 'bvl-fix-api-in-path-regex' into 'master' 
Add `api` prefix as a top level route in the spec.

See merge request !13077
 2017-07-25 13:56:40 +00:00
Rémy Coutable 1ba3e2a6d9 Merge branch '35000_add_ukrainian_translations_of_pipeline_schedules' into 'master' 
Add Ukrainian translations of Pipeline Schedules

Closes #35000

See merge request !12827
 2017-07-25 13:49:38 +00:00
Phil Hughes d832501f3c Merge branch '35474-fix-new-issue' into 'master' 
Move relative_path to the element that is being clicked

Closes #35474

See merge request !13079
 2017-07-25 13:19:06 +00:00
Filipa Lacerda 0d451a934f Merge branch 'patch-24' into 'master' 
Add directives to Vue component ordering

See merge request !13065
 2017-07-25 13:09:30 +00:00
Sean McGivern 1162257080 Merge branch 'issue_34622' into 'master' 
Group milestones API endpoint

Closes #34622

See merge request !12819
 2017-07-25 12:52:47 +00:00
Bob Van Landuyt ad46c8878b Add `api` prefix as a top level route in the spec. 
Now that it has been removed from the rails routes. But it still needs
to be a reserved top-level word, so the tests should know about this.
 2017-07-25 14:51:36 +02:00
Douwe Maan 5112d92a4f Merge branch 'clarify-v3-end-date-undefined' into 'master' 
v3 API is unsupported after 9.5, but may not be removed

See merge request !13074
 2017-07-25 12:24:55 +00:00
Jarka Kadlecova 5fdef68f2b Move relative_path to the element that is being clicked 2017-07-25 14:14:28 +02:00
Simon Knox 069a4a02e0 Add directives to Vue component ordering 2017-07-25 21:52:40 +10:00
Sean McGivern 2a067bb37c Merge branch 'backport-ee-2328' into 'master' 
Backport changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2328

See merge request !13022
 2017-07-25 11:27:58 +00:00
Sean McGivern bd13978c71 Merge branch 'add-instrumentation-to-link-to-gfm' into 'master' 
Adds link_to_gfm method instrumentation

See merge request !13069
 2017-07-25 11:12:36 +00:00
黄涛 b915a46758 synchronize ukrainian translation in zanata again 2017-07-25 19:08:51 +08:00
Filipa Lacerda b53d6e5581 Merge branch 'new-navigation-custom-logo' into 'master' 
Fixed custom logo sizing in new navigation header

Closes #35439

See merge request !13034
 2017-07-25 11:07:26 +00:00
Sean McGivern 8758c10886 v3 API is unsupported after 9.5, but may not be removed 
That is, it may not _necessarily_ be removed. We do not provide guarantees for
when API v3 will be available until beyond 9.5.
 2017-07-25 11:50:09 +01:00
Filipa Lacerda 531681c11d Fix vertical alignment in firefox and safari for pipeline mini graph 2017-07-25 11:29:01 +01:00
Rémy Coutable 5dd856f061 Merge branch 'bvl-port-inverse-protected-ref-to-ce' into 'master' 
Explicitly define inverse of acces_level relations

See merge request !13068
 2017-07-25 10:26:52 +00:00
Dmitriy Zaporozhets a53cc4893c Merge branch 'bvl-free-unused-names' into 'master' 
Free some unused reserved top-level words.

Closes #35053

See merge request !12932
 2017-07-25 10:11:27 +00:00
Kamil Trzciński a62a2e2452 Merge branch 'fix/gb/fix-build-merge-request-link-to-fork-project' into 'master' 
Fix job merge request link to a forked source project

Closes #35109

See merge request !12965
 2017-07-25 10:06:55 +00:00
Tiago Botelho 4236c2f055 Adds link_to_gfm method instrumentation 2017-07-25 10:51:21 +01:00
Rémy Coutable ba820e87dc Merge branch '35478-allow-admin-to-read-user-list' into 'master' 
Allow admin to read_users_list even if it's restricted

Closes #35478

See merge request !13066
 2017-07-25 09:41:51 +00:00
Rémy Coutable 4ab6675b3d Merge branch '22600-related-resources-uris-using-grape-source-helpers' into 'master' 
Resolve "More RESTful API: include resource URLs in responses"

Closes #22600

See merge request !10491
 2017-07-25 09:35:45 +00:00
Oswaldo Ferreira 33dc5171e5 Resolve "More RESTful API: include resource URLs in responses" 2017-07-25 09:35:45 +00:00
Rémy Coutable d5801545ec Merge branch 'archytaus/gitlab-ce-26372-duplicate-issue-slash-command' into 'master' 
New `/duplicate` quick action

Closes #26372

See merge request !12845
 2017-07-25 09:30:15 +00:00
Bob Van Landuyt e13d75c38a Explicitly define inverse of acces_level relations 2017-07-25 11:26:22 +02:00
Lin Jen-Shin 25e44edc30 Allow admin to read_users_list even if it's restricted 2017-07-25 16:49:26 +08:00
Marin Jankovski d95e6da0d5 Merge branch 'update-external-registry-documentation' into 'master' 
Update docs on using external registry with gitlab

Closes omnibus-gitlab#2612

See merge request !13050
 2017-07-25 08:19:35 +00:00
Balasankar C 02987e17c7 Update docs on using external registry with gitlab 2017-07-25 08:19:34 +00:00
Rémy Coutable e43bda0ebb Merge branch 'dz-update-shoulda' into 'master' 
Update shoulda-matchers gem to 3.1.2

See merge request !13040
 2017-07-25 08:08:26 +00:00
Phil Hughes 1897aafdf8 Merge branch '35163-url-in-commit-message-can-be-broken-in-blame' into 'master' 
Use only CSS to truncate commit message in blame

Closes #35163

See merge request !12900
 2017-07-25 08:05:45 +00:00
Bob Van Landuyt d22fe96b58 Take ee words into account 
We need to reserve these words in EE to support the upgrade path from
CE to EE.
 2017-07-25 09:18:54 +02:00