Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Mark references to openshift template as deprecatedlink-new-openshift-template | Balasankar "Balu" C | 2019-01-03 | 1 | -0/+5 |
| | |||||
* | Merge branch 'patch-37' into 'master' | Sean McGivern | 2019-01-01 | 38 | -38/+38 |
|\ | | | | | | | | | | | | | Fix #55740: Use the '--no-document' option instead of the 'gem' tool's deprecated options Closes #55740 See merge request gitlab-org/gitlab-ce!24049 | ||||
| * | Stop using deprecated argument to `gem` | Sean McGivern | 2019-01-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | `--no-rdoc` and `--no-ri` have been deprecated since RubyGems 2.0: https://github.com/rubygems/rubygems/blob/v2.0.0/History.txt#L43 They were finally removed in a recent release: https://github.com/rubygems/rubygems/pull/2354 | ||||
| * | Update doc/update/9.5-to-10.0.md | Fatih Sarhan | 2018-12-31 | 1 | -1/+1 |
| | | |||||
| * | Update doc/update/9.4-to-9.5.md | Fatih Sarhan | 2018-12-31 | 1 | -1/+1 |
| | | |||||
| * | Update doc/update/9.3-to-9.4.md | Fatih Sarhan | 2018-12-31 | 1 | -1/+1 |
| | | |||||
| * | Update doc/update/9.2-to-9.3.md | Fatih Sarhan | 2018-12-31 | 1 | -1/+1 |
| | | |||||
| * | Update doc/update/9.1-to-9.2.md | Fatih Sarhan | 2018-12-31 | 1 | -1/+1 |
| | | |||||
| * | Update doc/update/9.0-to-9.1.md | Fatih Sarhan | 2018-12-31 | 1 | -1/+1 |
| | | |||||
| * | Update doc/update/8.17-to-9.0.md | Fatih Sarhan | 2018-12-31 | 1 | -1/+1 |
| | | |||||
| * | Update doc/update/8.16-to-8.17.md | Fatih Sarhan | 2018-12-31 | 1 | -1/+1 |
| | | |||||
| * | Update doc/update/8.15-to-8.16.md | Fatih Sarhan | 2018-12-31 | 1 | -1/+1 |
| | | |||||
| * | Update doc/update/8.14-to-8.15.md | Fatih Sarhan | 2018-12-31 | 1 | -1/+1 |
| | | |||||
| * | Update doc/update/8.13-to-8.14.md | Fatih Sarhan | 2018-12-31 | 1 | -1/+1 |
| | | |||||
| * | Update doc/update/8.12-to-8.13.md | Fatih Sarhan | 2018-12-31 | 1 | -1/+1 |
| | | |||||
| * | Update doc/update/8.11-to-8.12.md | Fatih Sarhan | 2018-12-31 | 1 | -1/+1 |
| | | |||||
| * | Update doc/update/8.10-to-8.11.md | Fatih Sarhan | 2018-12-31 | 1 | -1/+1 |
| | | |||||
| * | Update doc/update/7.0-to-7.1.md | Fatih Sarhan | 2018-12-31 | 1 | -1/+1 |
| | | |||||
| * | Update doc/update/6.x-or-7.x-to-7.14.md | Fatih Sarhan | 2018-12-31 | 1 | -1/+1 |
| | | |||||
| * | Update doc/update/6.9-to-7.0.md | Fatih Sarhan | 2018-12-31 | 1 | -1/+1 |
| | | |||||
| * | Update 11.5-to-11.6.md | Fatih Sarhan | 2018-12-31 | 1 | -1/+1 |
| | | |||||
| * | Update 11.4-to-11.5.md | Fatih Sarhan | 2018-12-31 | 1 | -1/+1 |
| | | |||||
| * | Update doc/update/11.3-to-11.4.md | Fatih Sarhan | 2018-12-31 | 1 | -1/+1 |
| | | |||||
| * | Update 11.2-to-11.3.md | Fatih Sarhan | 2018-12-31 | 1 | -1/+1 |
| | | |||||
| * | Update 11.1-to-11.2.md | Fatih Sarhan | 2018-12-31 | 1 | -1/+1 |
| | | |||||
| * | Update doc/update/11.0-to-11.1.md | Fatih Sarhan | 2018-12-31 | 1 | -1/+1 |
| | | |||||
| * | Update doc/update/10.8-to-11.0.md | Fatih Sarhan | 2018-12-31 | 1 | -1/+1 |
| | | |||||
| * | Update doc/update/10.7-to-10.8.md | Fatih Sarhan | 2018-12-31 | 1 | -1/+1 |
| | | |||||
| * | Update doc/update/10.6-to-10.7.md | Fatih Sarhan | 2018-12-31 | 1 | -1/+1 |
| | | |||||
| * | Update 10.5-to-10.6.md | Fatih Sarhan | 2018-12-31 | 1 | -1/+1 |
| | | |||||
| * | Update doc/update/10.4-to-10.5.md | Fatih Sarhan | 2018-12-31 | 1 | -1/+1 |
| | | |||||
| * | Update doc/update/10.3-to-10.4.md | Fatih Sarhan | 2018-12-31 | 1 | -1/+1 |
| | | |||||
| * | Update doc/update/10.2-to-10.3.md | Fatih Sarhan | 2018-12-31 | 1 | -1/+1 |
| | | |||||
| * | Update doc/update/10.0-to-10.1.md | Fatih Sarhan | 2018-12-31 | 1 | -1/+1 |
| | | |||||
| * | Update doc/update/10.1-to-10.2.md | Fatih Sarhan | 2018-12-31 | 1 | -1/+1 |
| | | |||||
| * | Update lib/gitlab/ci/templates/Ruby.gitlab-ci.yml | Fatih Sarhan | 2018-12-31 | 1 | -1/+1 |
| | | |||||
| * | Update doc/install/installation.md | Fatih Sarhan | 2018-12-31 | 1 | -1/+1 |
| | | |||||
| * | Update doc/ci/yaml/README.md | Fatih Sarhan | 2018-12-31 | 1 | -1/+1 |
| | | |||||
| * | Update doc/ci/caching/index.md file | Fatih Sarhan | 2018-12-31 | 1 | -1/+1 |
| | | |||||
| * | Update gitlab_ci_ymls.md | Fatih Sarhan | 2018-12-31 | 1 | -1/+1 |
| | | |||||
| * | Fix #55740: Use --no-document option instead of deprecated options in simple ↵ | Fatih Sarhan | 2018-12-27 | 1 | -1/+1 |
| | | | | | | | | .gitlab-ci.yml file | ||||
* | | Merge branch 'sh-fix-issue-55822' into 'master' | Sean McGivern | 2019-01-01 | 3 | -1/+17 |
|\ \ | | | | | | | | | | | | | | | | | | | Fix commit SHA not showing in merge request compare dropdown Closes #55822 See merge request gitlab-org/gitlab-ce!24084 | ||||
| * | | Fix commit SHA not showing in merge request compare dropdown | Stan Hu | 2018-12-31 | 3 | -1/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17011 in GitLab 11.1 refactored the merge request diff comparison functionality but omitted the commit SHA due to a change in the API (truncated_commit_sha -> short_commit_sha). Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55822 | ||||
* | | | Merge branch 'sh-bump-omniauth-google-gem' into 'master' | Sean McGivern | 2019-01-01 | 8 | -22/+27 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Omniauth and JWT gems to switch away from Google+ API Closes #55668 See merge request gitlab-org/gitlab-ce!24068 | ||||
| * | | | Set typ field in JSONWebToken::RSAToken | Stan Hu | 2018-12-29 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ruby-jwt v2.0 removed the `typ` header in https://github.com/jwt/ruby-jwt/commit/cc41d53e00f8cbf015271b53f5ad761bd6ac2312. To ensure tokens don't get marked invalid during an upgrade, add it back to ensure backwards compatibility. | ||||
| * | | | Set the JWT algorithm to RS256 in decode specs | Stan Hu | 2018-12-29 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default, the JWT decode only allows HS256 mode (HMAC using SHA-256 hash algorithm). The specs using RSA tokens failed per https://github.com/jwt/ruby-jwt#algorithms-and-usage: It is strongly recommended that you hard code the algorithm, as you may leave yourself vulnerable by dynamically picking the algorithm. | ||||
| * | | | Remove documentation requiring activation of Google+ API | Stan Hu | 2018-12-29 | 1 | -1/+0 |
| | | | | |||||
| * | | | Add typ header back into JWT payload | Stan Hu | 2018-12-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ruby-jwt v2.0 removed the `typ` header in https://github.com/jwt/ruby-jwt/commit/cc41d53e00f8cbf015271b53f5ad761bd6ac2312. To ensure tokens don't get marked invalid during an upgrade, add it back to ensure backwards compatibility. | ||||
| * | | | Upgrade Omniauth and JWT gems to switch away from Google+ API | Stan Hu | 2018-12-28 | 3 | -16/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * omniauth-google-oauth2: Google will be deprecating its support for the Google+ API, which currently omniauth-google-oauth2 uses to retrieve user info. The bump in omniauth-google-oauth2 requires an upgrade to ruby-jwt v2+ to support the verification of multiple issue providers (https://github.com/zquestz/omniauth-google-oauth2/pull/345). * jwt: This has the most number of changes that need to be reviewed: https://github.com/jwt/ruby-jwt/blob/master/CHANGELOG.md * oauth2: Needed to support ruby-jwt v2+: https://github.com/oauth-xx/oauth2/blob/master/CHANGELOG.md * omniauth-azure-oauth2 needs a version bump to support ruby-jwt v2+. * omniauth: This version bump only involves backstage improvements: https://github.com/omniauth/omniauth/releases Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55668 | ||||
* | | | | Merge branch 'documentation-development-docs' into 'master' | Sid Sijbrandij | 2018-12-31 | 7 | -425/+367 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | Documentation process/policy updates to foster contributions to docs as SSOT See merge request gitlab-org/gitlab-ce!23951 |