summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove undigested token column from personal_access_tokens tableif-53411-remove_personal_access_tokens_tokenImre Farkas2019-02-158-202/+86
| | | | | Token column are no longer used as token values are stored digested in token_digest.
* Merge branch 'ce-reduce-diff-in-groups-create_service' into 'master'dastor-update-AWS-instructionsDouglas Barbosa Alexandre2019-02-011-0/+6
|\ | | | | | | | | Reduce diff with EE in Groups::CreateService See merge request gitlab-org/gitlab-ce!24871
| * Reduce diff with EE in Groups::CreateServiceRémy Coutable2019-02-011-0/+6
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'patch-29' into 'master'Rémy Coutable2019-02-011-0/+1
|\ \ | | | | | | | | | | | | | | | | | | Add parameter at project level endpoint to api documentation Closes #52589 See merge request gitlab-org/gitlab-ce!22397
| * | Apply suggestion to doc/api/merge_requests.mdRémy Coutable2019-02-011-1/+1
| | |
| * | Merge branch 'master' into 'patch-29'Rémy Coutable2019-02-017632-80449/+396515
| |\ \ | | | | | | | | | | | | # Conflicts: # doc/api/merge_requests.md
| * | | Add wip parameter at project level endpoint to api documentation Vladimir Babin2018-10-161-5/+6
| | | | | | | | | | | | It resolves #52589 issue
* | | | Merge branch 'ee-1979-blobs-at' into 'master'Douwe Maan2019-02-012-0/+23
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Fix migration when project repository is missing See merge request gitlab-org/gitlab-ce!24859
| * | | Fix migration when project repository is missingMark Chao2019-02-012-0/+23
| | | | | | | | | | | | | | | | | | | | The data migration looks for code owner file and errs if repository is missing.
* | | | Merge branch 'ce-reduce-diff-in-pipeline_trigger_service' into 'master'Douglas Barbosa Alexandre2019-02-011-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Reduce diff with EE in Ci::PipelineTriggerService See merge request gitlab-org/gitlab-ce!24866
| * | | | Reduce diff with EE in Ci::PipelineTriggerServiceRémy Coutable2019-02-011-0/+10
| |/ / / | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'fix-package-and-qa-and-review-build-cng-jobs' into 'master'Rémy Coutable2019-02-011-19/+20
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Fix the package-and-qa and review-build-cng jobs See merge request gitlab-org/gitlab-ce!24861
| * | | Fix the package-and-qa and review-build-cng jobsRémy Coutable2019-02-011-19/+20
| |/ / | | | | | | | | | | | | | | | | | | | | | By changing the `review-build-cng` job to be a `single-script-job`, the repository content wasn't there, including the `*_VERSION` files, thus leading to missing variables for components in the triggered pipeline. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'issues/310-push-check-size-limit-enabled' into 'master'Rémy Coutable2019-02-018-4/+134
|\ \ \ | | | | | | | | | | | | | | | | Add an E2E test of push with the file size limit set See merge request gitlab-org/gitlab-ce!24431
| * | | adding a spec for issues/310Mesut Güneş2019-02-018-4/+134
|/ / /
* | | Merge branch '51913-api-getting-projects-for-users-with-dot-gets-404' into ↵Rémy Coutable2019-02-016-7/+22
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | 'master' API: Support username with dots Closes #51913 See merge request gitlab-org/gitlab-ce!24395
| * | Unify user requirements for API slugsRobert Schilling2019-01-313-4/+5
| | |
| * | Add missing changelogsRobert Schilling2019-01-151-0/+5
| | |
| * | API: Support username with dotsRobert Schilling2019-01-154-5/+14
| | |
* | | Merge branch '56398-fix-broken-cluster-installation-loading-state' into 'master'Fatih Acet2019-02-017-130/+81
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix cluster installation processing spinner (reopened) Closes #56398 See merge request gitlab-org/gitlab-ce!24814
| * | | Fix cluster installation processing spinner (reopened)Jacques Erasmus2019-02-017-130/+81
|/ / /
* | | Merge branch 'winh-position-helpers' into 'master'Clement Ho2019-02-011-0/+6
|\ \ \ | | | | | | | | | | | | | | | | Add CSS helper classes for positioning See merge request gitlab-org/gitlab-ce!24821
| * | | Add CSS helper classes for positioningWinnie Hellmann2019-01-311-0/+6
| | | |
* | | | Merge branch 'qa-github-oauth-login-test-2' into 'master'Rémy Coutable2019-02-0110-7/+111
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add e2e QA test for logging in using Github OAuth See merge request gitlab-org/gitlab-ce!24817
| * | | | Add e2e QA test for logging in using GitHub OAuthSanad Liaquat2019-02-0110-7/+111
| | | | | | | | | | | | | | | | | | | | | | | | | Adds the test itself and the vendor page object model for GitHub login pages.
* | | | | Merge branch 'adriel-remove-d3-metrics-graph' into 'master'Phil Hughes2019-02-0124-1868/+2
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Remove d3 metrics graph See merge request gitlab-org/gitlab-ce!24647
| * | | | Remove d3 metrics graphAdriel Santiago2019-02-0124-1868/+2
|/ / / /
* | | | Merge branch 'patch-41' into 'master'Evan Read2019-02-011-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | The GitLab Pages IP address for GitLab.com changed from 52.167.214.135 to... See merge request gitlab-org/gitlab-ce!24797
| * | | | The GitLab Pages IP address for GitLab.com changed from 52.167.214.135 to ↵Star Light2019-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | 35.185.44.232 in August 2018. (https://about.gitlab.com/2017/02/07/setting-up-gitlab-pages-with-cloudflare-certificates/#step-1-dns-record)
* | | | | Merge branch 'docs-serverless-tmcli-update' into 'master'Evan Read2019-01-313-21/+29
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Docs serverless tmcli update See merge request gitlab-org/gitlab-ce!24689
| * | | | | Fix rendering of caution textEvan Read2019-02-011-5/+6
| | | | | |
| * | | | | Update intro note and stepsdanielgruesso2019-01-311-5/+6
| | | | | |
| * | | | | Update private repo stepsDaniel Gruesso2019-01-301-10/+1
| | | | | |
| * | | | | Removed orphaned file and update for clarityDaniel Gruesso2019-01-301-12/+9
| | | | | |
| * | | | | Delete file serverless-details.pngDaniel Gruesso2019-01-301-0/+0
| | | | | |
| * | | | | Removed orphaned file and update for claritydanielgruesso2019-01-301-1/+1
| | | | | |
| * | | | | Add domain retrieval info and imagedanielgruesso2019-01-302-1/+5
| | | | | |
| * | | | | Update tm cli version and clarify stepsdanielgruesso2019-01-301-18/+32
| | | | | |
* | | | | | Merge branch 'fix-rubocop-violations' into 'master'Stan Hu2019-01-313-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix rubocop violations See merge request gitlab-org/gitlab-ce!24837
| * | | | | | Fix rubocop violationsGabriel Mazetto2019-01-313-3/+3
| | | | | | |
* | | | | | | Merge branch 'fix/39759-new-project-icon-vertical-align' into 'master'Annabel Dunstone Gray2019-01-312-0/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix(settings): Adjusted vertical alignment of visibility icons Closes #39759 See merge request gitlab-org/gitlab-ce!24511
| * | | | | | fix(settings): Adjusted vertical alignment of visibility iconsMartin Hobert2019-01-312-0/+7
|/ / / / / /
* | | | | | Merge branch 'qa-ml-fix-create-wiki-spec' into 'master'Dan Davison2019-01-318-35/+60
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix flaky wiki create test Closes gitlab-org/quality/nightly#24 See merge request gitlab-org/gitlab-ce!24778
| * | | | | | Fix flaky wiki create testMark Lapierre2019-01-298-35/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's an svg on the page that allows you to create a wiki page. The svg takes a fraction of a second to load after which the "Create your first page" button shifts up a bit. This can cause webdriver to miss the hit so we wait for the svg to load before clicking the button. Also update the elements used in the test to conform to our best practice. And replace `act` with `perform` Finally, remove the `before` block and `login` method, making the code slightly simpler.
* | | | | | | Fixed changelog for 11.7.2Yorick Peterse2019-01-311-27/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This got merged up somewhere in the process of merging dev.gitlab.org and GitLab.com back together.
* | | | | | | Update CHANGELOG.md for 11.6.8GitLab Release Tools Bot2019-01-311-0/+4
| | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Fix requiring the rubyzip GemYorick Peterse2019-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 6fa5fd8515e0f2d5a6341134560021f353d84362 the `require: false` was removed to ensure the Gem was loaded at run time. Unfortunately, the `require` necessary for the rubyzip Gem is "zip" and not "rubyzip". As a result, Bundler would not require the Gem. This meant that we would still run into constant errors when referring to `Zip::File`.
* | | | | | | Update CHANGELOG.md for 11.7.2GitLab Release Tools Bot2019-01-311-0/+34
| | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Fix uninitialized constant with GitLab Pages deployStan Hu2019-01-313-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pages:deploy step was failing with the following error: ``` unitialized constant SafeZip::Extract::Zip ``` Since license_finder already pulls in rubyzip, we can make it a required gem. We also use the scope operator to make the reference to Zip::File explicit.
* | | | | | | Update CHANGELOG.md for 11.5.8GitLab Release Tools Bot2019-01-311-0/+27
| | | | | | | | | | | | | | | | | | | | | [ci skip]
View Lorry Controller Status