summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into preserve-note_type-and-po...preserve-note_type-and-positionLin Jen-Shin2016-10-2027-99/+275
|\
| * 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
* | | | | | 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 '23346-pipeline-buttons-cutoff' into 'master' Fatih Acet2016-10-201-0/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Smaller min-width for MR pipeline table23346-pipeline-buttons-cutoffAnnabel Dunstone Gray2016-10-171-0/+4
* | | | | Merge branch 'ios-tooltips' into 'master' Annabel Dunstone Gray2016-10-194-2/+13
|\ \ \ \ \
| * | | | | Set webkit-overflow-scrolling to auto for children of body.ios-tooltipsBryce Johnson2016-10-194-2/+13
* | | | | | Merge branch '23375-filtering-on-any-label-or-no-label-does-not-work' into 'm...Fatih Acet2016-10-191-1/+1
|\ \ \ \ \ \
| * | | | | | Return the title for id of 'No label'23375-filtering-on-any-label-or-no-label-does-not-workLuke Bennett2016-10-191-1/+1
* | | | | | | Merge branch 'feature/group-level-labels' into 'master' Douwe Maan2016-10-19116-450/+1991
|\ \ \ \ \ \ \
| * | | | | | | Use LabelsFinder on Fogbuz importerDouglas Barbosa Alexandre2016-10-191-1/+2
| * | | | | | | Use LabelsFinder on Google Code importerDouglas Barbosa Alexandre2016-10-191-1/+2
| * | | | | | | Avoid touch label links that does not belongs to project when moving itfeature/group-level-labelsDouglas Barbosa Alexandre2016-10-192-27/+59
| * | | | | | | Remove order by label type on LabelsFinderDouglas Barbosa Alexandre2016-10-192-2/+2
| * | | | | | | Rename Labels::CreateService to Labels::FindOrCreateServiceDouglas Barbosa Alexandre2016-10-1910-10/+10
| * | | | | | | Add self.project_foreign_key on both Issue and MergeRequestDouglas Barbosa Alexandre2016-10-193-7/+9
| * | | | | | | Only show label type for projects that belong to a groupDouglas Barbosa Alexandre2016-10-191-2/+3
| * | | | | | | Disable subscribing to group-level labelsDouglas Barbosa Alexandre2016-10-195-20/+27
| * | | | | | | Remove unused method Project#all_labelsDouglas Barbosa Alexandre2016-10-191-4/+0
| * | | | | | | Update specs to cope with new label types and prioritiesJames Lopez2016-10-1911-21/+82
| * | | | | | | Fix max number of permitted priorities per project labelDouglas Barbosa Alexandre2016-10-191-2/+2
| * | | | | | | Fix GitHub importer specDouglas Barbosa Alexandre2016-10-192-2/+5
| * | | | | | | Update CHANGELOGDouglas Barbosa Alexandre2016-10-191-0/+1
| * | | | | | | Add support to group labels to SlashCommands::InterpretServiceDouglas Barbosa Alexandre2016-10-192-3/+5
| * | | | | | | Use join instead of subquery on Label.unprioritized scopeDouglas Barbosa Alexandre2016-10-191-1/+8
| * | | | | | | Warn user deleting a group label affect all projects within the groupDouglas Barbosa Alexandre2016-10-192-1/+8
| * | | | | | | Use `includes(:priorities)` on Projects::LabelsControllerDouglas Barbosa Alexandre2016-10-191-1/+1
| * | | | | | | Split migration to create label prioritiesDouglas Barbosa Alexandre2016-10-194-32/+55
| * | | | | | | User Labes::CreateService to create labelsDouglas Barbosa Alexandre2016-10-198-20/+17
| * | | | | | | Add service to create project labelsDouglas Barbosa Alexandre2016-10-192-0/+84
View Lorry Controller Status