summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Removed code from project members controllerPhil Hughes2016-10-201-15/+0
* Merge branch '6967-toggle_award_url'Douwe Maan2016-10-201-2/+2
|\
| * Simpler arguments passed to named_route on toggle_award_url helper method6967-toggle_award_urlPaco Guzman2016-10-191-2/+2
* | Merge branch 'add_user_expire_leave_event' into 'master' Sean McGivern2016-10-204-3/+22
|\ \
| * | Differentiate the expire from leave eventCallum Dryden2016-10-204-3/+22
* | | 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
|\ \ \ \ | |_|/ / |/| | |
| * | | 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-193-2/+12
|\ \ \ \
| * | | | Set webkit-overflow-scrolling to auto for children of body.ios-tooltipsBryce Johnson2016-10-193-2/+12
* | | | | 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-1956-206/+794
|\ \ \ \ \ \
| * | | | | | Avoid touch label links that does not belongs to project when moving itfeature/group-level-labelsDouglas Barbosa Alexandre2016-10-191-15/+42
| * | | | | | Remove order by label type on LabelsFinderDouglas Barbosa Alexandre2016-10-192-2/+2
| * | | | | | Rename Labels::CreateService to Labels::FindOrCreateServiceDouglas Barbosa Alexandre2016-10-195-5/+5
| * | | | | | 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-194-15/+26
| * | | | | | Remove unused method Project#all_labelsDouglas Barbosa Alexandre2016-10-191-4/+0
| * | | | | | Update specs to cope with new label types and prioritiesJames Lopez2016-10-191-0/+4
| * | | | | | Fix max number of permitted priorities per project labelDouglas Barbosa Alexandre2016-10-191-2/+2
| * | | | | | 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
| * | | | | | User Labes::CreateService to create labelsDouglas Barbosa Alexandre2016-10-194-11/+7
| * | | | | | Add service to create project labelsDouglas Barbosa Alexandre2016-10-191-0/+33
| * | | | | | Recreates the label priorities when moving project to another groupDouglas Barbosa Alexandre2016-10-191-1/+2
| * | | | | | Fix sorting merge requests by priorityDouglas Barbosa Alexandre2016-10-191-1/+7
| * | | | | | Use keyword arguments on Sortable#highest_label_priorityDouglas Barbosa Alexandre2016-10-193-8/+19
| * | | | | | Add subject to group and projects labels which return group/projectDouglas Barbosa Alexandre2016-10-193-8/+6
| * | | | | | Reuse LabelsFinder on Banzai::Filter::LabelReferenceFilterDouglas Barbosa Alexandre2016-10-191-4/+14
| * | | | | | Return only labels that user have access on IssuableFinder#labelsDouglas Barbosa Alexandre2016-10-192-10/+7
| * | | | | | Abstract LabelPriority away into methods on Label modelDouglas Barbosa Alexandre2016-10-192-9/+21
| * | | | | | Add label type to group and project labels listsDouglas Barbosa Alexandre2016-10-193-2/+18
| * | | | | | Fix issue board related controllers to expose label priority per projectDouglas Barbosa Alexandre2016-10-195-5/+33
| * | | | | | Fix sorting by label prioritiesDouglas Barbosa Alexandre2016-10-194-4/+18
| * | | | | | Add restriction to number of permitted priorities per project labelDouglas Barbosa Alexandre2016-10-191-0/+9
| * | | | | | Add support to group labels prioritization on project levelDouglas Barbosa Alexandre2016-10-192-10/+13
| * | | | | | Add LabelPriority modelDouglas Barbosa Alexandre2016-10-192-6/+9
| * | | | | | Remove `::` for method call on Label#text_colorDouglas Barbosa Alexandre2016-10-191-1/+1
| * | | | | | Remove Issuable#add_labels_by_namesDouglas Barbosa Alexandre2016-10-191-12/+0
| * | | | | | Remove unused method Issuable#remove_labelsDouglas Barbosa Alexandre2016-10-191-4/+0
| * | | | | | Fix IssuableBaseService#find_or_create_label_idsDouglas Barbosa Alexandre2016-10-191-1/+1
| * | | | | | Fix validation to allow updates to description/color of project labelDouglas Barbosa Alexandre2016-10-191-1/+1
| * | | | | | Skip update query if label have the same id on Labels::TransferServiceDouglas Barbosa Alexandre2016-10-191-0/+2
| * | | | | | Use reverse_merge on Label#issues_count and Label#merge_requests_countDouglas Barbosa Alexandre2016-10-191-2/+2
| * | | | | | Remove unnecessary `title.present?` on LabelsFinderDouglas Barbosa Alexandre2016-10-191-1/+1