summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update VERSION to 12.1.0-prev12.1.0.pre12-1-auto-deploy-0011198GitLab Release Tools Bot2019-06-221-1/+1
* Update CHANGELOG.md for 12.0.0GitLab Release Tools Bot2019-06-22287-1433/+310
* Merge branch '11707-add-copy-to-clipboard-cursed-backport' into 'master'Fatih Acet2019-06-211-0/+6
|\
| * Add CE backport11707-add-copy-to-clipboard-cursed-backportsarahghp2019-06-201-0/+6
* | Merge branch '49814-display-in-admin-area-if-emails-are-verified-or-not' into...Mike Greiling2019-06-213-2/+34
|\ \
| * | Add verification badge to users emails49814-display-in-admin-area-if-emails-are-verified-or-notBrandon Labuschagne2019-06-203-2/+34
* | | Merge branch 'app-label-warning' into 'master'Mike Greiling2019-06-218-0/+54
|\ \ \
| * | | Select deployments that only has the app labelThong Kuah2019-06-218-0/+54
|/ / /
* | | Merge branch '63513-ensure-gitlab-jsoncache-includes-the-gitlab-version-in-th...Stan Hu2019-06-213-23/+54
|\ \ \
| * | | Add CHANGELOG entry63513-ensure-gitlab-jsoncache-includes-the-gitlab-version-in-the-cache-keyDouglas Barbosa Alexandre2019-06-211-0/+5
| * | | Include the GitLab version in the cache key for Gitlab::JsonCacheDouglas Barbosa Alexandre2019-06-212-23/+49
* | | | Merge branch 'mg-upgrade-prettier' into 'master'Clement Ho2019-06-2112-49/+19
|\ \ \ \
| * | | | Upgrade prettier to latest (v1.18.2)Mike Greiling2019-06-2112-49/+19
* | | | | Merge branch '42399-registry-confirm-deletion' into 'master'Tim Zallmann2019-06-2110-30/+167
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add confirmation for registry image deletionPaul Gascou-Vaillancourt2019-06-2110-30/+167
|/ / / /
* | | | Merge branch 'docs/deps-gemansium' into 'master'Mike Lewis2019-06-211-8/+8
|\ \ \ \
| * | | | Remove Gemnasium dead link from docsAchilleas Pipinellis2019-06-211-8/+8
|/ / / /
* | | | Merge branch 'docs-prometheus-service-discovery' into 'master'Achilleas Pipinellis2019-06-216-2/+192
|\ \ \ \ | |/ / / |/| | |
| * | | Adding documentation for Prometheus Service DiscoveryAric Buerer2019-06-216-2/+192
|/ / /
* | | Merge branch 'sh-clean-up-bitbucket-import-errors' into 'master'Douglas Barbosa Alexandre2019-06-213-7/+53
|\ \ \
| * | | Avoid storing backtraces from Bitbucket Cloud imports in the databasesh-clean-up-bitbucket-import-errorsStan Hu2019-06-193-7/+53
* | | | Merge branch '58065-uniform-html-txt-email' into 'master'Sean McGivern2019-06-219-85/+59
|\ \ \ \
| * | | | Uniform html and text emails58065-uniform-html-txt-emailFrank van Rest2019-06-219-85/+59
* | | | | Merge branch 'docs/container-scanning-nfs-bug' into 'master'Mike Lewis2019-06-211-0/+20
|\ \ \ \ \
| * | | | | Mention Container Scanning NFS bug and how to fix itAchilleas Pipinellis2019-06-211-0/+20
|/ / / / /
* | | | | Merge branch 'docs/web-terminals-cleanup' into 'master'Mike Lewis2019-06-211-53/+43
|\ \ \ \ \
| * | | | | Clean up the web terminals docsdocs/web-terminals-cleanupAchilleas Pipinellis2019-06-211-53/+43
* | | | | | Merge branch '38105-pre-release-tag' into 'master'Kushal Pandya2019-06-214-9/+39
|\ \ \ \ \ \
| * | | | | | Renders pre-release tag for pre-releases38105-pre-release-tagFilipa Lacerda2019-06-214-9/+39
* | | | | | | Merge branch 'patch-71' into 'master'Stan Hu2019-06-212-7/+8
|\ \ \ \ \ \ \
| * | | | | | | Bump rouge to 3.4.1Zoid2019-06-212-7/+8
|/ / / / / / /
* | | | | | | Merge branch '63406-selecting-a-line-in-ci-job-trace-using-triple-click-selec...Stan Hu2019-06-214-11/+13
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into '63406-selecting-a-line-in-ci-job-trace-using-trip...63406-selecting-a-line-in-ci-job-trace-using-triple-click-selects-the-previous-line-alsoAdam Hegyi2019-06-1954-101/+198
| |\ \ \ \ \ \ \
| * | | | | | | | Fix copying a single line from FirefoxAdam Hegyi2019-06-194-11/+13
* | | | | | | | | Merge branch 'bw-issue-reorder' into 'master'Kamil TrzciƄski2019-06-218-3/+257
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add reorder action to Project IssuesControllerbw-issue-reorderBrett Walker2019-06-218-3/+257
* | | | | | | | | | Merge branch 'dz-group-packages-page-ce' into 'master'Filipa Lacerda2019-06-211-1/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add packages nav to group sidebardz-group-packages-page-ceDmitriy Zaporozhets2019-06-191-1/+2
* | | | | | | | | | | Merge branch 'pages-domains-auth-ssl-flag' into 'master'Nick Thomas2019-06-2116-169/+303
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Don't show private keys for letsencrypt certsVladimir Shushlin2019-06-2116-169/+303
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'sanitize_rake_ldap_check_output' into 'master'Lin Jen-Shin2019-06-213-2/+21
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Sanitize LDAP output in Rake tasksDrew Blessing2019-06-213-2/+21
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'docs/add-another-fdw-troubleshoot-item' into 'master'Achilleas Pipinellis2019-06-211-32/+76
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add new troubleshooting step and refactor Geo replication docsEvan Read2019-06-211-32/+76
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'docs/fix-list-desc-templates' into 'master'Achilleas Pipinellis2019-06-211-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed formatting of notes bullet listEvan Read2019-06-211-0/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'db/update-geo-nodes-primary' into 'master'Andreas Brandl2019-06-213-1/+26
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into db/update-geo-n...Arun Kumar Mohan2019-06-20175-1010/+1252
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Add changelog entryArun Kumar Mohan2019-06-181-0/+5
| * | | | | | | | | | | Disallow `NULL` values for `geo_nodes.primary` columnArun Kumar Mohan2019-06-182-2/+22
| | |_|/ / / / / / / / | |/| | | | | | | | |