summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Exclude gitlab_git_test from docs only changesdocs/exclude-gitlab-git-testAchilleas Pipinellis2017-07-071-0/+1
|
* Merge branch 'pages-0-5-0' into 'master'Grzegorz Bizon2017-07-071-1/+1
|\ | | | | | | | | Upgrade GitLab Pages to v0.5.0 See merge request !12625
| * Upgrade GitLab Pages to v0.5.0Nick Thomas2017-07-041-1/+1
| |
* | Merge branch '33748-fix-n-plus-1-query-in-the-projects-api' into 'master'Robert Speicher2017-07-074-4/+61
|\ \ | | | | | | | | | | | | | | | | | | Fix some N+1 queries in the GET /projects API Closes #33748 See merge request !12679
| * | Add CHANGELOGRémy Coutable2017-07-071-0/+4
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Fix some N+1 queries in the GET /projects APIRémy Coutable2017-07-073-4/+57
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'fix-routes-in-production-mode' into 'master'Douwe Maan2017-07-061-1/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix shorter route helpers in production environment Closes #34741 See merge request !12675
| * | | Fix shorter route helpers in production environmentfix-routes-in-production-modeSean McGivern2017-07-061-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | I don't know exactly when Rails picks each module to use, but this seems to be used by `app` in the console (for instance, `app.project_path` would fail before, but works now).
* | | | Merge branch 'workhorse-2-3-0' into 'master'Robert Speicher2017-07-062-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Upgrade GitLab Workhorse to v2.3.0 See merge request !12676
| * | | | Upgrade GitLab Workhorse to v2.3.0Nick Thomas2017-07-062-1/+5
| |/ / /
* | | | Merge branch 'remove-orphans' into 'master'34759-rogueJacob Schatz2017-07-062-42/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove orphaned haml files Closes #34779 See merge request !12690
| * | | | Remove orphaned haml filesremove-orphansClement Ho2017-07-062-42/+0
| | | | |
* | | | | Merge branch '33910-improve-perf-bar-ui-and-behavior' into 'master'Clement Ho2017-07-0617-52/+171
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve & fix the performance bar UI and behavior Closes #33910, #33914, and #33909 See merge request !12361
| * | | | | Improve & fix the performance bar UI and behaviorRémy Coutable2017-07-0617-52/+171
|/ / / / /
* | | | | Merge branch 'acet-fix-tooltip-placement' into 'master'Jacob Schatz2017-07-061-0/+2
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix markdown preview tooltip cut off issue Closes #31748 See merge request !12367
| * | | | Banzai: Add tooltip attributes to reference filter.acet-fix-tooltip-placementFatih Acet2017-07-031-0/+2
| | | | |
* | | | | Merge branch 'merge-request-commits-table' into 'master'Douwe Maan2017-07-0621-123/+222
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add table for merge request commits Closes #30224 See merge request !12527
| * | | | | Add table for merge request commitsSean McGivern2017-07-0621-123/+222
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an ID-less table with just three columns: an association to the merge request diff the commit belongs to, the relative order of the commit within the merge request diff, and the commit SHA itself. Previously we stored much more information about the commits, so that we could display them even when they were deleted from the repo. Since 8.0, we ensure that those commits are kept around for as long as the target repo itself is, so we don't need to duplicate that data in the database.
* | | | | | Merge branch '34702-draw-legacy-builds' into 'master'Douwe Maan2017-07-063-38/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just draw :legacy_builds Closes #34702 See merge request !12681
| * | | | | | Just draw :legacy_builds34702-draw-legacy-buildsLin Jen-Shin2017-07-063-38/+23
| | | | | | |
* | | | | | | Merge branch '34727-simplified-member-settings' into 'master'Clement Ho2017-07-062-3/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 34727 Remove two columned layout from project member settings Closes #34727 See merge request !12663
| * | | | | | | 34727 Remove two columned layout from project member settingstauriedavis2017-07-062-3/+6
| | |/ / / / / | |/| | | | |
* | | | | | | Fixed CHANGELOG.md for 9.3.4 releaseJames Edwards-Jones2017-07-061-1/+1
| | | | | | |
* | | | | | | Merge branch ↵Tim Zallmann2017-07-064-10/+16
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '34655-label-field-for-setting-a-chart-s-legend-text-is-not-working' into 'master' Resolve "`label` field for setting a chart's legend text is not working" Closes #34655 See merge request !12628
| * | | | | | Added test for the chart legendJose Ivan Vargas2017-07-063-1/+7
| | | | | | |
| * | | | | | Use correct field for label name, fix default for unit to be blankJoshua Lambert2017-07-061-9/+9
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'repo-limited-width' into 'master'Filipa Lacerda2017-07-061-3/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit the file tree view container width Closes #34670 See merge request !12643
| * | | | | | Limit the file tree view container widthrepo-limited-widthPhil Hughes2017-07-051-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #34670
* | | | | | | Merge branch 'helm-runner-doc-certs' into 'master'Marin Jankovski2017-07-061-0/+53
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add GitLab Runner Helm Chart documenation for custom certificates See merge request !12594
| * | | | | | | Add GitLab Runner Helm Chart documenation for cucstom certificateshelm-runner-doc-certsDJ Mountney2017-06-301-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This outlines how to provide the custom ssl certificate to the runner for accessing GitLab in the case that GitLab is using a custom/self-signed certificate.
* | | | | | | | Merge branch 'enable-polling-env' into 'master'Kamil Trzciński2017-07-063-4/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-enable polling for environments See merge request !12678
| * | | | | | | | Re-enable polling for environmentsenable-polling-envFilipa Lacerda2017-07-063-4/+8
| | | | | | | | |
* | | | | | | | | Merge branch 'backport_slack_application_changes' into 'master'Sean McGivern2017-07-063-14/+24
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Backport Service changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2259 See merge request !12653
| * | | | | | | | Backport Service changes from ↵backport_slack_application_changesValery Sizov2017-07-053-14/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2259
* | | | | | | | | Merge branch '34653-minor-ux-cleanups-for-performance-dashboard' into 'master'Tim Zallmann2017-07-066-23/+40
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup minor UX issues in the performance dashboard Closes #34653 See merge request !12635
| * | | | | | | | Cleanup minor UX issues in the performance dashboardJose Ivan Vargas2017-07-066-23/+40
| | | | | | | | |
* | | | | | | | | Merge branch 'revert-018f7e46' into 'master'Phil Hughes2017-07-062-56/+19
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'winh-mr-widget-no-pipeline' into 'master'" See merge request !12674
| * | | | | | | | | Revert "Merge branch 'winh-mr-widget-no-pipeline' into 'master'"revert-018f7e46Kamil Trzciński2017-07-062-56/+19
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | This reverts merge request !12127
* | | | | | | | | Merge branch '34716-environment-specific-variables-ce' into 'master'Douwe Maan2017-07-0612-35/+140
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backports for ee-2112 Closes #34716 See merge request !12671
| * | | | | | | | | Backports for ee-2112Lin Jen-Shin2017-07-0612-35/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2112
* | | | | | | | | | Merge branch ↵Douwe Maan2017-07-062-1/+41
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '34172_add_traditional_chinese_in_taiwan_translations_of_commits_page' into 'master' Add Traditional Chinese in Taiwan translations of Commits Page See merge request !12407
| * | | | | | | | | | Synchronous discussion in the translationHuang Tao2017-07-061-6/+6
| | | | | | | | | | |
| * | | | | | | | | | synchronize changes in community translation of msgid黄涛2017-07-051-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Add Traditional Chinese in Taiwan translations of Commits Page黄涛2017-07-052-53/+37
| | | | | | | | | | |
| * | | | | | | | | | Merge branch ↵黄涛2017-07-050-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '34172_add_traditional_chinese_in_taiwan_translations_of_commits_page' of gitlab.com:htve/gitlab-ce into 34172_add_traditional_chinese_in_taiwan_translations_of_commits_page
| | * | | | | | | | | | add changelog黄涛2017-06-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [skip ci]
| | * | | | | | | | | | Add Traditional Chinese in Taiwan translations of Commits Page黄涛2017-06-231-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [skip ci]
| * | | | | | | | | | | add changelog黄涛2017-07-051-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [skip ci]
| * | | | | | | | | | | Add Traditional Chinese in Taiwan translations of Commits Page黄涛2017-07-051-0/+52
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [skip ci]
* | | | | | | | | | | Merge branch '33360-generate-kubeconfig' into 'master'Kamil Trzciński2017-07-068-16/+150
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate KUBECONFIG in KubernetesService#predefined_variables Closes #33360 See merge request !12223