summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | Converted API.js to axiosPhil Hughes2018-01-304-85/+46
* | | | | | | Merge branch 'cal-label-fix' into 'master'Annabel Dunstone Gray2018-01-301-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Contribution calendar label cutoff fixcal-label-fixClement Ho2018-01-291-1/+1
* | | | | | | | Merge branch 'feature/migrate-wiki-page-formatted-data-to-gitaly' into 'master'Robert Speicher2018-01-302-1/+10
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Migrate fetching wiki page formatted content to Gitalyfeature/migrate-wiki-page-formatted-data-to-gitalyAhmad Sherif2018-01-302-1/+10
| |/ / / / / /
* | | | | | | Merge branch 'gitaly-784-repo-write-ref' into 'master'Douwe Maan2018-01-301-0/+2
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Migrate Git::Repository#write_ref to Gitalygitaly-784-repo-write-refKim "BKC" Carlbäcker2018-01-301-0/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '42160-error-500-loading-merge-request-undefined-method-index-fo...Douwe Maan2018-01-301-0/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix truncated_diff_lines for legacy notes without a line42160-error-500-loading-merge-request-undefined-method-index-for-nil-nilclassSean McGivern2018-01-301-0/+2
| | |_|_|/ | |/| | |
* | | | | Decouple more of Repository from RuggedJacob Vosmaer (GitLab)2018-01-301-62/+5
* | | | | Merge branch 'jprovazn-pagination' into 'master'Sean McGivern2018-01-301-5/+15
|\ \ \ \ \
| * | | | | Make pagination optional for issuablesJan Provaznik2018-01-301-5/+15
* | | | | | Merge branch 'osw-short-circuit-mergeable-disccusions-state' into 'master'Sean McGivern2018-01-302-3/+14
|\ \ \ \ \ \
| * | | | | | Check MR state before submitting queries for discussion stateosw-short-circuit-mergeable-disccusions-stateOswaldo Ferreira2018-01-292-3/+14
* | | | | | | Merge branch 'rc/port-ee-4064' into 'master'Rémy Coutable2018-01-301-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Port changes from gitlab-org/gitlab-ee!4064 to CERémy Coutable2018-01-301-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'ph-ajax-into-axios' into 'master'Filipa Lacerda2018-01-306-89/+80
|\ \ \ \ \ \ \
| * | | | | | | cache jQuery selectorph-ajax-into-axiosPhil Hughes2018-01-301-5/+7
| * | | | | | | Converted integration_settings_form to axiosPhil Hughes2018-01-291-25/+23
| * | | | | | | Converted issuable_bulk_update_actions to axiosPhil Hughes2018-01-291-9/+4
| * | | | | | | Converted issuable_index to axiosPhil Hughes2018-01-291-13/+15
| * | | | | | | Converted group_label_subscription to axiosPhil Hughes2018-01-291-14/+13
| * | | | | | | Converted graphs_show to axiosPhil Hughes2018-01-291-7/+9
| * | | | | | | Converted gl_dropdown to axiosPhil Hughes2018-01-291-19/+12
* | | | | | | | Merge branch 'update-create-item-dropdown-with-create-new-item-option' into '...Filipa Lacerda2018-01-301-13/+31
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Add createNewItemFromValue option and clearDropdown methodupdate-create-item-dropdown-with-create-new-item-optionEric Eastwood2018-01-301-13/+31
View Lorry Controller Status