summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* disable markdown in comments when referencing disabled featuresissue_23548Felipe Artur2016-10-2017-4/+117
* Merge branch 'preserve-note_type-and-position' into 'master' Sean McGivern2016-10-205-16/+17
|\
| * Merge remote-tracking branch 'upstream/master' into preserve-note_type-and-po...preserve-note_type-and-positionLin Jen-Shin2016-10-2027-99/+275
| |\
| * | We want to release this in 8.13.0Lin Jen-Shin2016-10-201-2/+1
| * | Add CHANGELOG entry [ci skip]Lin Jen-Shin2016-10-201-0/+2
| * | Preserve note_type and position for notes from emailsLin Jen-Shin2016-10-204-16/+16
* | | Merge branch 'update-duration-at-the-end-of-pipeline' into 'master' Rémy Coutable2016-10-202-3/+1
|\ \ \
| * | | Update duration at the end of pipelineupdate-duration-at-the-end-of-pipelineKamil Trzcinski2016-10-202-3/+1
* | | | Merge branch 'render-hipchat-notification-descriptions' into 'master' Rémy Coutable2016-10-203-30/+45
|\ \ \ \
| * | | | Add CHANGELOG.md entryAirat Shigapov2016-10-201-0/+1
| * | | | Return truncation for notification descriptions, fix minor bugs with renderingAirat Shigapov2016-10-202-12/+17
| * | | | Use guard clause instead of if-else statementAirat Shigapov2016-10-201-13/+12
| * | | | Tests for markdown HipChat notificationsDavid Eisner2016-10-201-6/+6
| * | | | Clean up Banzai HTML for HipChatDavid Eisner2016-10-201-0/+3
| * | | | Ensure absolute URLs for single lines from Banzai for HipChatDavid Eisner2016-10-201-3/+7
| * | | | Absolute URLs for Banzai HTML for HipChatDavid Eisner2016-10-201-11/+21
| * | | | Also render commit titles in HipChat notificationsDavid Eisner2016-10-201-4/+8
| * | | | Full Banzai rendering for HipChat notificationsDavid Eisner2016-10-201-11/+3
| * | | | Render hipchat notification descriptions as HTML instead of raw markdownAirat Shigapov2016-10-202-16/+13
| | |_|/ | |/| |
* | | | Merge branch '23341-fix-viewing-mr-from-deleted-project' into 'master' Douwe Maan2016-10-207-70/+48
|\ \ \ \
| * | | | Update changelogNick Thomas2016-10-201-0/+1
| * | | | Rename forked_source_project_missing? to source_project_missing?Nick Thomas2016-10-202-7/+7
| * | | | Fix two CI endpoints for MRs where the source project is deletedNick Thomas2016-10-201-1/+1
| * | | | Fix the merge request view when source projects or branches are removedNick Thomas2016-10-205-18/+36
| * | | | Revert "Add #closed_without_source_project?"Nick Thomas2016-10-203-57/+16
* | | | | Merge branch '22089-show-full-job-name-on-hover-on-pipeline-graph' into 'mast...Annabel Dunstone Gray2016-10-204-13/+20
|\ \ \ \ \
| * | | | | Added dyanmic position adjustment22089-show-full-job-name-on-hover-on-pipeline-graphLuke Bennett2016-10-197-27/+23
| * | | | | Added tooltip with jobs full name to build items in graphLuke Bennett2016-10-183-3/+14
* | | | | | Merge branch 'unrevert-tab-order-MR' into 'master' Annabel Dunstone Gray2016-10-202-2/+19
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Change input order on Sign In form for better tabbing.unrevert-tab-order-MRClement Ho2016-10-202-2/+19
* | | | | | Merge branch 'project-cache-worker-lease' into 'master' Rémy Coutable2016-10-203-11/+57
|\ \ \ \ \ \
| * | | | | | Restrict ProjectCacheWorker jobs to one per 15 minproject-cache-worker-leaseYorick Peterse2016-10-203-11/+57
* | | | | | | Merge branch 'remove-unused-code-project-members-controller' into 'master' Dmitriy Zaporozhets2016-10-201-15/+0
|\ \ \ \ \ \ \
| * | | | | | | Removed code from project members controllerPhil Hughes2016-10-201-15/+0
| |/ / / / / /
* | | | | | | Merge branch 'fix-label-api-spec' into 'master' Douwe Maan2016-10-201-2/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Make label API spec independent of orderDouwe Maan2016-10-201-2/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'issue_22944' into 'master' Sean McGivern2016-10-205-10/+42
|\ \ \ \ \ \
| * | | | | | Create project feature when project is createdissue_22944Felipe Artur2016-10-195-10/+42
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'refactoring_find_commits_method' into 'master' Sean McGivern2016-10-203-9/+8
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Refactoring find_commits functionalityValery Sizov2016-10-203-9/+8
* | | | | | Merge branch '23555-project-api-doc' into 'master' Rémy Coutable2016-10-202-4/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Remove pagination description from individual docTakuya Noguchi2016-10-201-2/+0
| * | | | | Fix a broken table in Project API docTakuya Noguchi2016-10-202-4/+5
| | |/ / / | |/| | |
* | | | | Merge branch '6967-toggle_award_url'Douwe Maan2016-10-202-2/+3
|\ \ \ \ \
| * | | | | Simpler arguments passed to named_route on toggle_award_url helper method6967-toggle_award_urlPaco Guzman2016-10-192-2/+3
* | | | | | Merge branch 'add_user_expire_leave_event' into 'master' Sean McGivern2016-10-2013-45/+161
|\ \ \ \ \ \
| * | | | | | Differentiate the expire from leave eventCallum Dryden2016-10-2013-45/+161
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'boards-blank-state-size-fix' into 'master' Fatih Acet2016-10-201-2/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fixed height of issue board blank stateboards-blank-state-size-fixPhil Hughes2016-10-181-2/+1
* | | | | | Merge branch '23346-pipeline-buttons-cutoff' into 'master' Fatih Acet2016-10-201-0/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |