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 | 23 | -175/+267 |
|\ | |||||
| * | Merge branch 'reduce-contributions-calendar-payload' into 'master' | Jacob Schatz | 2016-08-26 | 1 | -1/+0 |
| |\ | |||||
| | * | Reduce contributions calendar data payload | Clement Ho | 2016-08-25 | 1 | -1/+0 |
| * | | Merge branch '21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-... | Robert Speicher | 2016-08-25 | 1 | -0/+9 |
| |\ \ | |||||
| | * | | Handle non-UTF-8 conflicts gracefully21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-data | Sean McGivern | 2016-08-25 | 1 | -0/+9 |
| * | | | Merge branch '21275-getting-500-error-when-viewing-a-merge-request' | Douwe Maan | 2016-08-25 | 1 | -0/+11 |
| |\ \ \ | |||||
| | * | | | Handle case where conflicts aren't on disk yet | Sean McGivern | 2016-08-25 | 1 | -0/+11 |
| | |/ / | |||||
| * | | | Merge branch 'zj-remove-gitorious' into 'master' | Douwe Maan | 2016-08-25 | 6 | -104/+7 |
| |\ \ \ | |||||
| | * | | | Remove gitoriouszj-remove-gitorious | Z.J. van de Weg | 2016-08-25 | 6 | -104/+7 |
| | |/ / | |||||
| * | | | Merge branch 'dz-merge-request-version' | Douwe Maan | 2016-08-25 | 4 | -8/+67 |
| |\ \ \ | |||||
| | * | | | Fix merge request diff api | Dmitriy Zaporozhets | 2016-08-22 | 1 | -1/+1 |
| | * | | | Merge branch 'master' into dz-merge-request-version | Dmitriy Zaporozhets | 2016-08-22 | 8 | -22/+30 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into dz-merge-request-version | Dmitriy Zaporozhets | 2016-08-19 | 51 | -201/+1507 |
| | |\ \ \ \ | |||||
| | * | | | | | Make merge request diff works with new FileCollection logic | Dmitriy Zaporozhets | 2016-08-15 | 1 | -8/+8 |
| | * | | | | | Merge branch 'master' into dz-merge-request-version | Dmitriy Zaporozhets | 2016-08-15 | 72 | -1223/+979 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Add single merge request diff API endpoint | Dmitriy Zaporozhets | 2016-08-12 | 2 | -0/+21 |
| | * | | | | | | Fix project id param for merge request version API | Dmitriy Zaporozhets | 2016-08-03 | 1 | -2/+2 |
| | * | | | | | | Update merge request versions API to match styleguide | Dmitriy Zaporozhets | 2016-08-03 | 1 | -9/+10 |
| | * | | | | | | Add API to list merge request diff versions | Dmitriy Zaporozhets | 2016-08-03 | 3 | -0/+37 |
| * | | | | | | | Adds response mime type to transaction metric action when it's not HTML | Paco Guzman | 2016-08-25 | 1 | -2/+20 |
| | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | Merge branch 'internal_recovery_api' into 'master' | Robert Speicher | 2016-08-24 | 1 | -0/+25 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Add two factor recovery endpoint to internal API | Drew Blessing | 2016-08-24 | 1 | -0/+25 |
| * | | | | | | | Merge branch 'add-sentry-logging-to-api' into 'master' | Robert Speicher | 2016-08-24 | 3 | -20/+36 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | Add Sentry logging to API callsadd-sentry-logging-to-api | Stan Hu | 2016-08-24 | 3 | -20/+36 |
| * | | | | | | | Merge branch 'github-importer' into 'master' | Douwe Maan | 2016-08-24 | 2 | -33/+58 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Add readable error message when remote data could not be fully imported | Douglas Barbosa Alexandre | 2016-08-24 | 1 | -1/+6 |
| | * | | | | | | | Does not halt the GitHub import process when an error occurs | Douglas Barbosa Alexandre | 2016-08-24 | 2 | -33/+53 |
| * | | | | | | | | Merge branch 'restore-get_id' into 'master' | Douwe Maan | 2016-08-24 | 1 | -3/+10 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| | * | | | | | | | Restore get_id in ExtractsPath | winniehell | 2016-08-24 | 1 | -3/+10 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge branch 'api_only_allow_merge_if_build_succeeds' into 'master' | Douwe Maan | 2016-08-24 | 2 | -3/+7 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | expose 'only_allow_merge_if_build_succeeds' project setting in the API | Marc Dequènes (Duck) | 2016-08-24 | 2 | -3/+7 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge branch 'entity-api-web-url' into 'master' | Douwe Maan | 2016-08-24 | 2 | -0/+14 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| | * | | | | | | api: expose web_url for project entities | Ben Boeckel | 2016-08-24 | 1 | -0/+12 |
| | * | | | | | | url_builder: handle project snippets | Ben Boeckel | 2016-08-24 | 1 | -0/+2 |
| | |/ / / / / | |||||
| * | | | | | | api: expose wiki_page_events project hook field in the API | Ben Boeckel | 2016-08-24 | 2 | -1/+3 |
| |/ / / / / | |||||
* | | | | | | Fix tests | Lin Jen-Shin | 2016-08-26 | 1 | -3/+1 |
* | | | | | | Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu... | Lin Jen-Shin | 2016-08-24 | 9 | -27/+34 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | entities: make Environment inherit EnvironmentBasic | Ben Boeckel | 2016-08-23 | 1 | -4/+3 |
| * | | | | | Merge branch 'metrics-typo' into 'master' | Yorick Peterse | 2016-08-22 | 1 | -1/+1 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | Fix typo in gitlab-workhorse header | Jacob Vosmaer | 2016-08-19 | 1 | -1/+1 |
| * | | | | | Merge branch 'disable-issue-by-email' into 'master' | Robert Speicher | 2016-08-20 | 1 | -1/+2 |
| |\ \ \ \ \ | |||||
| | * | | | | | Disable “issue by email” feature until it uses a different token | Douwe Maan | 2016-08-19 | 1 | -1/+2 |
| * | | | | | | Merge branch 'gokmengoksel/gitlab-ce-koding' into 'master' | Stan Hu | 2016-08-19 | 1 | -0/+1 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | Support integration with Koding (online IDE) | Gokmen Goksel | 2016-08-19 | 1 | -0/+1 |
| * | | | | | | Merge branch 'directory-names-containing-space' into 'master' | Robert Speicher | 2016-08-19 | 1 | -9/+3 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Do not escape URI when extracting path (!5878) | winniehell | 2016-08-19 | 1 | -9/+3 |
| * | | | | | | | Merge branch 'wall-clock-time-for-showing-pipeline' into 'master' | Robert Speicher | 2016-08-19 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| | * | | | | | | Merge remote-tracking branch 'upstream/master' into wall-clock-time-for-showi... | Lin Jen-Shin | 2016-08-20 | 1 | -2/+1 |
| | |\ \ \ \ \ \ | | | |/ / / / / | |||||
| | * | | | | | | Merge remote-tracking branch 'upstream/master' into wall-clock-time-for-showi... | Lin Jen-Shin | 2016-08-19 | 22 | -15/+864 |
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | |||||
| | * | | | | | | Use travel_to instead of dependency injection, feedback: | Lin Jen-Shin | 2016-08-19 | 1 | -5/+0 |