summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Set security harness hook to executable after creationdocs/rs-harness-executableRobert Speicher2018-02-281-0/+2
|
* 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
| * | | Remove trailing comma in webpack config to support Node@<8Eric Eastwood2018-02-271-1/+1
| | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/43669
* | | | Merge branch 'remove-snippets-bundle' into 'master'Jacob Schatz2018-02-277-14/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove snippet bundle webpack entry point See merge request gitlab-org/gitlab-ce!17329
| * | | | Remove snippet bundle webpack entry pointClement Ho2018-02-277-14/+25
|/ / / /
* | | | Merge branch 'profile-bundle-tag-refactor' into 'master'Jacob Schatz2018-02-2717-101/+82
|\ \ \ \ | |/ / / |/| | | | | | | | | | | removed profile webpack bundle tag See merge request gitlab-org/gitlab-ce!17320
| * | | Resolved conflicts in dispatcher.jsprofile-bundle-tag-refactorConstance Okoghenun2018-02-27223-1018/+1357
| |\ \ \ | |/ / / |/| | |
* | | | Merge branch 'remove-sidebar-bundle' into 'master'Jacob Schatz2018-02-277-8/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove sidebar bundle webpack entry point See merge request gitlab-org/gitlab-ce!17343
| * \ \ \ Merge branch 'master' into remove-sidebar-bundleremove-sidebar-bundleClement Ho2018-02-237-9/+15
| |\ \ \ \
| * | | | | Remove sidebar bundle webpack entry pointClement Ho2018-02-237-8/+12
| | | | | |
* | | | | | Merge branch 'rc/reduce-delta-with-ce-in-controllers-ce' into 'master'Douwe Maan2018-02-2727-460/+437
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove explicit audit event log in MembershipActions See merge request gitlab-org/gitlab-ce!14824
| * | | | | | Improve Member servicesrc/reduce-delta-with-ce-in-controllers-ceRémy Coutable2018-02-2724-326/+251
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Move the #update action from Project/Member controllers to the ↵Rémy Coutable2018-02-277-24/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MembershipActions concern Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Remove explicit audit event log in MembershipActionsRémy Coutable2018-02-2719-217/+277
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move it to Members::ApproveAccessRequestService. Also, note that there was a double audit event log for access request destruction. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch ↵Robert Speicher2018-02-271-8/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '43662-can-t-modify-frozen-hash-error-in-development-when-running-a-rake-task' into 'master' Resolve "`can't modify frozen Hash` error in development when running a rake task" Closes #43662 See merge request gitlab-org/gitlab-ce!17396
| * | | | | | | Fix a "can't modify frozen Hash" error in lib/api/services.rb in development envRémy Coutable2018-02-271-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
View Lorry Controller Status