summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Ensure we return an actual ApplicationSetting object when fallbacking in Gitl...47491-improve-current-fakeapplicationsettings-doesn-t-respond-to-all-the-methods-applicationsetting-responds-to-itselfRémy Coutable2018-06-075-80/+34
* Make Gitlab::CurrentSettings.current_application_settings return cached setti...Rémy Coutable2018-06-072-57/+92
* Avoid sequential scans loading schema_migrations table when loading applicati...Stan Hu2018-06-071-0/+13
* Merge branch '47484-performance-bar-select-box-has-wrong-text-colour' into 'm...Annabel Gray2018-06-071-0/+1
|\
| * Fix text colour in performance bar request selectorSean McGivern2018-06-071-0/+1
* | Merge branch 'backup-rake-tar' into 'master'Douwe Maan2018-06-071-3/+8
|\ \
| * | Consistently use tar lookup functionJacob Vosmaer2018-06-071-3/+8
* | | Merge branch 'docs/gitlab-com-artifacts-expire' into 'master'Marcia Ramos2018-06-071-0/+1
|\ \ \
| * | | Add artifacts expiry time for GitLab.comAchilleas Pipinellis2018-06-071-0/+1
* | | | Merge branch 'install-type' into 'master'Sean McGivern2018-06-074-0/+5
|\ \ \ \
| * | | | Add installation type to usage ping dataBalasankar C2018-06-074-0/+5
|/ / / /
* | | | Merge branch 'dz-fix-oauth-service-requirements' into 'master'Douwe Maan2018-06-071-1/+1
|\ \ \ \
| * | | | Make request argument required for Applications::CreateServiceDmitriy Zaporozhets2018-06-071-1/+1
| | |/ / | |/| |
* | | | Merge branch '47189-github_import_visibility_doc_update' into 'master'Douwe Maan2018-06-071-1/+3
|\ \ \ \
| * | | | Update doc for maintaining project visibility during Github importImre Farkas2018-06-071-1/+3
| | |_|/ | |/| |
* | | | Merge branch 'docs-article-link-from-index' into 'master'Achilleas Pipinellis2018-06-071-1/+3
|\ \ \ \
| * | | | index articleMarcia Ramos2018-06-071-1/+3
* | | | | Merge branch 'docs/autodevops-multiple-clusters' into 'master'Marcia Ramos2018-06-073-33/+100
|\ \ \ \ \
| * | | | | Port the Auto DevOps docs from EEAchilleas Pipinellis2018-06-073-33/+100
* | | | | | Merge branch 'ccr/extract_EE_code_5942' into 'master'Sean McGivern2018-06-071-13/+17
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Backport of 5942-extract-ee-specific-filesccr/extract_EE_code_5942Chantal Rollison2018-06-011-13/+17
* | | | | | Merge branch 'docs-article-cloud-foundry' into 'master'Achilleas Pipinellis2018-06-073-0/+142
|\ \ \ \ \ \
| * | | | | | Docs: article - Deploy SB apps to CF with GitLab CI/CDMarcia Ramos2018-06-073-0/+142
|/ / / / / /
* | | | | | Merge branch '6216-extract-ee-specific-files-lines-for-app-views-admin-groups...Sean McGivern2018-06-074-3/+24
|\ \ \ \ \ \
| * | | | | | Reduce CE/EE diff in app/views/admin/groups/Rémy Coutable2018-06-064-3/+24
* | | | | | | Merge branch '47470-gke-cluster-creation-form-has-project-id-label-for-projec...47408-migrateuploadsworker-is-doing-n-1-queries-on-migration-2Tim Zallmann2018-06-072-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Change 'project ID' into 'project'bikebilly2018-06-072-2/+2
* | | | | | | | Merge branch 'restore-navigation-theme-order' into 'master'Phil Hughes2018-06-073-11/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Restore navigation theme orderGeorge Tsiolis2018-06-073-11/+11
|/ / / / / / / /
* | | | | | | | Merge branch 'docs/47485-update-docs-to-reflect-the-new-place-of-the-kubernet...Achilleas Pipinellis2018-06-074-6/+6
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Resolve "Update docs to reflect the new place of the Kubernetes page"Fabio Busatto2018-06-074-6/+6
|/ / / / / / /
* | | | | | | Merge branch '44790-disabled-emails-logging' into 'master'Sean McGivern2018-06-072-1/+9
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | 44790: Add change logMarc Shaw2018-06-031-0/+5
| * | | | | | 44790: Disable the action mailer base logging when emails are disabledMarc Shaw2018-06-031-1/+4
* | | | | | | Merge branch 'dz-fix-cluster-oauth' into 'master'Dmitriy Zaporozhets2018-06-071-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Pass request to oauth creation during cluster app installDmitriy Zaporozhets2018-06-071-1/+1
* | | | | | | Merge branch '39549-label-list-page-redesign-with-draggable-labels' into 'mas...Tim Zallmann2018-06-0716-283/+330
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into '39549-label-list-page-redesign-with-draggable-lab...Luke Bennett2018-06-07321-1607/+6517
| |\ \ \ \ \ \ \
| * | | | | | | | Fix specLuke Bennett2018-06-061-8/+7
| * | | | | | | | perf improvementLuke Bennett2018-06-062-2/+2
| * | | | | | | | UX reviewLuke Bennett2018-06-061-1/+1
| * | | | | | | | UX reviewLuke Bennett2018-06-063-10/+9
| * | | | | | | | Fix scss_lintLuke Bennett2018-06-061-1/+1
| * | | | | | | | Merge remote-tracking branch 'origin/master' into 39549-label-list-page-redes...Luke Bennett2018-06-06175-678/+1838
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into 39549-label-list-page-redes...Luke Bennett2018-06-0548-215/+684
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | FE review changesLuke Bennett2018-06-054-3/+4
| * | | | | | | | | | Fix eslint39549-label-list-page-redesign-with-draggable-labelsLuke Bennett2018-06-051-1/+1
| * | | | | | | | | | Merge remote-tracking branch 'origin/master' into 39549-label-list-page-redes...Luke Bennett2018-06-05963-23413/+14653
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | FE review changesLuke Bennett2018-06-059-39/+44
| * | | | | | | | | | | fix lintLuke Bennett2018-05-291-0/+1