summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update documentationdm-remove-private-tokenDouwe Maan2017-11-023-66/+75
|
* Add changelog itemsDouwe Maan2017-11-024-0/+21
|
* Update specs for sudo behaviorDouwe Maan2017-11-023-241/+155
|
* Move RSS and incoming email tokens from User Settings > Accounts to User ↵Douwe Maan2017-11-025-37/+53
| | | | Settings > Access Tokens
* Remove user authentication_token columnDouwe Maan2017-11-023-2/+21
|
* Migrate user private tokens to personal access tokensDouwe Maan2017-11-022-0/+103
|
* Add sudo API scopeDouwe Maan2017-11-0211-98/+74
|
* Consistently use PersonalAccessToken instead of PersonalTokenDouwe Maan2017-11-024-15/+15
|
* Remove User#private_tokenDouwe Maan2017-11-021-4/+1
|
* Remove authentication using user.private_tokenDouwe Maan2017-11-0215-200/+75
|
* Remove tokens:reset_all_auth rake taskDouwe Maan2017-11-022-17/+1
|
* Remove gitlab:users:clear_all_authentication_tokens rake taskDouwe Maan2017-11-023-64/+0
|
* Remove private_token from API user entityDouwe Maan2017-11-026-20/+7
|
* Remove Session APIDouwe Maan2017-11-025-184/+0
|
* Remove Private Token from User Settings > AccountDouwe Maan2017-11-026-24/+7
|
* Merge branch 'winh-i18n-contributors-page' into 'master'Phil Hughes2017-11-023-8/+14
|\ | | | | | | | | | | | | Make contributors page translatable Closes #38592 See merge request gitlab-org/gitlab-ce!14915
| * Make contributors page translatableWinnie Hellmann2017-11-023-8/+14
|/
* Merge branch '39363-fix-ls-files-encoding' into 'master'Douwe Maan2017-11-027-1/+8
|\ | | | | | | | | | | | | Fix encoding issue with Repository.ls_files Closes #39363 See merge request gitlab-org/gitlab-ce!15113
| * Fix encoding issue with Repository.ls_filesKim Carlbäcker2017-11-027-1/+8
|/
* Merge branch 'jivl-mobile-friendly-table-runners' into 'master'Annabel Dunstone Gray2017-11-013-16/+29
|\ | | | | | | | | | | | | Mobile-friendly table on Admin Runners Closes #33848 See merge request gitlab-org/gitlab-ce!15134
| * Mobile-friendly table on Admin Runnersjivl-mobile-friendly-table-runnersTakuya Noguchi2017-11-013-16/+29
| |
* | Merge branch '39513-fix-gears-spinning-physically' into 'master'Clement Ho2017-11-012-3/+8
|\ \ | | | | | | | | | | | | | | | | | | Fix Auto DevOps graphic gears spinning based on physics Closes #39513 See merge request gitlab-org/gitlab-ce!15076
| * | Fix autodevops graphic gears spinning based on physics39513-fix-gears-spinning-physicallyEric Eastwood2017-10-302-3/+8
| | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39513
* | | Merge branch 'fix-user-tab-activity-mobile' into 'master'Annabel Dunstone Gray2017-11-012-1/+13
|\ \ \ | | | | | | | | | | | | | | | | Fixed user profile tab being off-screen See merge request gitlab-org/gitlab-ce!15030
| * | | Fixed user profile tab being off-screenfix-user-tab-activity-mobilePhil Hughes2017-10-242-1/+13
| | | |
* | | | Merge branch 'dco' into 'master'Marcia Ramos2017-11-011-6/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Move from doc to repo. See merge request gitlab-org/gitlab-ce!15139
| * | | | Move from doc to repo.dosire2017-11-011-6/+5
|/ / / /
* | | | Merge branch 'jlh-replace-cla' into 'master'Sid Sijbrandij2017-11-013-59/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Replace CLA See merge request gitlab-org/gitlab-ce!15115
| * | | | Update CONTRIBUTING.mdjlh-replace-claJamie Hurewitz2017-10-311-1/+1
| | | | |
| * | | | Update CONTRIBUTING.mdJamie Hurewitz2017-10-311-240/+3
| | | | |
| * | | | Replace CLA with DCO and licenseErnst van Nierop2017-10-311-29/+2
| | | | |
| * | | | Replace CLA with link to DCO and licenseErnst van Nierop2017-10-311-25/+2
| | | | |
| * | | | Replace CLAJamie Hurewitz2017-10-311-5/+247
| | | | |
* | | | | Merge branch 'patch-29' into 'master'Douwe Maan2017-11-011-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix typo See merge request gitlab-org/gitlab-ce!15136
| * | | | | Fix typoMichael Kozono2017-11-011-1/+1
| | | | | |
* | | | | | Merge branch 'jej/lfs-change-detection' into 'master'Douwe Maan2017-11-018-41/+313
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detect changes to LFS pointers for pruning and integrity check See merge request gitlab-org/gitlab-ce!14785
| * | | | | | Detect changes to LFS pointers for pruning and integrity checkJames Edwards-Jones2017-11-018-41/+313
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab::Git::Blob.batch_lfs_metadata can be used to check for LFS pointers. It uses a lazy enumorator and filters by blob size
* | | | | | | Merge branch 'feature/plantuml-restructured-text-captions' into 'master'Douwe Maan2017-11-013-17/+27
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | Update gitlab-markup and PlantUML docs See merge request gitlab-org/gitlab-ce!15120
| * | | | | | Update gitlab-markup and PlantUML docsMarkus Koller2017-11-013-17/+27
| | | | | | |
* | | | | | | Merge branch 'sh-disable-unicorn-sampling-sidekiq' into 'master'Douwe Maan2017-11-012-1/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable Unicorn sampling in Sidekiq since there are no Unicorn sockets to monitor See merge request gitlab-org/gitlab-ce!15128
| * | | | | | | Disable Unicorn sampling in Sidekiq since there are no Unicorn sockets to ↵sh-disable-unicorn-sampling-sidekiqStan Hu2017-11-012-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | monitor This reduces some polling overhead and reduces the need to aggregate empty metrics from the Sidekiq worker.
* | | | | | | | Merge branch 'docs/ci-disposable-env-fix' into 'master'28025-consider-using-webpack-dev-server-overlay-option-for-more-helpful-compile-errorsMarcia Ramos2017-11-011-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix wording on CI disposable variables See merge request gitlab-org/gitlab-ce!14983
| * | | | | | | | Fix wording on CI disposable variablesdocs/ci-disposable-env-fixAchilleas Pipinellis2017-10-211-2/+2
| | | | | | | | |
* | | | | | | | | Merge branch 'docs/webhook-troubleshooting-steps' into 'master'Marcia Ramos2017-11-011-0/+12
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add extra webhook troubleshooting steps See merge request gitlab-org/gitlab-ce!15125
| * | | | | | | | | Add extra webhook troubleshooting stepsdocs/webhook-troubleshooting-stepsCindy Pallares 🦉2017-11-011-0/+12
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | Add information on duplicate or multiple triggers caused by a slow response time.
* | | | | | | | | Merge branch 'patch-19-docs' into 'master'Sean McGivern2017-11-011-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | document that PostgreSQL 10.0 is not supported See merge request gitlab-org/gitlab-ce!15095
| * | | | | | | | document that PostgreSQL 10.0 is not supportedBen Bodenmiller2017-10-311-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'docs/no-comments' into 'master'🚄 Job van der Voort 🚀2017-11-01129-108/+570
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exclude comments from specific docs Closes #39678 See merge request gitlab-org/gitlab-ce!15122
| * | | | | | | | | Exclude comments from specific docsAchilleas Pipinellis2017-11-01129-108/+570
|/ / / / / / / / /
* | | | | | | | | Merge branch '35914-merge-request-update-worker-is-slow' into 'master'Sean McGivern2017-11-014-20/+44
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add metrics tagging to the sidekiq middleware See merge request gitlab-org/gitlab-ce!15111