summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Add crsf token in axios calls39726-add-crsf-token-axiosFilipa Lacerda2017-11-022-0/+8
* Merge branch '39704-fix-webhooks_log_time' into 'master'Stan Hu2017-11-023-3/+3
|\
| * Fix webhook recent deliveries elapsed time fieldAlexander Randa2017-11-023-3/+3
* | Merge branch 'jivl-fix-cancel-button-file-upload-new-issue' into 'master'Filipa Lacerda2017-11-021-3/+1
|\ \
| * | Fix cancel button not working when uploading a file on the new issue pagejivl-fix-cancel-button-file-upload-new-issueJose Ivan Vargas2017-11-011-3/+1
* | | Merge branch 'multi-file-editor-binary-editor' into 'master'Filipa Lacerda2017-11-021-1/+7
|\ \ \
| * | | Fix binary files not showing anything in edit modemulti-file-editor-binary-editorPhil Hughes2017-11-011-1/+7
* | | | Merge branch '35955-searchable-settings-puts-expand-collapse-toggle-in-an-inv...Tim Zallmann2017-11-028-51/+55
|\ \ \ \
| * | | | Stop sections from expanding when scrolling over the 1px section35955-searchable-settings-puts-expand-collapse-toggle-in-an-invalid-stateEric Eastwood2017-10-311-0/+4
| * | | | update settings panels to place "expanded" class on the correct elementMike Greiling2017-10-316-24/+24
| * | | | remove needlessly complicated, duplicate css class for expanded settings panelsMike Greiling2017-10-312-27/+27
* | | | | Merge branch 'vue-update' into 'master'Tim Zallmann2017-11-022-2/+4
|\ \ \ \ \
| * | | | | karma spec updatesvue-updatePhil Hughes2017-11-012-2/+4
* | | | | | Make contributors page translatableWinnie Hellmann2017-11-022-8/+9
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'jivl-mobile-friendly-table-runners' into 'master'Annabel Dunstone Gray2017-11-012-16/+24
|\ \ \ \ \
| * | | | | Mobile-friendly table on Admin Runnersjivl-mobile-friendly-table-runnersTakuya Noguchi2017-11-012-16/+24
| | |_|_|/ | |/| | |
* | | | | Merge branch '39513-fix-gears-spinning-physically' into 'master'Clement Ho2017-11-012-3/+8
|\ \ \ \ \
| * | | | | Fix autodevops graphic gears spinning based on physics39513-fix-gears-spinning-physicallyEric Eastwood2017-10-302-3/+8
* | | | | | Merge branch 'fix-user-tab-activity-mobile' into 'master'Annabel Dunstone Gray2017-11-011-1/+8
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fixed user profile tab being off-screenfix-user-tab-activity-mobilePhil Hughes2017-10-241-1/+8
* | | | | | Merge branch '35914-merge-request-update-worker-is-slow' into 'master'Sean McGivern2017-11-011-0/+9
|\ \ \ \ \ \
| * | | | | | rework the UpdateMergeRequestsWorker#metrics_tags35914-merge-request-update-worker-is-slowmicael.bergeron2017-11-011-4/+2
| * | | | | | reword `targets` to `metric tags`micael.bergeron2017-10-311-3/+4
| * | | | | | add metrics tagging to the sidekiq middlewaremicael.bergeron2017-10-311-0/+10
* | | | | | | Refactor/group links controllerFrancisco Javier López2017-11-013-7/+33
* | | | | | | Export logo and labels select as ES6 modulesFilipa Lacerda2017-11-018-428/+421
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch 'lazy-load-check-when-has-images' into 'master'Filipa Lacerda2017-11-011-8/+7
|\ \ \ \ \ \
| * | | | | | Increase lazy loader performancelazy-load-check-when-has-imagesPhil Hughes2017-10-311-8/+7
* | | | | | | Resolve "Convert fuzzaldrin-plus.js library to be a Yarn managed library"Tim Zallmann2017-11-013-2/+3
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'dm-ldap-identity-normalize-dn' into 'master'Sean McGivern2017-10-311-1/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Normalize LDAP DN when looking up identityDouwe Maan2017-10-311-1/+4
* | | | | | Merge branch 'multi-file-editor-vuex' into 'master'Filipa Lacerda2017-10-3142-1358/+1187
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | fixed up upload feature after master mergemulti-file-editor-vuexPhil Hughes2017-10-316-13/+28
| * | | | | Merge branch 'master' into multi-file-editor-vuexPhil Hughes2017-10-318-8/+92
| |\ \ \ \ \
| * | | | | | get branch name from the DOMPhil Hughes2017-10-312-2/+4
| * | | | | | Merge branch 'master' into multi-file-editor-vuexPhil Hughes2017-10-3136-612/+393
| |\ \ \ \ \ \
| * | | | | | | spec fixesPhil Hughes2017-10-311-0/+5
| * | | | | | | spec fixesPhil Hughes2017-10-305-11/+13
| * | | | | | | addressed feedback from reviewPhil Hughes2017-10-3014-57/+68
| * | | | | | | Merge branch 'master' into multi-file-editor-vuexPhil Hughes2017-10-3059-322/+651
| |\ \ \ \ \ \ \
| * | | | | | | | updated karma specsPhil Hughes2017-10-278-22/+31
| * | | | | | | | reset hash when changing filesPhil Hughes2017-10-262-2/+3
| * | | | | | | | various different performance improvementsPhil Hughes2017-10-2610-37/+24
| * | | | | | | | fixed render_error not being hooked up correctlyPhil Hughes2017-10-265-34/+9
| * | | | | | | | fixed some state bugs with the tabsPhil Hughes2017-10-2610-38/+53
| * | | | | | | | correctly activate the next tab when closing a tabPhil Hughes2017-10-263-3/+28
| * | | | | | | | moved new file/directory into new storePhil Hughes2017-10-2619-692/+176
| * | | | | | | | [WIP] Move multi-file editor store to VuexPhil Hughes2017-10-2633-584/+910
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Load participants asyncEric Eastwood2017-10-3122-78/+400
* | | | | | | | Merge branch '39509-fix-wiki-create-sidebar-overlap' into 'master'Annabel Dunstone Gray2017-10-311-5/+1
|\ \ \ \ \ \ \ \