summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* use Gitlab::UserSettings directly as a singleton instead of including/extendi...Mario de la Ossa2018-02-0260-161/+109
* 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
* | | | | | | Merge branch '42695-sign-in-page-logo-is-not-properly-rendered' into 'master'Clement Ho2018-02-021-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Place brand_image outside <h1> tag42695-sign-in-page-logo-is-not-properly-renderedToon Claes2018-02-021-1/+1
* | | | | | | Merge branch 'master' into '3867-port-to-ce'Sean McGivern2018-02-0220-208/+345
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'fl-mr-widget-1' into 'master'Phil Hughes2018-02-026-143/+189
| |\ \ \ \ \ \ \
| | * | | | | | | Fixes after reviewfl-mr-widget-1Filipa Lacerda2018-02-011-10/+16
| | * | | | | | | Merge branch 'master' into fl-mr-widget-1Filipa Lacerda2018-02-0143-236/+449
| | |\ \ \ \ \ \ \
| | * | | | | | | | Transform `a` tag with button role into a `button`Filipa Lacerda2018-02-011-4/+6
| | * | | | | | | | Moves widget header into a vue fileFilipa Lacerda2018-02-014-120/+142
| | * | | | | | | | Moves merge help into a vue componentFilipa Lacerda2018-01-314-25/+41
| * | | | | | | | | Merge branch 'fl-mr-widget-2' into 'master'Phil Hughes2018-02-027-58/+78
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Moves more mr widget components into vue filesfl-mr-widget-2Filipa Lacerda2018-02-017-58/+78
| | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'fix/improve-issue-note-dropdown' into 'master'Phil Hughes2018-02-022-3/+2
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | Improve issue mr and branch dropdown buttonGeorge Tsiolis2018-01-292-3/+2
| * | | | | | | | | Merge branch 'backport-ee-4644-geo-selective-sync-by-shard' into 'master'Robert Speicher2018-02-012-3/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Refactor repository_storages_options_for_selectNick Thomas2018-01-312-3/+4
| * | | | | | | | | | Merge branch 'add-confirmation-input-for-modals' into 'master'Clement Ho2018-02-011-0/+62
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| | * | | | | | | | | Add confirmation input componentJose Ivan Vargas2018-02-011-0/+62
| * | | | | | | | | | Merge branch '35285-user-interface-bugs-for-schedule-pipelines' into 'master'Rémy Coutable2018-02-012-1/+10
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Hide pipeline schedule 'take ownership' for current ownerMark Fletcher2018-02-012-1/+10
| | | |_|_|_|/ / / / | | |/| | | | | | |
* | | | | | | | | | porting changes from upstream3867-port-to-ceMicaël Bergeron2018-02-011-2/+2
* | | | | | | | | | porting upstream changesMicaël Bergeron2018-02-011-2/+2
* | | | | | | | | | fix specsMicaël Bergeron2018-02-012-2/+1