summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* remove a bunch of superfluous common_vue bundlesdispatcher-cleanupMike Greiling2018-02-287-17/+0
* prefer let and const in webpack configMike Greiling2018-02-281-27/+27
* remove common_vue from CommonsChunkPluginMike Greiling2018-02-281-28/+0
* remove unused ui_development_kit webpack bundleMike Greiling2018-02-281-1/+0
* remove unused filtered_search webpack bundleMike Greiling2018-02-283-12/+0
* remove unused project_import_gl webpack bundleMike Greiling2018-02-281-1/+0
* remove unused help webpack bundleMike Greiling2018-02-281-1/+0
* 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
* | | | | | | Merge branch '43304-simplify-filtering-non-human-users' into 'master'Yorick Peterse2018-02-271-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Simplify filtering of non-human users (like ghosts).43304-simplify-filtering-non-human-usersAndreas Brandl2018-02-261-1/+1
* | | | | | | | Merge branch '41851-enable-eslint-codeclimate' into 'master'Dmitriy Zaporozhets2018-02-272-2/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Adds MR ID to changelog entry41851-enable-eslint-codeclimateFilipa Lacerda2018-02-271-1/+1
| * | | | | | | | Enables eslint in codeclimate jobFilipa Lacerda2018-02-272-2/+7
* | | | | | | | | Merge branch 'backstage/gb/build-stages-catch-up-migration' into 'master'Kamil Trzciński2018-02-277-0/+199
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge commit '981b5905a02ac89ca9f33ad7c91d8c1a576ed9af' into backstage/gb/bui...backstage/gb/build-stages-catch-up-migrationGrzegorz Bizon2018-02-23242-1329/+4349
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into 'backstage/gb/build-stages-catch-up-migration'Grzegorz Bizon2018-02-22654-8676/+7402
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add changelog entry for pipeline stages migrationGrzegorz Bizon2018-02-211-0/+5
| * | | | | | | | | | | Create index on id instead of stage_id in migrationGrzegorz Bizon2018-02-212-6/+6
| * | | | | | | | | | | Separate adding and removing index from stages migrationGrzegorz Bizon2018-02-204-6/+29
| * | | | | | | | | | | Add index before going through builds in a migrationGrzegorz Bizon2018-02-201-0/+5