Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix external issue tracker "Issues" link leading to 404sfix-external-issue-tracker-link | Stan Hu | 2016-08-25 | 3 | -3/+4 |
* | Merge branch 'fix-changelog' into 'master' | Stan Hu | 2016-08-25 | 1 | -26/+19 |
|\ | |||||
| * | Fix CHANGELOG entries related to 8.11 release. | Ruben Davila | 2016-08-25 | 1 | -22/+18 |
| * | Fix changelog | Douwe Maan | 2016-08-25 | 1 | -4/+1 |
* | | Merge branch 'add-lock-version-to-mr-schema' into 'master' | Stan Hu | 2016-08-25 | 1 | -0/+1 |
|\ \ | |||||
| * | | Add lock_version to merge_requests tableadd-lock-version-to-mr-schema | Stan Hu | 2016-08-25 | 1 | -0/+1 |
| |/ | |||||
* | | Merge branch 'fix-groups-sort-dropdown-alignment' into 'master' | Annabel Dunstone Gray | 2016-08-25 | 2 | -1/+2 |
|\ \ | |/ |/| | |||||
| * | Fix groups sort dropdown alignment | Clement Ho | 2016-08-25 | 2 | -1/+2 |
* | | Merge branch 'pipeline-graph-height' into 'master' | Jacob Schatz | 2016-08-25 | 1 | -1/+0 |
|\ \ | |||||
| * | | Remove max height on pipelines graphpipeline-graph-height | Annabel Dunstone | 2016-08-24 | 1 | -1/+0 |
* | | | Merge branch 'fix-emoji-alignment' into 'master' | Jacob Schatz | 2016-08-25 | 2 | -1/+2 |
|\ \ \ | |||||
| * | | | Fix inline emoji text alignment | Clement Ho | 2016-08-25 | 2 | -1/+2 |
* | | | | Merge branch '21146-windows-scrollbar' into 'master' | Jacob Schatz | 2016-08-25 | 2 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Fix overflow scroll21146-windows-scrollbar | Annabel Dunstone | 2016-08-23 | 1 | -1/+1 |
| * | | | | Remove graph min width | Annabel Dunstone | 2016-08-23 | 1 | -1/+0 |
| * | | | | Remove ugly horizontal scrollbars in windows | Annabel Dunstone | 2016-08-23 | 2 | -2/+2 |
* | | | | | Merge branch 'fix-pipeline-horizontal-scrolling' into 'master' | Jacob Schatz | 2016-08-25 | 1 | -1/+0 |
|\ \ \ \ \ | |||||
| * | | | | | Fix unnecessary horizontal scroll area in pipeline visualizations | Mike Greiling | 2016-08-24 | 1 | -1/+0 |
* | | | | | | Merge branch '21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-... | Robert Speicher | 2016-08-25 | 6 | -2/+22 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Handle non-UTF-8 conflicts gracefully21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-data | Sean McGivern | 2016-08-25 | 6 | -2/+22 |
* | | | | | | | Merge branch '21275-getting-500-error-when-viewing-a-merge-request' | Douwe Maan | 2016-08-25 | 4 | -2/+34 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update CHANGELOG21275-getting-500-error-when-viewing-a-merge-request | Sean McGivern | 2016-08-25 | 1 | -0/+4 |
| * | | | | | | | Don't show conflicts when there are none | Sean McGivern | 2016-08-25 | 2 | -1/+11 |
| * | | | | | | | Handle case where conflicts aren't on disk yet | Sean McGivern | 2016-08-25 | 3 | -1/+19 |
* | | | | | | | | Merge branch '19730-mark-as-done' into 'master' | Robert Speicher | 2016-08-25 | 3 | -1/+44 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add specs to ensure a successful return 19730-mark-as-done | Paco Guzman | 2016-08-25 | 3 | -1/+44 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'statuseable-hasstatus' into 'master' | Robert Speicher | 2016-08-25 | 5 | -7/+7 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | rename Statuseable to HasStatus | De Wet Blomerus | 2016-08-25 | 5 | -7/+7 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch '21257-label-lists-should-shows-opened-or-closed-issues-with-tha... | Robert Speicher | 2016-08-25 | 4 | -11/+18 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Update CHANGELOG21257-label-lists-should-shows-opened-or-closed-issues-with-that-label | Douglas Barbosa Alexandre | 2016-08-25 | 1 | -2/+5 |
| * | | | | | | | | Update Issue board documentation | Douglas Barbosa Alexandre | 2016-08-25 | 1 | -4/+3 |
| * | | | | | | | | Label list shows all issues (opened or closed) with that label | Douglas Barbosa Alexandre | 2016-08-25 | 2 | -5/+10 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'zj-remove-gitorious' into 'master' | Douwe Maan | 2016-08-25 | 19 | -339/+12 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Remove gitoriouszj-remove-gitorious | Z.J. van de Weg | 2016-08-25 | 19 | -339/+12 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'dz-merge-request-version' | Douwe Maan | 2016-08-25 | 25 | -124/+568 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Change the way merge request diff compare worksdz-merge-request-version | Dmitriy Zaporozhets | 2016-08-25 | 1 | -18/+6 |
| * | | | | | | | | Make it more obvious when the user isn't currently viewing the latest mr version | Dmitriy Zaporozhets | 2016-08-25 | 1 | -0/+4 |
| * | | | | | | | | Add code improvements to merge request version feature | Dmitriy Zaporozhets | 2016-08-25 | 4 | -11/+19 |
| * | | | | | | | | Add changelog item for merge request versions feature | Dmitriy Zaporozhets | 2016-08-22 | 1 | -0/+3 |
| * | | | | | | | | Fix db schema via db:migrate:reset | Dmitriy Zaporozhets | 2016-08-22 | 1 | -18/+16 |
| * | | | | | | | | Disable comments on older merge request diff | Dmitriy Zaporozhets | 2016-08-22 | 1 | -0/+5 |
| * | | | | | | | | Fix merge request diff cache service spec | Dmitriy Zaporozhets | 2016-08-22 | 1 | -1/+1 |
| * | | | | | | | | Fix merge request diff api | Dmitriy Zaporozhets | 2016-08-22 | 1 | -1/+1 |
| * | | | | | | | | Restore diff_sha_refs method | Dmitriy Zaporozhets | 2016-08-22 | 3 | -19/+24 |
| * | | | | | | | | Merge branch 'master' into dz-merge-request-version | Dmitriy Zaporozhets | 2016-08-22 | 211 | -563/+2637 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into dz-merge-request-version | Dmitriy Zaporozhets | 2016-08-19 | 554 | -1654/+32323 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix merge request versions api doc | Dmitriy Zaporozhets | 2016-08-19 | 1 | -2/+2 |
| * | | | | | | | | | | Make sure merge request is fetched before collecting base sha in merge reques... | Dmitriy Zaporozhets | 2016-08-19 | 1 | -0/+1 |
| * | | | | | | | | | | Fix merge request diffs spec | Dmitriy Zaporozhets | 2016-08-15 | 1 | -1/+1 |
| * | | | | | | | | | | Fix and refactor merge request diff_refs method | Dmitriy Zaporozhets | 2016-08-15 | 4 | -27/+11 |