summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into 31156-environments-vue-service31156-environments-vue-serviceFilipa Lacerda2017-05-0324-101/+357
|\
| * Merge branch '26883-members-page-layout-looks-broken' into 'master' Annabel Dunstone Gray2017-05-033-4/+64
| |\
| | * Added flex wrapping26883-members-page-layout-looks-brokenJose Ivan Vargas2017-04-243-10/+55
| | * Added a media query when there's a more width available to show more of the t...Jose Ivan Vargas2017-04-241-0/+3
| | * Changed the way to truncate the panel to title from ruby to a scss mixinJose Ivan Vargas2017-04-242-2/+8
| | * Added a description for non project masters or owners for the members setting...Jose Ivan Vargas2017-04-241-0/+6
| * | Merge branch '28408-feature-proposal-include-search-options-to-pipelines-api'...Robert Speicher2017-05-032-25/+93
| |\ \
| | * | Add constant as ALLOWED_INDEXED_COLUMNSShinya Maeda2017-05-031-1/+3
| | * | Use HasStatus::AVAILABLE_STATUSES instead of hard codingShinya Maeda2017-05-031-16/+3
| | * | Add a blank line between blocksShinya Maeda2017-05-031-0/+2
| | * | Revert "Use JSON type for sorting parameter (halfway)"Shinya Maeda2017-05-031-15/+11
| | * | Use JSON type for sorting parameter (halfway)Shinya Maeda2017-05-031-11/+15
| | * | Use order instead of reorder. Improve tests.Shinya Maeda2017-05-031-1/+1
| | * | Fix improper method name and spec descriptionShinya Maeda2017-05-031-2/+2
| | * | Allow only indexed columns in #order_and_sort. Remove present (Because unnece...Shinya Maeda2017-05-031-2/+2
| | * | Avoid hardcode table nameShinya Maeda2017-05-031-2/+2
| | * | Add name. Improve order_and_sort.Shinya Maeda2017-05-031-7/+12
| | * | Add name(User)Shinya Maeda2017-05-031-0/+8
| | * | Change name to usernameShinya Maeda2017-05-031-1/+1
| | * | Fix inappropriate regexShinya Maeda2017-05-031-1/+1
| | * | Use 'case/when/end'Shinya Maeda2017-05-031-7/+5
| | * | Improved CI. Fix yaml_errors boolean evaluation.Shinya Maeda2017-05-031-1/+1
| | * | Fixed the following.Shinya Maeda2017-05-031-3/+4
| | * | Fixed SQL injectionShinya Maeda2017-05-031-2/+2
| | * | Fix rubocop offences and rspec failuresShinya Maeda2017-05-031-2/+2
| | * | Add specs. Plus, minor fixes.Shinya Maeda2017-05-031-2/+6
| | * | Fixed those points.Shinya Maeda2017-05-031-17/+10
| | * | Remove unnecessary commentShinya Maeda2017-05-031-1/+1
| | * | - Add new parameters for Pipeline APIShinya Maeda2017-05-032-25/+93
| * | | Merge branch '30667-creating-new-label-on-new-issue-causing-bug' into 'master' Rémy Coutable2017-05-031-1/+1
| |\ \ \
| | * | | Fix label creation from issuable for subgroup projectsMark Fletcher2017-05-031-1/+1
| * | | | Merge branch 'async-milestone-tabs' into 'master' Jacob Schatz2017-05-037-34/+159
| |\ \ \ \
| | * | | | Moved sort endpoints into data attributesasync-milestone-tabsPhil Hughes2017-04-282-13/+20
| | * | | | Fixed failing specsPhil Hughes2017-04-261-4/+4
| | * | | | Added controller specsPhil Hughes2017-04-261-0/+11
| | * | | | Fixed tabs loading the ajax request twicePhil Hughes2017-04-261-2/+2
| | * | | | Fixed feature spec not waiting for ajax request to finishPhil Hughes2017-04-261-1/+1
| | * | | | Change the hash when changing tabPhil Hughes2017-04-264-33/+51
| | * | | | Load milestone tabs asynchronouslyPhil Hughes2017-04-266-19/+108
| * | | | | Merge branch '29673-500-internal-server-error-when-enabling-a-deploy-key-more...Rémy Coutable2017-05-031-1/+4
| |\ \ \ \ \
| | * | | | | Detect already enabled DeployKeys in EnableDeployKeyServiceMark Fletcher2017-05-031-1/+4
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'commit-limited-container-width' into 'master'Robert Speicher2017-05-032-4/+11
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into commit-limited-container-widthPhil Hughes2017-05-0238-159/+250
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into commit-limited-container-widthPhil Hughes2017-05-02200-912/+2567
| | |\ \ \ \ \ \
| | * | | | | | | Fixed HAML lintPhil Hughes2017-04-241-1/+1
| | * | | | | | | Commit view correctly spans the full width when parallel viewPhil Hughes2017-04-242-4/+11
| * | | | | | | | Merge branch '31383-admin-remove-user-text-incorrect' into 'master' Rémy Coutable2017-05-033-10/+12
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Note Ghost user and refer to user deletion documentationMark Fletcher2017-05-033-10/+12
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'dm-blob-header-content' into 'master' Robert Speicher2017-05-033-20/+12
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Extract common parts of snippet and blob pages into partialdm-blob-header-contentDouwe Maan2017-05-023-20/+12