Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu... | Lin Jen-Shin | 2016-08-26 | 40 | -144/+694 |
|\ | |||||
| * | Merge branch 'reduce-contributions-calendar-payload' into 'master' | Jacob Schatz | 2016-08-26 | 1 | -0/+19 |
| |\ | |||||
| | * | Reduce contributions calendar data payload | Clement Ho | 2016-08-25 | 1 | -0/+19 |
| * | | Merge branch 'capitalize-mentioned-issue-notes' into 'master' | Douwe Maan | 2016-08-26 | 5 | -9/+9 |
| |\ \ | |||||
| | * | | Capitalize mentioned issue timeline notes | Clement Ho | 2016-08-25 | 5 | -9/+9 |
| * | | | Merge branch 'add-hover-color-emoji-icon' into 'master' | Jacob Schatz | 2016-08-26 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Add hover color to emoji icon | Clement Ho | 2016-08-25 | 1 | -1/+1 |
| * | | | | Fix external issue tracker "Issues" link leading to 404sfix-external-issue-tracker-link | Stan Hu | 2016-08-25 | 1 | -2/+2 |
| * | | | | Merge branch '21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-... | Robert Speicher | 2016-08-25 | 3 | -2/+9 |
| |\ \ \ \ | |||||
| | * | | | | Handle non-UTF-8 conflicts gracefully21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-data | Sean McGivern | 2016-08-25 | 3 | -2/+9 |
| * | | | | | Merge branch '21275-getting-500-error-when-viewing-a-merge-request' | Douwe Maan | 2016-08-25 | 1 | -0/+13 |
| |\ \ \ \ \ | |||||
| | * | | | | | Don't show conflicts when there are none | Sean McGivern | 2016-08-25 | 1 | -0/+6 |
| | * | | | | | Handle case where conflicts aren't on disk yet | Sean McGivern | 2016-08-25 | 1 | -0/+7 |
| | |/ / / / | |||||
| * | | | | | Merge branch '19730-mark-as-done' into 'master' | Robert Speicher | 2016-08-25 | 2 | -0/+42 |
| |\ \ \ \ \ | |||||
| | * | | | | | Add specs to ensure a successful return 19730-mark-as-done | Paco Guzman | 2016-08-25 | 2 | -0/+42 |
| | |/ / / / | |||||
| * | | | | | Merge branch 'statuseable-hasstatus' into 'master' | Robert Speicher | 2016-08-25 | 1 | -3/+3 |
| |\ \ \ \ \ | |||||
| | * | | | | | rename Statuseable to HasStatus | De Wet Blomerus | 2016-08-25 | 1 | -3/+3 |
| | |/ / / / | |||||
| * | | | | | Merge branch '21257-label-lists-should-shows-opened-or-closed-issues-with-tha... | Robert Speicher | 2016-08-25 | 1 | -4/+4 |
| |\ \ \ \ \ | |||||
| | * | | | | | Label list shows all issues (opened or closed) with that label | Douglas Barbosa Alexandre | 2016-08-25 | 1 | -4/+4 |
| | |/ / / / | |||||
| * | | | | | Merge branch 'zj-remove-gitorious' into 'master' | Douwe Maan | 2016-08-25 | 2 | -95/+0 |
| |\ \ \ \ \ | |||||
| | * | | | | | Remove gitoriouszj-remove-gitorious | Z.J. van de Weg | 2016-08-25 | 2 | -95/+0 |
| | |/ / / / | |||||
| * | | | | | Merge branch 'dz-merge-request-version' | Douwe Maan | 2016-08-25 | 5 | -14/+143 |
| |\ \ \ \ \ | |||||
| | * | | | | | Add code improvements to merge request version feature | Dmitriy Zaporozhets | 2016-08-25 | 1 | -0/+9 |
| | * | | | | | Fix merge request diff cache service spec | Dmitriy Zaporozhets | 2016-08-22 | 1 | -1/+1 |
| | * | | | | | Restore diff_sha_refs method | Dmitriy Zaporozhets | 2016-08-22 | 1 | -3/+3 |
| | * | | | | | Merge branch 'master' into dz-merge-request-version | Dmitriy Zaporozhets | 2016-08-22 | 43 | -183/+1173 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' into dz-merge-request-version | Dmitriy Zaporozhets | 2016-08-19 | 163 | -479/+9523 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | 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 | 1 | -6/+7 |
| | * | | | | | | | Merge branch 'master' into dz-merge-request-version | Dmitriy Zaporozhets | 2016-08-15 | 285 | -3193/+5222 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Add single merge request diff API endpoint | Dmitriy Zaporozhets | 2016-08-12 | 1 | -0/+17 |
| | * | | | | | | | | Add MergeRequest#branch_merge_base_commit method | Dmitriy Zaporozhets | 2016-08-08 | 1 | -0/+17 |
| | * | | | | | | | | Add API to list merge request diff versions | Dmitriy Zaporozhets | 2016-08-03 | 1 | -0/+32 |
| | * | | | | | | | | Fix merge request spec for update diff note | Dmitriy Zaporozhets | 2016-08-02 | 1 | -0/+2 |
| | * | | | | | | | | Chnage the way how merge request diff is initialized and saved | Dmitriy Zaporozhets | 2016-08-02 | 2 | -15/+3 |
| | * | | | | | | | | Change merge request diff creation from callback to part of the service | Dmitriy Zaporozhets | 2016-08-02 | 2 | -1/+8 |
| | * | | | | | | | | Add more tests to merge_request_diff and improve initialize | Dmitriy Zaporozhets | 2016-08-02 | 1 | -0/+17 |
| | * | | | | | | | | Refactor MergeRequestDiff initialize method | Dmitriy Zaporozhets | 2016-08-02 | 1 | -1/+0 |
| | * | | | | | | | | Reload merge request association reload when update code | Dmitriy Zaporozhets | 2016-08-02 | 1 | -3/+2 |
| | * | | | | | | | | Add feature test for merge request version | Dmitriy Zaporozhets | 2016-08-02 | 1 | -0/+38 |
| | * | | | | | | | | Improve merge request diff creation and update tests | Dmitriy Zaporozhets | 2016-08-02 | 1 | -12/+16 |
| * | | | | | | | | | Merge branch '21378-error-500-after-8-11-update-on-system-infos-page' into 'm... | Robert Speicher | 2016-08-25 | 1 | -5/+42 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
| | * | | | | | | | | Handle unavailable system info | Sean McGivern | 2016-08-25 | 1 | -5/+42 |
| | | |_|_|_|/ / / | | |/| | | | | | | |||||
| * | | | | | | | | Merge branch 'standardize-cookie-paths' into 'master' | Jacob Schatz | 2016-08-25 | 1 | -2/+30 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | use gitlab global root url as canonical base url for all javascript set cooki... | Mike Greiling | 2016-08-24 | 1 | -2/+30 |
| | |/ / / / / / / | |||||
| * | | | | | | | | Adds response mime type to transaction metric action when it's not HTML | Paco Guzman | 2016-08-25 | 1 | -4/+17 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | Display project icon from default branch | Hannes Rosenögger | 2016-08-25 | 1 | -0/+31 |
| |/ / / / / / | |||||
| * | | | | | | Merge branch 'internal_recovery_api' into 'master' | Robert Speicher | 2016-08-24 | 1 | -0/+62 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Add two factor recovery endpoint to internal API | Drew Blessing | 2016-08-24 | 1 | -0/+62 |
| * | | | | | | | Merge branch 'add-sentry-logging-to-api' into 'master' | Robert Speicher | 2016-08-24 | 1 | -0/+27 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | |