summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* API methods should be documented using Grape's DSL document-grape-dslRémy Coutable2016-08-011-0/+6
* Merge branch 'fix/importing-io-timing-issue' into 'master' Rémy Coutable2016-08-011-1/+17
|\
| * Update CHANGELOGJames Lopez2016-08-011-1/+0
| * refactored wait_for_archived_file methodfix/importing-io-timing-issueJames Lopez2016-08-011-6/+4
| * fix return value and specJames Lopez2016-08-011-1/+1
| * squashed - fix timing issues in prod importing projectsJames Lopez2016-08-012-1/+20
* | Merge branch 'fix-gh-pull-requests' into 'master' Rémy Coutable2016-08-013-5/+18
|\ \
| * | fixup! Fix attr reader to force the intended values for source and target shasfix-gh-pull-requestsDouglas Barbosa Alexandre2016-07-311-6/+2
| * | Update CHANGELOGDouglas Barbosa Alexandre2016-07-311-0/+1
| * | Fix attr reader to force the intended values for source and target shasDouglas Barbosa Alexandre2016-07-312-3/+19
* | | Merge branch '20473-rails-queue-duration' into 'master' Yorick Peterse2016-08-012-2/+2
|\ \ \
| * | | Gitlab::Metrics.current_transaction needs to be public for RailsQueueDurationPaco Guzman2016-08-012-2/+2
* | | | Merge branch 'patch-3' into 'master' Rémy Coutable2016-08-011-1/+1
|\ \ \ \
| * | | | Changed grant_type=AUTHORIZATION_CODE for grant_type=authorization_code Fernando Derkoski2016-07-281-1/+1
* | | | | Merge branch 'fix-extra-new-line-crlf' into 'master' Rémy Coutable2016-08-015-3/+17
|\ \ \ \ \
| * | | | | Fix specsfix-extra-new-line-crlfRémy Coutable2016-08-012-2/+2
| * | | | | Trim extra displayed carriage returns in diffs and files with CRLFsStan Hu2016-08-014-2/+16
* | | | | | Merge branch '14202-avoid-line-code-position-calculations' into 'master' Yorick Peterse2016-08-012-4/+4
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Avoid line_code and position calculation on line partial for plain view14202-avoid-line-code-position-calculationsPaco Guzman2016-08-012-4/+4
| | |_|_|/ | |/| | |
* | | | | Merge branch '15064_issuable_default_sort_order' into 'master' Rémy Coutable2016-08-0116-106/+322
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | State specific default sort order for issuableszs2016-08-0116-106/+322
* | | | | Merge branch 'fix/labels-milestones-import' into 'master' Rémy Coutable2016-08-0112-236/+265
|\ \ \ \ \
| * | | | | squashed - fixed label and milestone association problems, updated specs and ...fix/labels-milestones-importJames Lopez2016-08-0112-236/+265
| | |/ / / | |/| | |
* | | | | Merge branch 'zj-env-external-url' into 'master' Rémy Coutable2016-08-0119-29/+494
|\ \ \ \ \
| * | | | | Minor fixes in the Env API endpointszj-env-external-urlZ.J. van de Weg2016-08-013-4/+24
| * | | | | Use Grape DSL for environment endpointsZ.J. van de Weg2016-07-296-97/+108
| * | | | | Incorporate feedbackZ.J. van de Weg2016-07-298-29/+45
| * | | | | Add API support for environmentsZ.J. van de Weg2016-07-295-0/+313
| * | | | | Add an URL field to EnvironmentsZ.J. van de Weg2016-07-2914-28/+133
| | |/ / / | |/| | |
* | | | | Merge branch 'new-issue-button-outline' into 'master' Rémy Coutable2016-08-013-2/+3
|\ \ \ \ \
| * | | | | Make "New issue" button in Issue page less obtrusive (!5457)winniehell2016-07-303-2/+3
* | | | | | Merge branch 'document-yaml-colon' into 'master' Achilleas Pipinellis2016-08-011-0/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Update README.mddocument-yaml-colonMark Pundsack2016-07-271-1/+1
| * | | | | Clarify CI script needing to quote colonsMark Pundsack2016-07-251-0/+2
* | | | | | Merge branch 'master' into 'master' Achilleas Pipinellis2016-08-011-0/+8
|\ \ \ \ \ \
| * | | | | | Update start-using-git.mdButch Anton2016-07-211-0/+8
* | | | | | | Merge branch 'clarify-backup-keep-time' into 'master' Achilleas Pipinellis2016-08-011-0/+7
|\ \ \ \ \ \ \
| * | | | | | | Clarify backup_keep_time config parameter with S3clarify-backup-keep-timeStan Hu2016-07-291-0/+7
* | | | | | | | Merge branch 'improve-test-specificity' into 'master' Stan Hu2016-08-011-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve spinach test to be more specific about link to clickStan Hu2016-07-311-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'fix-invalid-x-forwarded-for-ip' into 'master' Stan Hu2016-08-013-0/+9
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Moved to 8.10.3 release.lookatmike2016-07-311-1/+1
| * | | | | | | Ignore invalid IPs in X-Forwarded-For when trusted proxies are configured.lookatmike2016-07-313-0/+9
|/ / / / / / /
* | | | | | | Merge branch 'clarify-deletion-message' into 'master' Robert Speicher2016-07-301-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Clarify which project is deleted to avoid alarmclarify-deletion-messageStan Hu2016-07-291-1/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'reject-merge-conflicts' into 'master' Robert Speicher2016-07-303-1/+19
|\ \ \ \ \ \ \
| * | | | | | | Properly abort a merge when merge conflicts occurreject-merge-conflictsStan Hu2016-07-293-1/+19
| |/ / / / / /
* | | | | | | Merge branch 'remove-redundant-blob-text-calls' into 'master' Yorick Peterse2016-07-305-6/+27
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Improve diff performance by eliminating redundant checks for text blobsremove-redundant-blob-text-callsStan Hu2016-07-295-6/+27
|/ / / / / /
* | | | | | Merge branch 'fix/import-project-hooks' into 'master' Douwe Maan2016-07-294-2/+22
|\ \ \ \ \ \
View Lorry Controller Status