Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '35779-realtime-update-of-pipeline-status-in-files-view' into 'm... | Filipa Lacerda | 2018-02-01 | 5 | -0/+171 |
|\ | |||||
| * | Added more tests and corrected typos35779-realtime-update-of-pipeline-status-in-files-view | Jose Ivan Vargas | 2018-02-01 | 5 | -53/+73 |
| * | Restored some code, add hidden class | Jose Ivan Vargas | 2018-01-30 | 4 | -19/+23 |
| * | Added realtime prop and corrected specs | Jose Ivan Vargas | 2018-01-30 | 4 | -5/+35 |
| * | Added pipeline status to the files view | Jose Ivan Vargas | 2018-01-30 | 6 | -17/+134 |
* | | Merge branch '30106-group-issues' into 'master' | Sean McGivern | 2018-02-01 | 3 | -2/+14 |
|\ \ | |||||
| * | | Include subgroup issuables on the group page30106-group-issues | Jarka Kadlecová | 2018-02-01 | 3 | -2/+14 |
* | | | Merge branch '42497-rubocop-style-regexpliteral' into 'master' | Rémy Coutable | 2018-02-01 | 14 | -24/+24 |
|\ \ \ | |||||
| * | | | Enable RuboCop Style/RegexpLiteral | Takuya Noguchi | 2018-02-01 | 14 | -24/+24 |
* | | | | Merge branch 'fix-internationalization-namespace' into 'master' | Filipa Lacerda | 2018-02-01 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Remove namespaced internationalization importfix-internationalization-namespace | Clement Ho | 2018-01-31 | 1 | -2/+2 |
* | | | | | Merge branch 'axios-find-file' into 'master' | Fatih Acet | 2018-02-01 | 1 | -13/+11 |
|\ \ \ \ \ | |||||
| * | | | | | Replace $.ajax in find file with axiosaxios-find-file | Clement Ho | 2018-01-31 | 1 | -13/+11 |
| |/ / / / | |||||
* | | | | | Replace $.ajax in activity calendar with axiosaxios-calendar | Clement Ho | 2018-01-31 | 1 | -9/+14 |
|/ / / / | |||||
* | | | | Merge branch '4761-follow-up-from-resolve-developers-should-be-able-to-create... | Rémy Coutable | 2018-01-31 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | refactor groups controller to match EE4761-follow-up-from-resolve-developers-should-be-able-to-create-new-projects-in-group | James Lopez | 2018-01-31 | 1 | -2/+2 |
* | | | | | Merge branch 'fl-mr-widget' into 'master' | Phil Hughes | 2018-01-31 | 4 | -39/+46 |
|\ \ \ \ \ | |||||
| * | | | | | Fix broken testfl-mr-widget | Filipa Lacerda | 2018-01-31 | 2 | -3/+3 |
| * | | | | | Move mr widget related links into a vue file | Filipa Lacerda | 2018-01-30 | 4 | -40/+47 |
* | | | | | | Merge branch 'axios-get-render-math' into 'master' | Phil Hughes | 2018-01-31 | 1 | -13/+25 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Replace $.get in render math with axiosaxios-get-render-math | Clement Ho | 2018-01-30 | 1 | -13/+25 |
* | | | | | | | Use axios instead of jquery ajax for setCiStatusFavicon | Clement Ho | 2018-01-31 | 1 | -11/+6 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge branch 'rugged-reference-cache-rescue' into 'master' | Sean McGivern | 2018-01-31 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Remove Rugged exception in cache rescuerugged-reference-cache-rescue | Jacob Vosmaer | 2018-01-30 | 1 | -1/+1 |
* | | | | | | Merge branch 'zj-gitaly-server-info' into 'master' | Sean McGivern | 2018-01-31 | 3 | -8/+38 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Gitaly Server info for admin panel | Zeger-Jan van de Weg | 2018-01-31 | 3 | -8/+38 |
* | | | | | | | Merge branch 'fix/move-can-be-merged-to-lib-git' into 'master' | Grzegorz Bizon | 2018-01-31 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Move Repository#can_be_merged? to Gitlab::Git::Repositoryfix/move-can-be-merged-to-lib-git | Ahmad Sherif | 2018-01-30 | 1 | -19/+1 |
* | | | | | | | | Merge branch 'sh-fix-events-collection' into 'master' | Rémy Coutable | 2018-01-31 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix not all events being shown in group dashboardsh-fix-events-collection | Stan Hu | 2018-01-30 | 1 | -1/+0 |
* | | | | | | | | | Merge branch 'ph-ajax-to-axios' into 'master' | Filipa Lacerda | 2018-01-31 | 6 | -118/+88 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | potential fix for tests crashing | Phil Hughes | 2018-01-30 | 1 | -2/+3 |
| * | | | | | | | | EE backport for callback being optional | Phil Hughes | 2018-01-30 | 1 | -1/+1 |
| * | | | | | | | | more EE backports | Phil Hughes | 2018-01-30 | 1 | -2/+10 |
| * | | | | | | | | backported changed from EE | Phil Hughes | 2018-01-30 | 1 | -1/+5 |
| * | | | | | | | | fixed failing IDE test | Phil Hughes | 2018-01-30 | 1 | -1/+1 |
| * | | | | | | | | changed commits.js to axios | Phil Hughes | 2018-01-30 | 1 | -16/+18 |
| * | | | | | | | | converted blob viewer to axios | Phil Hughes | 2018-01-30 | 1 | -14/+8 |
| * | | | | | | | | Converted API.js to axios | Phil Hughes | 2018-01-30 | 4 | -85/+46 |
* | | | | | | | | | Merge branch 'cal-label-fix' into 'master' | Annabel Dunstone Gray | 2018-01-30 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Contribution calendar label cutoff fixcal-label-fix | Clement Ho | 2018-01-29 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'feature/migrate-wiki-page-formatted-data-to-gitaly' into 'master' | Robert Speicher | 2018-01-30 | 2 | -1/+10 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Migrate fetching wiki page formatted content to Gitalyfeature/migrate-wiki-page-formatted-data-to-gitaly | Ahmad Sherif | 2018-01-30 | 2 | -1/+10 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'gitaly-784-repo-write-ref' into 'master' | Douwe Maan | 2018-01-30 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | |||||
| * | | | | | | | | Migrate Git::Repository#write_ref to Gitalygitaly-784-repo-write-ref | Kim "BKC" Carlbäcker | 2018-01-30 | 1 | -0/+2 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch '42160-error-500-loading-merge-request-undefined-method-index-fo... | Douwe Maan | 2018-01-30 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | Fix truncated_diff_lines for legacy notes without a line42160-error-500-loading-merge-request-undefined-method-index-for-nil-nilclass | Sean McGivern | 2018-01-30 | 1 | -0/+2 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Decouple more of Repository from Rugged | Jacob Vosmaer (GitLab) | 2018-01-30 | 1 | -62/+5 |
* | | | | | | | Merge branch 'jprovazn-pagination' into 'master' | Sean McGivern | 2018-01-30 | 1 | -5/+15 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Make pagination optional for issuables | Jan Provaznik | 2018-01-30 | 1 | -5/+15 |