summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dz-fix-oauth-service-requirements' into 'master'Douwe Maan2018-06-071-1/+1
|\
| * Make request argument required for Applications::CreateServiceDmitriy Zaporozhets2018-06-071-1/+1
* | Merge branch 'ccr/extract_EE_code_5942' into 'master'Sean McGivern2018-06-071-13/+17
|\ \
| * | Backport of 5942-extract-ee-specific-filesccr/extract_EE_code_5942Chantal Rollison2018-06-011-13/+17
* | | Merge branch '6216-extract-ee-specific-files-lines-for-app-views-admin-groups...Sean McGivern2018-06-074-3/+24
|\ \ \
| * | | Reduce CE/EE diff in app/views/admin/groups/Rémy Coutable2018-06-064-3/+24
* | | | Merge branch '47470-gke-cluster-creation-form-has-project-id-label-for-projec...47408-migrateuploadsworker-is-doing-n-1-queries-on-migration-2Tim Zallmann2018-06-071-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Change 'project ID' into 'project'bikebilly2018-06-071-1/+1
* | | | Merge branch 'dz-fix-cluster-oauth' into 'master'Dmitriy Zaporozhets2018-06-071-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Pass request to oauth creation during cluster app installDmitriy Zaporozhets2018-06-071-1/+1
* | | | Merge branch '39549-label-list-page-redesign-with-draggable-labels' into 'mas...Tim Zallmann2018-06-0712-266/+308
|\ \ \ \
| * \ \ \ Merge branch 'master' into '39549-label-list-page-redesign-with-draggable-lab...Luke Bennett2018-06-07117-281/+1858
| |\ \ \ \
| * | | | | Fix specLuke Bennett2018-06-061-8/+7
| * | | | | perf improvementLuke Bennett2018-06-062-2/+2
| * | | | | UX reviewLuke Bennett2018-06-061-1/+1
| * | | | | UX reviewLuke Bennett2018-06-063-10/+9
| * | | | | Fix scss_lintLuke Bennett2018-06-061-1/+1
| * | | | | Merge remote-tracking branch 'origin/master' into 39549-label-list-page-redes...Luke Bennett2018-06-0662-283/+440
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into 39549-label-list-page-redes...Luke Bennett2018-06-0511-44/+42
| |\ \ \ \ \ \
| * | | | | | | FE review changesLuke Bennett2018-06-054-3/+4
| * | | | | | | Fix eslint39549-label-list-page-redesign-with-draggable-labelsLuke Bennett2018-06-051-1/+1
| * | | | | | | Merge remote-tracking branch 'origin/master' into 39549-label-list-page-redes...Luke Bennett2018-06-05384-1793/+4172
| |\ \ \ \ \ \ \
| * | | | | | | | FE review changesLuke Bennett2018-06-059-39/+44
| * | | | | | | | Fix lintLuke Bennett2018-05-292-3/+3
| * | | | | | | | Fix user_removes_labels_specLuke Bennett2018-05-291-1/+2
| * | | | | | | | Fix update_prioritization_specLuke Bennett2018-05-291-8/+7
| * | | | | | | | Correct fixTitleLuke Bennett2018-05-291-1/+1
| * | | | | | | | Tidy tooltip_title and fix dropdown open leftLuke Bennett2018-05-292-10/+8
| * | | | | | | | Tidy tooltip_title and fix for signed out userLuke Bennett2018-05-292-1/+11
| * | | | | | | | Merge remote-tracking branch 'origin/master' into 39549-label-list-page-redes...Luke Bennett2018-05-281134-11323/+20222
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix tooltip_titleLuke Bennett2018-05-281-1/+1
| * | | | | | | | | Temp revert to label.priority? need to fix group pageLuke Bennett2018-05-281-1/+1
| * | | | | | | | | Fix featuresLuke Bennett2018-05-281-0/+1
| * | | | | | | | | Remove unneeded classLuke Bennett2018-05-281-1/+1
| * | | | | | | | | Fix tooltipsLuke Bennett2018-05-283-6/+24
| * | | | | | | | | newlineLuke Bennett2018-05-281-1/+1
| * | | | | | | | | missing i18nLuke Bennett2018-05-281-3/+3
| * | | | | | | | | last newline labels.scssLuke Bennett2018-05-251-1/+1
| * | | | | | | | | BE reviewLuke Bennett2018-05-252-5/+4
| * | | | | | | | | Fix accuracy of 'prioritized label' badge, when given different contextsLuke Bennett2018-05-244-4/+7
| * | | | | | | | | Remove group label badge on group labels pageLuke Bennett2018-05-171-2/+3
| * | | | | | | | | Fix group labels listLuke Bennett2018-05-173-24/+11
| * | | | | | | | | Make sub button text lightLuke Bennett2018-05-171-0/+1
| * | | | | | | | | Revert tableLuke Bennett2018-05-171-11/+1
| * | | | | | | | | revert scrollableLuke Bennett2018-05-171-2/+1
| * | | | | | | | | Scroll items on overflowLuke Bennett2018-05-171-0/+2
| * | | | | | | | | i18nLuke Bennett2018-05-172-10/+10
| * | | | | | | | | UX review changesLuke Bennett2018-05-174-7/+20
| * | | | | | | | | Add unsub tooltip (broken)Luke Bennett2018-05-141-1/+2
| * | | | | | | | | UX review changesLuke Bennett2018-05-084-9/+14