summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Allow comment after if/unless clause46758-fallout-of-cacheable-attributeRémy Coutable2018-05-292-1/+13
* Ensure ApplicationSetting#performance_bar_allowed_group_id is properly set wh...Rémy Coutable2018-05-2911-167/+170
* Merge branch 'dz-redesign-group-settings-page' into 'master'Filipa Lacerda2018-05-2910-93/+204
|\
| * Use full path to group settings partialsDmitriy Zaporozhets2018-05-281-2/+2
| * Simplify titles for group settings sectionsDmitriy Zaporozhets2018-05-281-2/+2
| * Use render_if_exists for group settings page to keep same code as EEDmitriy Zaporozhets2018-05-282-0/+4
| * Fix tests after group settings page redesignDmitriy Zaporozhets2018-05-286-22/+44
| * Redesign group settings page into expandable sectionsDmitriy Zaporozhets2018-05-287-76/+161
* | Merge branch 'patch-21' into 'master'Rémy Coutable2018-05-291-5/+8
|\ \
| * | cleanup Prometheus setup detailsBen Bodenmiller2018-05-291-5/+8
|/ /
* | Merge branch 'add-artifacts_expire_at-to-api' into 'master'Grzegorz Bizon2018-05-294-1/+18
|\ \
| * | Expose artifacts_expire_at field for job entity in apiSemyon Pupkov2018-05-264-1/+18
* | | Merge branch 'sh-tag-queue-duration-api-calls' into 'master'Sean McGivern2018-05-294-1/+68
|\ \ \
| * | | Log queue duration for Grape API callssh-tag-queue-duration-api-callsStan Hu2018-05-284-1/+68
* | | | Merge branch 'qa/rs-api-users-spec' into 'master'Grzegorz Bizon2018-05-291-5/+4
|\ \ \ \
| * | | | Simplify users API QA specqa/rs-api-users-specRobert Speicher2018-05-251-5/+4
* | | | | Merge branch 'groups-controller-show-performance' into 'master'Douwe Maan2018-05-295-20/+44
|\ \ \ \ \
| * | | | | Add GroupsController#show performance changeloggroups-controller-show-performanceYorick Peterse2018-05-281-0/+5
| * | | | | Added partial index for merge requestsYorick Peterse2018-05-282-1/+29
| * | | | | Reduce queries in GroupProjectsFinderYorick Peterse2018-05-281-18/+8
| * | | | | Eager load project routes for issue referencesYorick Peterse2018-05-281-1/+2
* | | | | | Merge branch '38919/wiki-empty-states' into 'master'Phil Hughes2018-05-2913-16/+173
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Add helpful messages to empty wiki viewPaul Slaughter2018-05-2913-16/+173
|/ / / / /
* | | | | Merge branch 'docs/fix-contributing-broken-tag' into 'master'Rémy Coutable2018-05-281-1/+1
|\ \ \ \ \
| * | | | | "Build" team is now "Distribution"Philippe Lafoucrière2018-05-281-1/+1
* | | | | | Merge branch 'ab-45389-remove-double-checked-internal-id-generation' into 'ma...Yorick Peterse2018-05-283-55/+11
|\ \ \ \ \ \
| * | | | | | Remove double-checked internal id generation.Andreas Brandl2018-05-283-55/+11
* | | | | | | Merge branch 'ce-6225-unify-app-views-milestones' into 'master'Rémy Coutable2018-05-282-1/+5
|\ \ \ \ \ \ \
| * | | | | | | Bring changes from EELin Jen-Shin2018-05-282-1/+5
* | | | | | | | Merge branch 'add-background-migration-to-fill-file-store' into 'master'Kamil Trzciński2018-05-286-0/+181
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove disable_statement_timeoutadd-background-migration-to-fill-file-storeShinya Maeda2018-05-281-2/+0
| * | | | | | | | Remove Gitlab::BackgroundMigration exxxplicit namespaces from migration classesShinya Maeda2018-05-283-6/+6
| * | | | | | | | Rename FillFileStoreUpload to FillStoreUploadShinya Maeda2018-05-282-3/+4
| * | | | | | | | Add chnage logShinya Maeda2018-05-281-0/+5
| * | | | | | | | Add spec for fill_file_store migrationShinya Maeda2018-05-285-6/+49
| * | | | | | | | Fix schema and refactoring migration fileShinya Maeda2018-05-281-24/+26
| * | | | | | | | Remove legacy artifacts file_store migrationShinya Maeda2018-05-283-72/+6
| * | | | | | | | Add background migration to fill file storesShinya Maeda2018-05-286-0/+198
* | | | | | | | | Merge branch '38479-rename-secret-variables-to-variables' into 'master'Kamil Trzciński2018-05-284-5/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Resolve "Rename "secret variables" to "variables""Fabio Busatto2018-05-284-5/+5
|/ / / / / / / / /
* | | | | | | | | Merge branch 'patch-28' into 'master'Kamil Trzciński2018-05-285-4/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add changelogShinya Maeda2018-05-281-0/+5
| * | | | | | | | | Fix specShinya Maeda2018-05-283-3/+3
| * | | | | | | | | Update object_storage.rbShinya Maeda2018-05-281-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'leipert-forward-bootstrap4' into 'master'Filipa Lacerda2018-05-282-4/+4
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Update bootstrap to 4.1.1Lukas Eipert2018-05-282-4/+4
* | | | | | | | | Merge branch 'docs/redirect-k8s-service-page' into 'master'Marcia Ramos2018-05-287-282/+14
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Deprecate the Kubernetes service docsdocs/redirect-k8s-service-pageAchilleas Pipinellis2018-05-097-282/+14
* | | | | | | | | Merge branch 'leipert-backport-bs4-merge-conflict' into 'master'Fatih Acet2018-05-281-6/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | backport EE version ofLukas Eipert2018-05-281-6/+4
| | |/ / / / / / / | |/| | | | | | |