summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* TokenAuthenticatable allows non-unique tokensce-jej/group-saml-discovery-tokenJames Edwards-Jones2018-10-312-3/+10
| | | | | Avoids needing an index to repeatedly check that the token doesn't already exist when saving.
* Merge branch 'security-if-51113-hash_tokens' into 'master'Jan Provaznik2018-10-2920-70/+700
|\ | | | | | | | | [master] Persist only SHA digest of PersonalAccessToken#token See merge request gitlab/gitlabhq!2498
| * [master] Persist only SHA digest of PersonalAccessToken#tokenImre Farkas2018-10-2920-70/+700
|/
* Merge branch 'security-51527-xss-in-mr-source-branch' into 'master'Jan Provaznik2018-10-293-9/+17
|\ | | | | | | | | [master] Fix XSS in MR source branch name See merge request gitlab/gitlabhq!2544
| * Fix XSS in MR source branch namePaul Slaughter2018-10-123-9/+17
| |
* | Merge branch 'sh-fix-hipchat-ssrf' into 'master'Jan Provaznik2018-10-293-0/+37
|\ \ | | | | | | | | | | | | [master] Prevent SSRF attacks in HipChat integration See merge request gitlab/gitlabhq!2530
| * | Prevent SSRF attacks in HipChat integrationStan Hu2018-10-023-0/+37
| | | | | | | | | | | | | | | | | | | | | This change monkey patches the HipChat client to use the GitLab HTTParty connection adapter, which can block access to certain hosts. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51142
* | | Update CHANGELOG.md for 11.2.7GitLab Release Tools Bot2018-10-271-0/+4
| | | | | | | | | [ci skip]
* | | Update CHANGELOG.md for 11.3.8GitLab Release Tools Bot2018-10-271-0/+4
| | | | | | | | | [ci skip]
* | | Update CHANGELOG.md for 11.4.3GitLab Release Tools Bot2018-10-261-0/+4
| | | | | | | | | [ci skip]
* | | Update CHANGELOG.md for 11.2.6GitLab Release Tools Bot2018-10-261-0/+11
| | | | | | | | | [ci skip]
* | | Update CHANGELOG.md for 11.3.7GitLab Release Tools Bot2018-10-261-0/+12
| | | | | | | | | [ci skip]
* | | Merge remote-tracking branch 'origin/master' into dev-masterDJ Mountney2018-10-25221-1686/+3513
|\ \ \
| * \ \ Merge branch 'mj/review-apps-guard' into 'master'Robert Speicher2018-10-251-1/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Review apps cleanup schedule runs on master See merge request gitlab-org/gitlab-ce!22601
| | * | | Review apps cleanup schedule runs on masterMarin Jankovski2018-10-251-1/+0
| |/ / /
| * | | Merge branch '53055-combine-date-util-functions' into 'master'Filipa Lacerda2018-10-2513-380/+379
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Combine all datetime library functions into `datetime_utility.js` This MR moves datetime methods from `app/assets/javascripts/lib/utils/pretty_time.js` & `app/assets/javascripts/lib/utils/datefix.js` into `app/assets/javascripts/lib/utils/datetime_utility.js`. Closes #53055 See merge request gitlab-org/gitlab-ce!22570
| | * | | Add changelog entry53055-combine-date-util-functionsKushal Pandya2018-10-251-0/+5
| | | | |
| | * | | Run through Prettier and remove ESLint disablesKushal Pandya2018-10-254-151/+160
| | | | | | | | | | | | | | | | | | | | | | | | | Formats the file to match Prettier rules Removes all blacklisted ESLint rules
| | * | | Update pretty_time methods import pathKushal Pandya2018-10-252-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Updates path for pretty time related methods to import from `datetime_utility.js`
| | * | | Add pretty_time methodsKushal Pandya2018-10-254-198/+187
| | | | | | | | | | | | | | | | | | | | | | | | | Adds methods from `app/assets/javascripts/lib/utils/pretty_time.js` and deletes the file
| | * | | Update pikaday method import pathKushal Pandya2018-10-254-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Updates path for pikaday parsing methods to import from `datetime_utility.js`
| | * | | Add pikaday parsing methodsKushal Pandya2018-10-254-55/+55
| | | | | | | | | | | | | | | | | | | | | | | | | Adds methods from `app/assets/javascripts/lib/utils/datefix.js` and deletes the files
| | * | | Convert methods to ES6 exportsKushal Pandya2018-10-251-39/+36
| | | | |
| * | | | Merge branch 'mr-diff-data' into 'master'Filipa Lacerda2018-10-258-126/+109
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Impove diff discussion data See merge request gitlab-org/gitlab-ce!22491
| | * | | | Fixed action & mutation specsPhil Hughes2018-10-252-44/+29
| | | | | |
| | * | | | Update the state, not a paramPhil Hughes2018-10-253-56/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixed a bug where discussions wouldn't be assigned to a line when switching from discussion tab to changes tab
| | * | | | Impove diff discussion datamr-diff-dataPhil Hughes2018-10-248-83/+80
| | | | | | | | | | | | | | | | | | | | | | | | Pre-request to https://gitlab.com/gitlab-org/gitlab-ce/issues/48956
| * | | | | Merge branch 'refactor_gitlab_kube_client' into 'master'Kamil Trzciński2018-10-257-150/+47
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor Gitlab::KubeClient Closes #52131 See merge request gitlab-org/gitlab-ce!22073
| | * | | | | Store version within SUPPORTED_API_GROUPS hashrefactor_gitlab_kube_clientThong Kuah2018-10-235-74/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the ability to pass in a different version. We can instead create a new entry in the SUPPORTED_API_GROUPS hash for a different version if need be.
| | * | | | | DRY up *_clients methodsThong Kuah2018-10-231-25/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build using `define_method` directly from the constant, saves us writing api_groups strings twice.
| | * | | | | Split hashed_clients into one per api_groupThong Kuah2018-10-231-11/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Essentially make #build_kubeclient do less. Should be much clearer now
| | * | | | | Update all usages of KubeClientThong Kuah2018-10-235-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Find and replace everywhere we pass in `api_groups` to KubeClient, as no longer needed
| | * | | | | Remove api_groups from KubeClient constructorThong Kuah2018-10-232-117/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should have access to #core_client, #rbac_client, and #extensions_client without having to pass in an awkward array. Also change api_version to default_api_version, which allows us to use a different version for an individual client. Special case for apis/extensions which only go up to v1beta1 Makes #hashed_client private Removes the #clients and #discover! methods which are un-used
| * | | | | | Merge branch '52202-consider-moving-isjobstuck-verification-to-backend' into ↵Kamil Trzciński2018-10-2510-88/+192
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Move job stuck status to backend Closes #52202 See merge request gitlab-org/gitlab-ce!22442
| | * | | | | | Move job stuck status to backendSteve Azzopardi2018-10-2510-88/+192
| |/ / / / / /
| * | | | | | Merge branch 'jlenny-UpdateAndroidTemplate' into 'master'Grzegorz Bizon2018-10-251-34/+28
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Update Android.gitlab-ci.yml template to current Android SDK version See merge request gitlab-org/gitlab-ce!22531
| | * | | | | Update link to blog post since it didn't go out on 23rdjlenny-UpdateAndroidTemplateJason Lenny2018-10-241-1/+1
| | | | | | |
| | * | | | | Update Android.gitlab-ci.yml with result of new blog post: ↵Jason Lenny2018-10-231-34/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/15746
| * | | | | | Merge branch 'sh-bump-ruby-2.4.5' into 'master'Robert Speicher2018-10-245-10/+21
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade to Ruby 2.4.5 See merge request gitlab-org/gitlab-ce!22484
| | * | | | | | Convert parser warnings to stdout in haml_lintsh-bump-ruby-2.4.5Lin Jen-Shin2018-10-242-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was used in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16648 and this could happen from time to time, so let's just keep it.
| | * | | | | | Add a monkey patch to squelch warnings from whitequark/parserStan Hu2018-10-241-0/+15
| | | | | | | |
| | * | | | | | Upgrade to Ruby 2.4.5Stan Hu2018-10-244-10/+10
| | | | | | | |
| * | | | | | | Merge branch 'prettify-all-the-things-7' into 'master'Tim Zallmann2018-10-2448-679/+826
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prettify all the things (part 7) See merge request gitlab-org/gitlab-ce!22257
| | * | | | | | | Prettify all the things (part 7)Mike Greiling2018-10-2448-679/+826
| |/ / / / / / /
| * | | | | | | Merge branch '53070-fix-usage-ping-link' into 'master'49651-filtering-issues-by-label-produces-complicated-query-with-group-byStan Hu2018-10-242-1/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix usage ping link Closes #53070 See merge request gitlab-org/gitlab-ce!22545
| | * | | | | | | Fix usage ping linkAnand2018-10-242-1/+6
| |/ / / / / / /
| * | | | | | | Merge branch 'fix/secpick-ee' into 'master'Robert Speicher2018-10-241-4/+10
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix secpick to use EE and guess branch name Closes gitlab-org/release/tasks#483 See merge request gitlab-org/gitlab-ce!22517
| | * | | | | | | Fix secpick to use EE and guess branch nameJames Lopez2018-10-241-4/+10
| |/ / / / / / /
| * | | | | | | Merge branch 'backport-ce-for-5781-operations-homepage-mvc-frontend' into ↵Annabel Dunstone Gray2018-10-241-0/+10
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Backport scss changes for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7973 See merge request gitlab-org/gitlab-ce!22503
| | * | | | | | | Backport scss changes for ee 7973backport-ce-for-5781-operations-homepage-mvc-frontendAdriel Santiago2018-10-191-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7973
View Lorry Controller Status