summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* 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
* port of 594e6a0a625^..f74c90f68c6Micaël Bergeron2018-02-0127-340/+416
* Merge branch 'ph-axios-3' into 'master'Filipa Lacerda2018-02-017-110/+94
|\
| * Converted todos.js to axiosPhil Hughes2018-02-011-22/+15
| * Converted usage_ping.js to use axiosPhil Hughes2018-02-011-9/+10
| * Converted pager.js to axiosPhil Hughes2018-02-011-17/+16
| * Converted notifications_form.js to axiosPhil Hughes2018-02-011-19/+19
| * Converted notes.js to axiosPhil Hughes2018-02-011-20/+15
| * Converted branch_graph.js to axiosPhil Hughes2018-02-011-8/+8
| * Converted mini_pipeline_graph_dropdown.js to axiosPhil Hughes2018-02-011-15/+11
* | Merge branch '35779-realtime-update-of-pipeline-status-in-files-view' into 'm...Filipa Lacerda2018-02-015-0/+171
|\ \
| * | Added more tests and corrected typos35779-realtime-update-of-pipeline-status-in-files-viewJose Ivan Vargas2018-02-015-53/+73
| * | Restored some code, add hidden classJose Ivan Vargas2018-01-304-19/+23
| * | Added realtime prop and corrected specsJose Ivan Vargas2018-01-304-5/+35
| * | Added pipeline status to the files viewJose Ivan Vargas2018-01-306-17/+134
* | | Merge branch '30106-group-issues' into 'master'Sean McGivern2018-02-013-2/+14
|\ \ \ | |_|/ |/| |
| * | Include subgroup issuables on the group page30106-group-issuesJarka Kadlecová2018-02-013-2/+14
* | | Merge branch '42497-rubocop-style-regexpliteral' into 'master'Rémy Coutable2018-02-0114-24/+24
|\ \ \
| * | | Enable RuboCop Style/RegexpLiteralTakuya Noguchi2018-02-0114-24/+24
* | | | Merge branch 'fix-internationalization-namespace' into 'master'Filipa Lacerda2018-02-011-2/+2
|\ \ \ \
| * | | | Remove namespaced internationalization importfix-internationalization-namespaceClement Ho2018-01-311-2/+2
* | | | | Merge branch 'axios-find-file' into 'master'Fatih Acet2018-02-011-13/+11
|\ \ \ \ \
| * | | | | Replace $.ajax in find file with axiosaxios-find-fileClement Ho2018-01-311-13/+11
| |/ / / /
* | | | | Replace $.ajax in activity calendar with axiosaxios-calendarClement Ho2018-01-311-9/+14
|/ / / /
* | | | Merge branch '4761-follow-up-from-resolve-developers-should-be-able-to-create...Rémy Coutable2018-01-311-2/+2
|\ \ \ \
| * | | | refactor groups controller to match EE4761-follow-up-from-resolve-developers-should-be-able-to-create-new-projects-in-groupJames Lopez2018-01-311-2/+2
* | | | | Merge branch 'fl-mr-widget' into 'master'Phil Hughes2018-01-314-39/+46
|\ \ \ \ \
| * | | | | Fix broken testfl-mr-widgetFilipa Lacerda2018-01-312-3/+3
| * | | | | Move mr widget related links into a vue fileFilipa Lacerda2018-01-304-40/+47
* | | | | | Merge branch 'axios-get-render-math' into 'master'Phil Hughes2018-01-311-13/+25
|\ \ \ \ \ \
| * | | | | | Replace $.get in render math with axiosaxios-get-render-mathClement Ho2018-01-301-13/+25
* | | | | | | Use axios instead of jquery ajax for setCiStatusFaviconClement Ho2018-01-311-11/+6
| |_|/ / / / |/| | | | |
* | | | | | Merge branch 'rugged-reference-cache-rescue' into 'master'Sean McGivern2018-01-311-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Remove Rugged exception in cache rescuerugged-reference-cache-rescueJacob Vosmaer2018-01-301-1/+1
* | | | | | Merge branch 'zj-gitaly-server-info' into 'master'Sean McGivern2018-01-313-8/+38
|\ \ \ \ \ \
| * | | | | | Gitaly Server info for admin panelZeger-Jan van de Weg2018-01-313-8/+38
* | | | | | | Merge branch 'fix/move-can-be-merged-to-lib-git' into 'master'Grzegorz Bizon2018-01-311-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Move Repository#can_be_merged? to Gitlab::Git::Repositoryfix/move-can-be-merged-to-lib-gitAhmad Sherif2018-01-301-19/+1
* | | | | | | | Merge branch 'sh-fix-events-collection' into 'master'Rémy Coutable2018-01-311-1/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix not all events being shown in group dashboardsh-fix-events-collectionStan Hu2018-01-301-1/+0
* | | | | | | | | Merge branch 'ph-ajax-to-axios' into 'master'Filipa Lacerda2018-01-316-118/+88
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | potential fix for tests crashingPhil Hughes2018-01-301-2/+3
| * | | | | | | | EE backport for callback being optionalPhil Hughes2018-01-301-1/+1
| * | | | | | | | more EE backportsPhil Hughes2018-01-301-2/+10
| * | | | | | | | backported changed from EEPhil Hughes2018-01-301-1/+5
| * | | | | | | | fixed failing IDE testPhil Hughes2018-01-301-1/+1
| * | | | | | | | changed commits.js to axiosPhil Hughes2018-01-301-16/+18
| * | | | | | | | converted blob viewer to axiosPhil Hughes2018-01-301-14/+8
View Lorry Controller Status