summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'project-settings--features-weight' into 'master' Annabel Dunstone Gray2016-10-212-60/+72
|\
| * fix font weight of project feature settingsproject-settings--features-weighttauriedavis2016-10-202-60/+72
* | Merge branch 'separate-sidekiq-queues' into 'master' Douwe Maan2016-10-2149-65/+97
|\ \
| * | Re-organize queues to use for Sidekiqseparate-sidekiq-queuesYorick Peterse2016-10-2149-65/+97
* | | Merge branch 'fix-bulk-assign-issues-for-external-issues' into 'master' Sean McGivern2016-10-211-1/+1
|\ \ \
| * | | Ignore external issues when bulk assigning issues to author of merge request.fix-bulk-assign-issues-for-external-issuesAdam Niedzielski2016-10-201-1/+1
* | | | Merge branch 'adam-fix-group-web-url' into 'master' Sean McGivern2016-10-211-1/+1
|\ \ \ \
| * | | | Change "Group#web_url" to return "/groups/twitter" rather than "/twitter".Adam Niedzielski2016-10-211-1/+1
* | | | | Merge branch 'bugfix/add_hover_to_trash_icon' into 'master' Annabel Dunstone Gray2016-10-211-1/+1
|\ \ \ \ \
| * | | | | Add hover to trash icon in notesblackst0ne2016-10-211-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'compare-ellipsis-line' into 'master' Fatih Acet2016-10-211-1/+1
|\ \ \ \ \
| * | | | | Fixed compare ellipsis messing with layoutPhil Hughes2016-10-211-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'runners-paginate' into 'master' Rémy Coutable2016-10-213-3/+3
|\ \ \ \ \
| * | | | | Fix error 500 on Runners page.Libor Klepáč2016-08-083-3/+3
* | | | | | Merge branch 'fixed-mr-tabs-fixes' into 'master' Fatih Acet2016-10-214-48/+62
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fixed issue when images are loading it would push off the tabsfixed-mr-tabs-fixesPhil Hughes2016-10-201-2/+8
| * | | | | Fixed issues with sticky mr tabs & sidebarPhil Hughes2016-10-204-46/+54
* | | | | | Merge branch '14192-issues-closed-by-merge-requests-using-metrics-data' into ...Yorick Peterse2016-10-211-1/+7
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Use MergeRequestsClosingIssues cache data on Issue#closed_by_merge_requests m...14192-issues-closed-by-merge-requests-using-metrics-dataPaco Guzman2016-10-201-1/+7
* | | | | | Trim project_path whitespace on form submitLinus G Thiel2016-10-201-0/+5
| |_|_|/ / |/| | | |
* | | | | Merge branch 'fix/validate-board-limit' into 'master' Douwe Maan2016-10-201-0/+7
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | [ci skip] Add a comment explaining validate_board_limit callbackfix/validate-board-limitDouglas Barbosa Alexandre2016-10-201-0/+7
* | | | | Merge branch 'pass-namespace-gitlab-project-import' into 'master' Stan Hu2016-10-201-0/+1
|\ \ \ \ \
| * | | | | Fix GitLab project import when a user has access only to their default namesp...pass-namespace-gitlab-project-importAdam Niedzielski2016-10-201-0/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'protected-branches-bundle' into 'master' Jacob Schatz2016-10-207-0/+3
|\ \ \ \ \
| * | | | | Create protected branches bundleAlfredo Sumaran2016-10-207-0/+3
| | |/ / / | |/| | |
* | | | | Merge branch 'zj-use-iid-deployment-refs' into 'master' Kamil Trzciński2016-10-202-4/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Only create refs for new deploymentszj-use-iid-deployment-refsZ.J. van de Weg2016-10-201-1/+1
| * | | | Use deployment IID when saving refsZ.J. van de Weg2016-10-202-3/+3
* | | | | Merge branch 'update-duration-at-the-end-of-pipeline' into 'master' Rémy Coutable2016-10-201-3/+0
|\ \ \ \ \
| * | | | | Update duration at the end of pipelineupdate-duration-at-the-end-of-pipelineKamil Trzcinski2016-10-201-3/+0
* | | | | | Merge branch 'render-hipchat-notification-descriptions' into 'master' Rémy Coutable2016-10-201-22/+36
|\ \ \ \ \ \
| * | | | | | Return truncation for notification descriptions, fix minor bugs with renderingAirat Shigapov2016-10-201-6/+11
| * | | | | | Use guard clause instead of if-else statementAirat Shigapov2016-10-201-13/+12
| * | | | | | 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-201-6/+3
* | | | | | | Merge branch '23341-fix-viewing-mr-from-deleted-project' into 'master' Douwe Maan2016-10-204-34/+29
|\ \ \ \ \ \ \
| * | | | | | | Rename forked_source_project_missing? to source_project_missing?Nick Thomas2016-10-201-3/+3
| * | | | | | | 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-204-18/+22
| * | | | | | | Revert "Add #closed_without_source_project?"Nick Thomas2016-10-202-25/+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