summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into 38175-add-domain-field-to-auto-devops-application-...Matija Čupić2018-02-0274-228/+188
|\
| * 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-022-1/+29
| |\ \
| | * | Fix minorsTony Rom2018-02-011-9/+7
| | * | Add Colors to GitLab Flavored MarkdownTony Rom2018-01-292-1/+31
| * | | Merge branch 'webpack-auto-config' into 'master'Jacob Schatz2018-02-0212-61/+47
| |\ \ \
| | * | | migrate groups:show to static bundleMike Greiling2018-02-022-5/+2
| | * | | 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-011-3/+3
| | * | | update webpack helper to automatically include route-based entry pointsMike Greiling2018-02-012-0/+19
| * | | | Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' i...Douwe Maan2018-02-021-4/+3
| |\ \ \ \
| | * | | | Sanitize extra blank spaces used when uploading a SSH keyRubén Dávila2018-02-011-4/+3
| * | | | | use Gitlab::UserSettings directly as a singleton instead of including/extendi...Mario de la Ossa2018-02-0260-161/+109
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' into 38175-add-domain-field-to-auto-devops-application-...Matija Čupić2018-02-02154-1770/+2239
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'ph-axios-2' into 'master'Filipa Lacerda2018-02-0212-264/+257
| |\ \ \ \
| | * | | | 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-0126-104/+138
| | |\ \ \ \
| | * | | | | remove useless ajaxPost methodPhil Hughes2018-02-012-8/+6
| | * | | | | fixed eslint :see_no_evil:Phil Hughes2018-01-311-1/+0
| | * | | | | Merge branch 'master' into ph-axios-2Phil Hughes2018-01-3127-315/+295
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | * | | | | Converted common_utils to axiosPhil Hughes2018-01-312-14/+14
| | * | | | | Converted ajax_cache to axiosPhil Hughes2018-01-311-19/+13
| | * | | | | 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-312-7/+7
| | * | | | | Converted merge_request_tabs.js to axiosPhil Hughes2018-01-301-21/+18
| | * | | | | 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-301-5/+7
| | * | | | | Converted issue.js to axiosPhil Hughes2018-01-301-22/+18
| * | | | | | Merge branch 'fix/adjust-button-group-width-on-mobile' into 'master'Clement Ho2018-02-0213-24/+30
| |\ \ \ \ \ \
| | * | | | | | Improve top area navigationGeorge Tsiolis2018-02-0213-24/+30
| * | | | | | | Merge branch '40793-fix-mr-title-for-jira' into 'master'Sean McGivern2018-02-021-7/+23
| |\ \ \ \ \ \ \
| | * | | | | | | Resolve "Incorrect merge request title when Jira activated and multiple commi...Andrew McCallum2018-02-021-7/+23
| * | | | | | | | Merge branch 'osw-system-notes-for-commits-regression' into 'master'Sean McGivern2018-02-021-1/+6
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Reload MRs memoization after diffs creationosw-system-notes-for-commits-regressionOswaldo Ferreira2018-02-011-1/+6
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge branch 'mr-widget-author-component-backport' into 'master'Filipa Lacerda2018-02-021-1/+21
| |\ \ \ \ \ \ \
| | * | | | | | | Backport of mr_widget_author.vue EE changesPhil Hughes2018-02-021-1/+21
| * | | | | | | | Merge branch 'axios-project' into 'master'Fatih Acet2018-02-021-9/+10
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Replace $.ajax in project.jsaxios-projectClement Ho2018-02-011-9/+10
| | | |_|_|_|_|/ / | | |/| | | | | |