summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update CHANGELOG21275-getting-500-error-when-viewing-a-merge-requestSean McGivern2016-08-251-0/+4
* Don't show conflicts when there are noneSean McGivern2016-08-252-1/+11
* Handle case where conflicts aren't on disk yetSean McGivern2016-08-253-1/+19
* Merge branch 'doc/update-issue-board-img' into 'master' Achilleas Pipinellis2016-08-251-0/+0
|\
| * Use new image for Issue Board pageAchilleas Pipinellis2016-08-251-0/+0
* | Merge branch 'patch-5' into 'master' Stan Hu2016-08-251-1/+1
|\ \
| * | removed redundant wordJürgen Steinblock2016-08-251-1/+1
|/ /
* | Merge branch 'internal_recovery_api' into 'master' Robert Speicher2016-08-246-0/+160
|\ \
| * | Add two factor recovery endpoint to internal APIDrew Blessing2016-08-246-0/+160
* | | Merge branch 'add-sentry-logging-to-api' into 'master' Robert Speicher2016-08-247-42/+92
|\ \ \ | |/ / |/| |
| * | Add Sentry logging to API callsadd-sentry-logging-to-apiStan Hu2016-08-247-42/+92
* | | Merge branch '20909-use-total-count-instead-of-size' into 'master' Douwe Maan2016-08-242-1/+2
|\ \ \
| * | | change from members using size to start using total_count in the group20909-use-total-count-instead-of-sizetiagonbotelho2016-08-242-1/+2
| | |/ | |/|
* | | Merge branch 'github-importer' into 'master' Douwe Maan2016-08-247-36/+203
|\ \ \
| * | | Update CHANGELOGgithub-importerDouglas Barbosa Alexandre2016-08-241-0/+1
| * | | Add readable error message when remote data could not be fully importedDouglas Barbosa Alexandre2016-08-242-11/+19
| * | | Does not halt the GitHub import process when an error occursDouglas Barbosa Alexandre2016-08-246-36/+194
* | | | Merge branch 'restore-get_id' into 'master' Douwe Maan2016-08-243-11/+21
|\ \ \ \
| * | | | Restore get_id in ExtractsPathwinniehell2016-08-242-11/+11
| * | | | Add failing test for #21334winniehell2016-08-241-0/+10
| | |/ / | |/| |
* | | | Merge branch 'workhorse-0.7.11' into 'master' Douwe Maan2016-08-242-2/+2
|\ \ \ \
| * | | | Use gitlab-workhorse 0.7.11Jacob Vosmaer2016-08-242-2/+2
| |/ / /
* | | | Merge branch 'api_only_allow_merge_if_build_succeeds' into 'master' Douwe Maan2016-08-246-12/+53
|\ \ \ \
| * | | | expose 'only_allow_merge_if_build_succeeds' project setting in the APIMarc Dequènes (Duck)2016-08-246-12/+53
| |/ / /
* | | | Merge branch 'entity-api-web-url' into 'master' Douwe Maan2016-08-249-18/+56
|\ \ \ \ | |_|_|/ |/| | |
| * | | api: expose web_url for project entitiesBen Boeckel2016-08-248-18/+54
| * | | url_builder: handle project snippetsBen Boeckel2016-08-241-0/+2
| |/ /
* | | Merge branch 'patch-4' into 'master' Achilleas Pipinellis2016-08-242-0/+20
|\ \ \
| * | | Modify the alias to allow specifying a remoteOndřej Čertík2016-08-231-4/+4
| * | | Add new lines after backticks and colonsOndřej Čertík2016-08-231-0/+4
| * | | Update CHANGELOGOndřej Čertík2016-08-221-0/+1
| * | | Update merge_requests.md with a simpler way to check out a merge request Ondřej Čertík2016-08-221-0/+15
* | | | Merge branch 'api-project-hook-wiki-page-events' into 'master' Robert Speicher2016-08-246-1/+23
|\ \ \ \
| * | | | api: expose wiki_page_events project hook field in the APIBen Boeckel2016-08-246-1/+12
| * | | | docs: document other project webhook fieldsBen Boeckel2016-08-242-0/+11
| | |/ / | |/| |
* | | | Merge branch '20254-create-mr-for-new-branch' into 'master' Robert Speicher2016-08-245-12/+64
|\ \ \ \
| * | | | Show "Create Merge Request" widget for push events to fork projects on the so...Paco Guzman2016-08-245-12/+64
| |/ / /
* | | | Merge branch 'issue-created_at-docs' into 'master' Achilleas Pipinellis2016-08-241-4/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | docs: fix table alignmentBen Boeckel2016-08-241-2/+2
| * | | docs: update created_at docs for creating issues via APIBen Boeckel2016-08-241-2/+2
* | | | Merge branch 'docs/add-tests-coverage-badge-to-readme' into 'master' Achilleas Pipinellis2016-08-241-0/+1
|\ \ \ \
| * | | | Add tests coverage report badge to READMEdocs/add-tests-coverage-badge-to-readmeGrzegorz Bizon2016-08-201-0/+1
* | | | | Merge branch 'patch-4' into 'master' Achilleas Pipinellis2016-08-242-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Update Ruby version to 2.3 in READMESebastiaan Lokhorst2016-08-231-1/+1
| * | | | Update Ruby version to 2.3 in RequirementsSebastiaan Lokhorst2016-08-231-1/+1
* | | | | Merge branch 'disable-commenting-on-unrelatable-diff-line' into 'master' Douwe Maan2016-08-233-7/+59
|\ \ \ \ \
| * | | | | Added CHANGELOGdisable-commenting-on-unrelatable-diff-lineLuke Bennett2016-08-231-0/+1
| * | | | | Added unfold test to parallel and added 'diff discussion' contextLuke Bennett2016-08-232-3/+34
| * | | | | Better first match on this MR alsoLuke Bennett2016-08-231-1/+1
| * | | | | Updated to optimized specs from !5864Luke Bennett2016-08-231-138/+0
View Lorry Controller Status