summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fetch commit signatures from Gitaly in batchesfeature/migrate-recursive-tree-entries-fetchingAhmad Sherif2018-02-2811-81/+166
| | | | Closes gitaly#1046
* Merge branch 'docs/rs-harness-executable' into 'master'Rémy Coutable2018-02-281-0/+2
|\ | | | | | | | | | | | | Set security harness hook to executable after creation Closes #43709 See merge request gitlab-org/gitlab-ce!17425
| * Set security harness hook to executable after creationdocs/rs-harness-executableRobert Speicher2018-02-281-0/+2
| |
* | Merge branch 'patch-28' into 'master'Rémy Coutable2018-02-281-0/+3
|\ \ | | | | | | | | | | | | Document new job variables: CI_RUNNER_{REVISION,VERSION,EXECUTABLE_ARCH} See merge request gitlab-org/gitlab-ce!16834
| * | Add new job variables: CI_RUNNER_{REVISION,VERSION,EXECUTABLE_ARCH}Taylor Braun-Jones2018-02-281-0/+3
| | | | | | | | | | | | As introduced by gitlab-org/gitlab-runner!788
* | | Merge branch 'patch-28' into 'master'Rémy Coutable2018-02-281-2/+6
|\ \ \ | | | | | | | | | | | | | | | | Replace whitespace demonstrating line-breaks in GFM docs See merge request gitlab-org/gitlab-ce!16135
| * | | Replace whitespace demonstrating line-breaks in GFM docsJonathan Duck2018-02-281-2/+6
|/ / /
* | | Merge branch 'move-last-ee-specific-js-files-to' into 'master'Clement Ho2018-02-2814-26/+26
|\ \ \ | | | | | | | | | | | | | | | | Move the remaining EE-specific JS files to ee/ See merge request gitlab-org/gitlab-ce!17423
| * | | Move the remaining EE-specific JS files to ee/move-last-ee-specific-js-files-toRémy Coutable2018-02-2814-26/+26
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'patch-29' into 'master'Rémy Coutable2018-02-281-2/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Change the wording to reduce confusion about whether you need to reconfigure or restart. See merge request gitlab-org/gitlab-ce!15041
| * | | | Change the wording to reduce confusion about whether you need to reconfigure ↵Andrew Davis2018-02-281-2/+1
|/ / / / | | | | | | | | | | | | or restart.
* | | | Merge branch 'an/lograge-fix' into 'master'Stan Hu2018-02-281-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix for open-ended parameter's in lograge causing elastic memory issues See merge request gitlab-org/gitlab-ce!17419
| * | | | Fix for open-ended parameter's in lograge causing elastic memory issuesAndrew Newdigate2018-02-281-1/+6
|/ / / /
* | | | Merge branch 'docs-add-note-dot-com-tiers' into 'master'🚄 Job van der Voort 🚀2018-02-281-12/+42
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Docs: explain feature availability in GitLab.com See merge request gitlab-org/gitlab-ce!17325
| * | | Docs: explain feature availability in GitLab.comMarcia Ramos2018-02-281-12/+42
|/ / /
* | | Merge branch 'gitaly-reenable-wiki' into 'master'Douwe Maan2018-02-281-3/+2
|\ \ \ | | | | | | | | | | | | | | | | Re-enable the remaning Wiki Gitaly-Endpoints See merge request gitlab-org/gitlab-ce!17422
| * | | Re-enable the remaning Wiki Gitaly-EndpointsKim Carlbäcker2018-02-281-3/+2
| | | |
* | | | Merge branch 'feature/edit_pages_domain' into 'master'Nick Thomas2018-02-289-40/+164
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PagesDomain: allow update of key/certificate Closes #29720 See merge request gitlab-org/gitlab-ce!17376
| * | | | PagesDomain: improve breadcrumbsRob Watson2018-02-283-0/+6
| | | | |
| * | | | PagesDomain: Add edit/update functionalityRob Watson2018-02-289-40/+158
| |/ / /
* | | | Merge branch '43643-fix-mr-label-filtering' into 'master'Filipa Lacerda2018-02-284-12/+83
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable filtering MR list based on clicked label in MR sidebar Closes #43643 See merge request gitlab-org/gitlab-ce!17390
| * | | | Labels Select Tests43643-fix-mr-label-filteringKushal Pandya2018-02-281-0/+43
| | | | |
| * | | | Fix unnecessary spacing between labelsKushal Pandya2018-02-281-0/+7
| | | | |
| * | | | Add changelog entryKushal Pandya2018-02-281-0/+5
| | | | |
| * | | | Make label filter URL dynamicKushal Pandya2018-02-281-12/+28
| | |/ / | |/| |
* | | | Merge branch 'patch-29' into 'master'Rémy Coutable2018-02-281-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Patch 29 See merge request gitlab-org/gitlab-ce!17421
| * | | | Patch 29saberd2018-02-281-1/+1
|/ / / /
* | | | Merge branch 'bvl-fix-qa-doorkeeper' into 'master'Grzegorz Bizon2018-02-282-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Specify base controller for Doorkeeper See merge request gitlab-org/gitlab-ce!17416
| * | | | Specify base controller for Doorkeeperbvl-fix-qa-doorkeeperBob Van Landuyt2018-02-282-0/+4
| |/ / / | | | | | | | | | | | | | | | | This will make sure the `ApplicantionController#can?` method is available for views rendering menus based on the current user's abilities.
* | | | Merge branch '43489-display-runner-ip' into 'master'Kamil Trzciński2018-02-2811-11/+61
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Resolve "Display IP Address Of Runner On Runner Page" Closes #43489 See merge request gitlab-org/gitlab-ce!17286
| * | | Add changelog for Display Runner IP Address (#43489)43489-display-runner-ipDylan Griffith2018-02-281-0/+5
| | | |
| * | | Add IP Address to project runner show page (#43489)Dylan Griffith2018-02-281-0/+3
| | | |
| * | | Add IP Address to admin runners table (#43489)Dylan Griffith2018-02-282-0/+3
| | | |
| * | | Add ip_address to admin runner form (#43489)Dylan Griffith2018-02-281-0/+5
| | | |
| * | | Persist runner IP address on contact (#43489)Dylan Griffith2018-02-286-11/+45
| | | |
* | | | Merge branch 'patch-18' into 'master'Sean McGivern2018-02-281-4/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug.md: Use html comments instead of asking to remove the notice Closes #43580 See merge request gitlab-org/gitlab-ce!17348
| * | | | Bug.md: Use html comments instead of asking to remove the noticeCarlos Soriano Sánchez2018-02-241-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The issue template for bugs has a notice at the start that mentions to search for duplicates before creating a new issue. Then the reporter is asked to remove the notice once read, presumptively to avoid noise in the actual issue. Instead of that, we can make that part of the issue template an html comment, so it won't be rendered in the final result. This avoids the tedious task of removing that part of the notice. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/43580
* | | | | Merge branch ↵Nick Thomas2018-02-283-1/+35
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '43531-500-error-searching-wiki-incompatible-character-encodings-utf-8-and-ascii-8bit' into 'master' Resolve "500 Error searching wiki: incompatible character encodings: UTF-8 and ASCII-8BIT" Closes #43531 See merge request gitlab-org/gitlab-ce!17413
| * | | | | Fix code search results with non-ASCII data43531-500-error-searching-wiki-incompatible-character-encodings-utf-8-and-ascii-8bitSean McGivern2018-02-283-1/+35
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | Gitlab::Git::Popen#popen now returns ASCII-8BIT (binary) data always, so we need to handle that explicitly.
* | | | | Merge branch 'refactor/move-assignees-vue-component' into 'master'Filipa Lacerda2018-02-286-229/+241
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Move (Multiple) Assignees vue component See merge request gitlab-org/gitlab-ce!16952
| * | | | | Move Assignees vue componentGeorge Tsiolis2018-02-276-229/+241
| | | | | |
* | | | | | Merge branch 'docs-fix-vuex-store-example' into 'master'Phil Hughes2018-02-281-0/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | Fix example in Vuex docs See merge request gitlab-org/gitlab-ce!17415
| * | | | | Fix example in Vuex docsFilipa Lacerda2018-02-281-0/+2
|/ / / / /
* | | | | Merge branch 'remove-merge-conflicts-bundle' into 'master'Jacob Schatz2018-02-286-14/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove merge_conflicts bundle See merge request gitlab-org/gitlab-ce!17408
| * | | | | remove duplicate common and common_vue definitionsremove-merge-conflicts-bundleMike Greiling2018-02-271-2/+0
| | | | | |
| * | | | | refactor merge conflicts bundle to reduce side effectsMike Greiling2018-02-272-4/+7
| | | | | |
| * | | | | remove merge_conflicts bundle in favor of pages directory entry pointMike Greiling2018-02-275-9/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'acet-mr-notes-index' into 'master'Jacob Schatz2018-02-2874-327/+1747
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Render MR Notes with Vue with behind a cookie See merge request gitlab-org/gitlab-ce!15732
| * | | | Render MR Notes with Vue with behind a cookieFatih Acet2018-02-2874-327/+1747
|/ / / /
* | | | Merge branch '43669-fix-webpack-trailing-comma' into 'master'Mike Greiling2018-02-271-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix webpack.config.js syntax error from trailing comma Closes #43669 See merge request gitlab-org/gitlab-ce!17404
View Lorry Controller Status