summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* workaround spec failure for mySQL invalid date issuefix/fork-spec-mysqlJames Lopez2017-05-051-0/+2
* Merge branch 'backport-ee-4b464eaaee' into 'master' Robert Speicher2017-05-055-8/+38
|\
| * Backport avatar-related spec changes from gitlab-org/gitlab-ee@4b464eaaeebackport-ee-4b464eaaeeRémy Coutable2017-05-045-8/+38
* | Merge branch 'prometheus-integration-test-setting-fix' into 'master' Robert Speicher2017-05-055-1/+45
|\ \
| * | Improved changelog entry, also changed error message for HTTParty errorprometheus-integration-test-setting-fixJose Ivan Vargas2017-05-043-3/+3
| * | Improved code styling and added a HTTParty rescue blockJose Ivan Vargas2017-05-044-22/+29
| * | Added specsJose Ivan Vargas2017-05-043-5/+33
| * | Added rescue block for the test method for the prometheus serviceJose Ivan Vargas2017-05-043-3/+12
* | | Merge branch 'mrchrisw-import-shell-timeout'Sean McGivern2017-05-055-2/+51
|\ \ \
| * | | Add configurable timeout for git fetch and clone operationsmrchrisw-import-shell-timeoutChris Wilson2017-04-275-2/+51
* | | | Merge branch '31747-fix-transient-failures-when-tests-run-too-fast' into 'mas...Sean McGivern2017-05-052-9/+9
|\ \ \ \
| * | | | Set minimum latency to be non-negative number.Pawel Chojnacki2017-05-052-9/+9
* | | | | Merge branch 'fix-email-receiver-metrics' into 'master' Rémy Coutable2017-05-053-3/+3
|\ \ \ \ \
| * | | | | Fix email receiver metrics eventsfix-email-receiver-metricsSean McGivern2017-05-053-3/+3
| |/ / / /
* | | | | Merge branch 'issue-boards-no-avatar' into 'master' Filipa Lacerda2017-05-058-12/+38
|\ \ \ \ \
| * | | | | Changed how the default avatar is setissue-boards-no-avatarPhil Hughes2017-05-047-14/+33
| * | | | | Merge branch 'master' into issue-boards-no-avatarPhil Hughes2017-05-04667-3440/+13617
| |\ \ \ \ \
| * | | | | | Fixed avatar not displaying in issue boardsPhil Hughes2017-04-284-1/+8
* | | | | | | Merge branch '27614-instant-comments' into 'master' Filipa Lacerda2017-05-0516-65/+607
|\ \ \ \ \ \ \
| * | | | | | | Add instant comments supportKushal Pandya2017-05-0516-65/+607
|/ / / / / / /
* | | | | | | Merge branch '30237-pipelines-actions-make-2-requests' into 'master' Kamil Trzciński2017-05-053-3/+53
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Add specs for new pipeline action for JSON format30237-pipelines-actions-make-2-requestsGrzegorz Bizon2017-05-051-0/+36
| * | | | | | Use wrap_parameters in pipelines controllerGrzegorz Bizon2017-05-051-0/+2
| * | | | | | Respond with no content for pipeline JSON actionsGrzegorz Bizon2017-05-051-6/+2
| * | | | | | Retry and cancel endpoints send 204 json response. Request is made with type ...Filipa Lacerda2017-05-052-3/+19
* | | | | | | Merge branch 'merge-request-poll-json-endpoint' into 'master' Filipa Lacerda2017-05-052-1/+5
|\ \ \ \ \ \ \
| * | | | | | | Fixed bug where merge request JSON would showmerge-request-poll-json-endpointPhil Hughes2017-05-042-1/+5
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'adam-separate-slash-commands' into 'master' Rémy Coutable2017-05-0528-133/+785
|\ \ \ \ \ \ \
| * | | | | | | Display slash commands outcome when previewing Markdownadam-separate-slash-commandsRares Sfirlogea2017-05-0428-133/+785
* | | | | | | | Merge branch '31552-documentation-dos-and-donts' into 'master' Phil Hughes2017-05-052-283/+334
|\ \ \ \ \ \ \ \
| * | | | | | | | Changes after review31552-documentation-dos-and-dontsFilipa Lacerda2017-05-041-19/+13
| * | | | | | | | Add missing pointsFilipa Lacerda2017-05-041-8/+70
| * | | | | | | | Adds numbered lists to easily point to documentationFilipa Lacerda2017-05-042-282/+277
* | | | | | | | | Merge branch 'manual-build-trigger' into 'master' Marin Jankovski2017-05-053-0/+59
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add a manual job to trigger package build in omnibusBalasankar C2017-05-053-0/+59
|/ / / / / / / / /
* | | | | | | | | Merge branch '29145-oauth-422' into 'master' Phil Hughes2017-05-055-12/+143
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update design of auth error pageAnnabel Dunstone Gray2017-05-055-12/+143
|/ / / / / / / / /
* | | | | | | | | Merge branch '31810-commit-link' into 'master' Phil Hughes2017-05-052-1/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove # char for commitFilipa Lacerda2017-05-052-1/+5
|/ / / / / / / / /
* | | | | | | | | Merge branch '28433-internationalise-cycle-analytics-page' into 'master' Douwe Maan2017-05-0569-81/+1829
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Some small updates for Spanish translations.Ruben Davila2017-05-0410-32/+32
| * | | | | | | | | Merge branch 'master' into 28433-internationalise-cycle-analytics-pageRuben Davila2017-05-04395-1955/+9430
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'dm-fix-cycle-analytics-stage-legends' into 'master' Robert Speicher2017-05-043-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix wording of Cycle Analytics stage legendsDouwe Maan2017-05-043-3/+3
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '2274-store-last-repository-updated-at-ce' into 'master' Robert Speicher2017-05-0410-16/+95
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Fix Import/Export configuration spec2274-store-last-repository-updated-at-ceDouglas Barbosa Alexandre2017-05-041-0/+1
| * | | | | | | | | Update last_repository_updated_at when the wiki is updatedDouglas Barbosa Alexandre2017-05-042-7/+16
| * | | | | | | | | Update last_repository_updated_at when a push event is createdDouglas Barbosa Alexandre2017-05-042-8/+40
| * | | | | | | | | Set last_repository_updated_at to created_at upon project creationDouglas Barbosa Alexandre2017-05-042-0/+13
| * | | | | | | | | Add index to last_repository_updated_at on projectsDouglas Barbosa Alexandre2017-05-042-1/+17