summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changelog entry41731-predicate-memoizationLin Jen-Shin2018-01-121-0/+5
|
* Properly cleaning up memoized valuesLin Jen-Shin2018-01-121-3/+5
|
* Introduce PredicateMemoization cop and fix offensesLin Jen-Shin2018-01-1212-21/+192
| | | | with StrongMemoize
* Merge branch 'fix/export-message' into 'master'Stan Hu2018-01-121-1/+1
|\ | | | | | | | | Update export message to mention we can download the file from the UI See merge request gitlab-org/gitlab-ce!16419
| * Update export message to mention we can download the file from the UIJames Lopez2018-01-121-1/+1
|/
* Merge branch '41882-respect-only-path-in-relative-link-filter' into 'master'Douwe Maan2018-01-123-17/+51
|\ | | | | | | | | | | | | Resolve "Attachments in e-mail notifications are using the wrong URL" Closes #41882 See merge request gitlab-org/gitlab-ce!16364
| * Ensure that emails contain absolute, rather than relative, links to user uploadsNick Thomas2018-01-113-17/+51
| |
* | Merge branch 'mk-fix-permanent-redirect-validation' into 'master'Douwe Maan2018-01-124-1/+81
|\ \ | | | | | | | | | | | | | | | | | | Fix Route validation when conflicting permanent redirects exist Closes gitlab-com/support-forum#2883 and #41786 See merge request gitlab-org/gitlab-ce!16397
| * | Add changelog entrymk-fix-permanent-redirect-validationMichael Kozono2018-01-111-0/+5
| | |
| * | Add RedirectRoute factoryMichael Kozono2018-01-112-3/+18
| | |
| * | Fix Rubocop offenseMichael Kozono2018-01-111-1/+1
| | |
| * | Revert "Revert "Fix Route validation for unchanged path""Michael Kozono2018-01-112-1/+61
| | | | | | | | | | | | This reverts commit 3576d59ae95a61dd20e997a619dbc6c8e8a70276.
* | | Merge branch ↵Fatih Acet2018-01-121-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '37077-subscribe-button-tooltip-on-issues-page-causes-visual-stuttering' into 'master' Resolve "Subscribe button tooltip on issues page causes visual stuttering" Closes #37077 See merge request gitlab-org/gitlab-ce!16411
| * | | fix case where tooltip messes up :last-child selector37077-subscribe-button-tooltip-on-issues-page-causes-visual-stutteringMike Greiling2018-01-111-1/+1
| | | |
* | | | Merge branch '41749-postgres-9.6-for-ci-tests' into 'master'Rémy Coutable2018-01-122-0/+8
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Add reason to keep postgresql 9.2 for CI See merge request gitlab-org/gitlab-ce!16277
| * | | Add reason to keep postgresql 9.2 for CITakuya Noguchi2018-01-122-0/+8
| | | |
* | | | Merge branch 'feature/migrate-is-rebase-in-progress-to-gitaly' into 'master'Robert Speicher2018-01-113-24/+53
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate rebase_in_progress? to Gitaly Closes gitaly#866 See merge request gitlab-org/gitlab-ce!16286
| * | | | Migrate rebase_in_progress? to Gitalyfeature/migrate-is-rebase-in-progress-to-gitalyAhmad Sherif2018-01-103-24/+53
| | | | | | | | | | | | | | | | | | | | Closes gitaly#866
* | | | | Merge branch 'feature/migrate-rebase-to-gitaly' into 'master'Robert Speicher2018-01-113-59/+133
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Gitlab::Git::Repository#rebase to Gitaly Closes gitaly#863 See merge request gitlab-org/gitlab-ce!16259
| * | | | | Migrate Gitlab::Git::Repository#rebase to Gitalyfeature/migrate-rebase-to-gitalyAhmad Sherif2018-01-103-59/+133
| |/ / / / | | | | | | | | | | | | | | | Closes gitaly#863
* | | | | Merge branch 'sh-remove-import-retry-count-warning' into 'master'Robert Speicher2018-01-111-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove warning noise in ProjectImportOptions See merge request gitlab-org/gitlab-ce!16410
| * | | | | Remove warning noise in ProjectImportOptionsStan Hu2018-01-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squlches these warnings: ``` /opt/gitlab/embedded/service/gitlab-rails/app/workers/concerns/project_import_options.rb:5: warning: already initialized constant ProjectImportOptions::IMPORT_RETRY_COUNT /opt/gitlab/embedded/service/gitlab-rails/app/workers/concerns/project_import_options.rb:5: warning: previous definition of IMPORT_RETRY_COUNT was here ```
* | | | | | Merge branch 'dispatcher-dashboard-mr' into 'master'Fatih Acet2018-01-112-3/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor dispatcher dashboard mr path See merge request gitlab-org/gitlab-ce!16360
| * | | | | | Remove initLegacyFilters reference in dispatcherdispatcher-dashboard-mrClement Ho2018-01-101-1/+0
| | | | | | |
| * | | | | | Refactor dispatcher dashboard mr pathClement Ho2018-01-102-2/+10
| | | | | | |
* | | | | | | Merge branch 'dispatcher-boards' into 'master'Fatih Acet2018-01-112-2/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor dispatcher project boards path See merge request gitlab-org/gitlab-ce!16374
| * | | | | | | Refactor dispatcher project boards pathdispatcher-boardsClement Ho2018-01-102-2/+11
| |/ / / / / /
* | | | | | | Merge branch '41163-improve-cluster-ingress-extra-cost-language' into 'master'Fatih Acet2018-01-112-6/+12
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve wording about additional costs with Ingress on GKE or custom clusters Closes #41163 See merge request gitlab-org/gitlab-ce!16370
| * | | | | | Update Ingress extra cost note to be more generic41163-improve-cluster-ingress-extra-cost-languageEric Eastwood2018-01-112-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/41163
* | | | | | | Merge branch ↵Annabel Dunstone Gray2018-01-111-1/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '41221-padding-is-wrong-for-pipeline-dropdowns-on-current-master' into 'master' Fix padding for pipeline dropdowns after bad merge Closes #41221 See merge request gitlab-org/gitlab-ce!15982
| * | | | | | | Remove wrong padding from pipelines.scss41221-padding-is-wrong-for-pipeline-dropdowns-on-current-masterWinnie Hellmann2017-12-181-1/+0
| | | | | | | |
* | | | | | | | Merge branch 'main-js-tidy-up' into 'master'Filipa Lacerda2018-01-1149-140/+145
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tidy up main JS file See merge request gitlab-org/gitlab-ce!16007
| * | | | | | | | Tidy up main JS filemain-js-tidy-upPhil Hughes2018-01-1049-140/+145
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceLuke Bennett2018-01-11550-6993/+10355
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '41607-require-rsync-docs' into 'master'Achilleas Pipinellis2018-01-113-5/+20
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Document rsync as requirement for 10.4" Closes #41607 See merge request gitlab-org/gitlab-ce!16252
| | * | | | | | | Document that we need rsync for backing upLin Jen-Shin2018-01-123-5/+20
| | | | | | | | |
| * | | | | | | | Merge branch 'docs-move-article-laravel-envoy' into 'master'Achilleas Pipinellis2018-01-1119-682/+687
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: move article "Laravel and Envoy w/ CI/CD" See merge request gitlab-org/gitlab-ce!16359
| | * | | | | | | | Docs: move article "Laravel and Envoy w/ CI/CD"Marcia Ramos2018-01-1119-682/+687
| | |/ / / / / / /
| * | | | | | | | Merge branch 'docs-move-article-openshift' into 'master'Achilleas Pipinellis2018-01-1119-512/+512
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Docs: move GitLab/Openshift article to its topic-related dir See merge request gitlab-org/gitlab-ce!16367
| | * | | | | | | move article to its topic-related dir, update linksdocs-move-article-openshiftMarcia Ramos2018-01-1019-512/+512
| | | | | | | | |
| * | | | | | | | Merge branch 'docs/add-aws-reference-diagram' into 'master'Achilleas Pipinellis2018-01-112-0/+4
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port gitlab-ee MR 3981 to CE See merge request gitlab-org/gitlab-ce!16371
| | * | | | | | | | Port gitlab-ee MR 3981 to CEdocs/add-aws-reference-diagramBrendan O'Leary2018-01-102-0/+4
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'docs-fix-api-snippets-docs' into 'master'Achilleas Pipinellis2018-01-111-2/+3
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix external links in Snippets API documentation See merge request gitlab-org/gitlab-ce!16385
| | * | | | | | | | Fix external links in Snippets API documentationMark Fletcher2018-01-111-2/+3
| | | | | | | | | |
| * | | | | | | | | Merge branch 'docs-update-EFS-HA-note' into 'master'Achilleas Pipinellis2018-01-111-1/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recommend against the use of EFS See merge request gitlab-org/gitlab-ce!16395
| | * | | | | | | | | Recommend against the use of EFSdocs-update-EFS-HA-noteCindy Pallares 🦉2018-01-111-1/+3
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'help-profiles-dispatcher-refactor' into 'master'Phil Hughes2018-01-114-11/+24
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactored profile:* and help:* imports in dispatcher See merge request gitlab-org/gitlab-ce!16330
| | * | | | | | | | | Resolved conflicts in dispatcher.jshelp-profiles-dispatcher-refactorConstance Okoghenun2018-01-11384-5752/+8191
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Removed experimental feature flag unsed depenecy for profiles/preferencesConstance Okoghenun2018-01-112-9/+3
| | | | | | | | | | | |
| | * | | | | | | | | | Refactored profile:* and help:* imports in dispatcherConstance Okoghenun2018-01-095-6/+27
| | | | | | | | | | | |
View Lorry Controller Status