summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove use of any_instance_of in runner specbuild-finished-worker-spec-prependYorick Peterse2018-02-281-1/+1
* Merge branch 'patch-29' into 'master'Rémy Coutable2018-02-281-1/+1
|\
| * Patch 29saberd2018-02-281-1/+1
|/
* Merge branch 'bvl-fix-qa-doorkeeper' into 'master'Grzegorz Bizon2018-02-282-0/+4
|\
| * Specify base controller for Doorkeeperbvl-fix-qa-doorkeeperBob Van Landuyt2018-02-282-0/+4
* | Merge branch '43489-display-runner-ip' into 'master'Kamil Trzciński2018-02-2811-11/+61
|\ \
| * | 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 noticeCarlos Soriano Sánchez2018-02-241-4/+2
* | | | Merge branch '43531-500-error-searching-wiki-incompatible-character-encodings...Nick Thomas2018-02-283-1/+35
|\ \ \ \
| * | | | 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
| | |_|/ | |/| |
* | | | Merge branch 'refactor/move-assignees-vue-component' into 'master'Filipa Lacerda2018-02-286-229/+241
|\ \ \ \
| * | | | 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 docsFilipa Lacerda2018-02-281-0/+2
|/ / / /
* | | | Merge branch 'remove-merge-conflicts-bundle' into 'master'Jacob Schatz2018-02-286-14/+7
|\ \ \ \
| * | | | 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 cookieFatih Acet2018-02-2874-327/+1747
|/ / /
* | | Merge branch '43669-fix-webpack-trailing-comma' into 'master'Mike Greiling2018-02-271-1/+1
|\ \ \
| * | | Remove trailing comma in webpack config to support Node@<8Eric Eastwood2018-02-271-1/+1
* | | | Merge branch 'remove-snippets-bundle' into 'master'Jacob Schatz2018-02-277-14/+25
|\ \ \ \
| * | | | 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
|\ \ \ \ | |/ / / |/| | |
| * | | 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
|\ \ \ \
| * \ \ \ 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
|\ \ \ \ \ \
| * | | | | | Improve Member servicesrc/reduce-delta-with-ce-in-controllers-ceRémy Coutable2018-02-2724-326/+251
| * | | | | | Move the #update action from Project/Member controllers to the MembershipActi...Rémy Coutable2018-02-277-24/+16
| * | | | | | Remove explicit audit event log in MembershipActionsRémy Coutable2018-02-2719-217/+277
* | | | | | | Merge branch '43662-can-t-modify-frozen-hash-error-in-development-when-runnin...Robert Speicher2018-02-271-8/+11
|\ \ \ \ \ \ \
| * | | | | | | Fix a "can't modify frozen Hash" error in lib/api/services.rb in development envRémy Coutable2018-02-271-8/+11
* | | | | | | | Merge branch 'fix-webpack-dynamic-entries' into 'master'Clement Ho2018-02-273-30/+57
|\ \ \ \ \ \ \ \
| * | | | | | | | Prevent webpack from rebooting while switching branchesMike Greiling2018-02-273-30/+57
|/ / / / / / / /
* | | | | | | | Merge branch '24774-clear-the-Labels-dropdown-search-filter' into 'master'Phil Hughes2018-02-273-0/+23
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Add test for label search behaviour24774-clear-the-Labels-dropdown-search-filterKushal Pandya2018-02-271-0/+12
| * | | | | | | Add changelog entryKushal Pandya2018-02-271-0/+5
| * | | | | | | Clear "Labels" dropdown search filter after selectionKushal Pandya2018-02-271-0/+6
* | | | | | | | Merge branch '40502-osw-keep-link-when-redacting-unauthorized-objects' into '...Douwe Maan2018-02-274-10/+45
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Keep link when redacting unauthorized object linksOswaldo Ferreira2018-02-274-10/+45
* | | | | | | | Merge branch '43620-lib-api-services-rb-retains-a-lot-of-memory-and-objects' ...Sean McGivern2018-02-271-42/+42
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix a performance/memory issue in lib/api/services.rb43620-lib-api-services-rb-retains-a-lot-of-memory-and-objectsRémy Coutable2018-02-261-42/+42
View Lorry Controller Status