summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Incorporate OperationService.UserSquash Gitaly RPCgitaly-user-squashAlejandro Rodríguez2018-02-025-28/+114
* Merge branch 'fix-eslint-axios' into 'master'Jacob Schatz2018-02-021-1/+0
|\
| * Remove duplicate axios importClement Ho2018-02-021-1/+0
* | Merge branch '24167__color_label' into 'master'Douwe Maan2018-02-0214-4/+354
|\ \
| * | Fix minorsTony Rom2018-02-013-27/+19
| * | Add Colors to GitLab Flavored MarkdownTony Rom2018-01-2914-2/+360
* | | Merge branch 'webpack-auto-config' into 'master'Jacob Schatz2018-02-0215-63/+73
|\ \ \
| * | | migrate groups:show to static bundleMike Greiling2018-02-022-5/+2
| * | | update nodemon watch configuration to restart dev-server when new entry point...webpack-auto-configMike Greiling2018-02-021-1/+1
| * | | move auto-generated bundle script tags after manual page-specific webpack bun...Mike Greiling2018-02-011-1/+2
| * | | ensure dispatcher is run before other DOMContentLoaded handlersMike Greiling2018-02-012-7/+9
| * | | migrate dashboard:milestones:index to static bundleMike Greiling2018-02-012-6/+1
| * | | migrate projects:issues:show to static bundleMike Greiling2018-02-012-8/+3
| * | | migrate projects:issues:index to static bundleMike Greiling2018-02-012-7/+2
| * | | migrate projects:merge_requests:index to static bundleMike Greiling2018-02-012-5/+2
| * | | migrate projects:show to static bundleMike Greiling2018-02-012-5/+2
| * | | migrate projects:boards:* to static bundleMike Greiling2018-02-012-9/+2
| * | | migrate sessions:new to static bundleMike Greiling2018-02-012-7/+2
| * | | prevent dynamic chunks from being duplicated by the dispatcher until it is co...Mike Greiling2018-02-012-5/+16
| * | | update webpack helper to automatically include route-based entry pointsMike Greiling2018-02-012-0/+19
| * | | generate webpack entry points for pages directory automaticallyMike Greiling2018-02-013-1/+14
* | | | Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' i...Douwe Maan2018-02-026-17/+113
|\ \ \ \
| * | | | Sanitize extra blank spaces used when uploading a SSH keyRubén Dávila2018-02-016-17/+113
* | | | | Merge branch 'bvl-fix-500-on-fork-without-restricted-visibility-levels' into ...Douwe Maan2018-02-023-1/+15
|\ \ \ \ \
| * | | | | Avoid error when no restricted levels are definedbvl-fix-500-on-fork-without-restricted-visibility-levelsBob Van Landuyt2018-02-023-1/+15
* | | | | | Merge branch '37698-current-settings' into 'master'Sean McGivern2018-02-0296-324/+247
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | use Gitlab::UserSettings directly as a singleton instead of including/extendi...Mario de la Ossa2018-02-0296-324/+247
|/ / / / /
* | | | | Merge branch 'ph-axios-2' into 'master'Filipa Lacerda2018-02-0219-588/+719
|\ \ \ \ \
| * | | | | added missing calls in catch statementsph-axios-2Phil Hughes2018-02-022-3/+10
| * | | | | fixed issue with axios_utils not reducing activeVueResources variable when re...Phil Hughes2018-02-022-1/+16
| * | | | | Merge branch 'master' into ph-axios-2Phil Hughes2018-02-01112-442/+561
| |\ \ \ \ \
| * | | | | | fixed axios mock not being restoredPhil Hughes2018-02-011-0/+4
| * | | | | | remove useless ajaxPost methodPhil Hughes2018-02-013-21/+6
| * | | | | | fixed notes_spec.jsPhil Hughes2018-02-011-58/+124
| * | | | | | fixed issue_spec transient failurePhil Hughes2018-01-311-32/+27
| * | | | | | fixed eslint :see_no_evil:Phil Hughes2018-01-312-2/+0
| * | | | | | Merge branch 'master' into ph-axios-2Phil Hughes2018-01-31124-1309/+2600
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | fixed eslintPhil Hughes2018-01-311-2/+1
| * | | | | | Converted common_utils to axiosPhil Hughes2018-01-313-17/+19
| * | | | | | Converted ajax_cache to axiosPhil Hughes2018-01-312-60/+41
| * | | | | | Converted milestone_select.js to axiosPhil Hughes2018-01-311-61/+58
| * | | | | | Converted milestone.js to axiosPhil Hughes2018-01-311-10/+8
| * | | | | | fixed failing specsPhil Hughes2018-01-316-34/+43
| * | | | | | Converted merge_request_tabs.js to axiosPhil Hughes2018-01-302-51/+84
| * | | | | | Convert merge_conflict_service.js to axiosPhil Hughes2018-01-302-21/+11
| * | | | | | Converted labels_select.js to axiosPhil Hughes2018-01-301-85/+85
| * | | | | | Converted job.js to axiosPhil Hughes2018-01-302-131/+144
| * | | | | | Converted issue.js to axiosPhil Hughes2018-01-302-46/+76
* | | | | | | Merge branch 'fix/adjust-button-group-width-on-mobile' into 'master'Clement Ho2018-02-0214-24/+35
|\ \ \ \ \ \ \
| * | | | | | | Improve top area navigationGeorge Tsiolis2018-02-0214-24/+35
View Lorry Controller Status