summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* improvements from feedback14256-upload-destroy-removes-fileMicaël Bergeron2018-02-061-1/+1
* remove file after `Upload#destroy`Micaël Bergeron2018-02-062-0/+14
* Merge branch 'fix/show-sidebar-sub-level-items-for-billing' into 'master'Sean McGivern2018-02-062-1/+5
|\
| * Override group sidebar linksGeorge Tsiolis2018-02-062-1/+5
* | Merge branch '39550-group-labels-redesign' into 'master'Tim Zallmann2018-02-067-34/+91
|\ \
| * | Use sprite_icon and variables39550-group-labels-redesignAnnabel Dunstone Gray2018-02-053-3/+4
| * | Fix padding & font size on labelsAnnabel Dunstone Gray2018-01-302-3/+4
| * | Fix labels specsAnnabel Dunstone Gray2018-01-302-3/+3
| * | Add modal for label deletionAnnabel Dunstone Gray2018-01-293-3/+30
| * | Change delete notice; update mobile stylesAnnabel Dunstone Gray2018-01-293-17/+31
| * | Start redesign of group labels pageAnnabel Dunstone Gray2018-01-293-27/+41
* | | Merge branch '26468-fix-admin-recent-sign-in' into 'master'Rémy Coutable2018-02-061-2/+2
|\ \ \
| * | | Using correct column for sorting users by Recent Sign-inPoornima2018-02-051-2/+2
* | | | 31885 - Ability to transfer a single group to another groupMayra Cabrera2018-02-069-17/+206
* | | | Merge branch '41672-emphasize-gke-cluster-to-new-users' into 'master'Clement Ho2018-02-0511-3/+269
|\ \ \ \
| * | | | Restore feature_highlight code41672-emphasize-gke-cluster-to-new-usersEric Eastwood2018-02-0511-3/+269
* | | | | Merge branch 'style/include-branch-in-mobile-view' into 'master'Clement Ho2018-02-052-3/+3
|\ \ \ \ \
| * | | | | Include branch in mobile view for pipelinesGeorge Tsiolis2018-02-042-3/+3
* | | | | | Merge branch '42584-fix-margins-in-tag-list' into 'master'Filipa Lacerda2018-02-051-1/+1
|\ \ \ \ \ \
| * | | | | | Fixes Different margins between buttons in tag listJacopo2018-02-051-1/+1
* | | | | | | Merge branch '32282-add-foreign-keys-to-todos' into 'master'Yorick Peterse2018-02-053-2/+3
|\ \ \ \ \ \ \
| * | | | | | | Set todos#author_id to NOT NULL.32282-add-foreign-keys-to-todosAndreas Brandl2018-02-051-0/+1
| * | | | | | | Add foreign keys to todos table.Andreas Brandl2018-02-052-2/+2
* | | | | | | | Merge branch 'ph-axios-4' into 'master'Filipa Lacerda2018-02-059-166/+140
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | fixed typo :see_no_evil:ph-axios-4Phil Hughes2018-02-051-1/+1
| * | | | | | | fixed unhandled promise rejectionPhil Hughes2018-02-051-2/+2
| * | | | | | | Converted users_select to use axiosPhil Hughes2018-02-051-53/+45
| * | | | | | | converted user_tabs.js to use axiosPhil Hughes2018-02-051-15/+18
| * | | | | | | fixed failing karma specs caused by TaskListPhil Hughes2018-02-051-4/+4
| * | | | | | | Converted task_list.js to use axiosPhil Hughes2018-02-051-7/+5
| * | | | | | | Converted shortcuts.js to use axiosPhil Hughes2018-02-051-13/+14
| * | | | | | | Converted right_sidebar.js to use axiosPhil Hughes2018-02-051-20/+11
| * | | | | | | Converted protected_tag_edit.js to use axiosPhil Hughes2018-02-051-18/+13
| * | | | | | | Converted protected_branch_edit.js to use axiosPhil Hughes2018-02-051-22/+18
| * | | | | | | Converted prometheus_metrics.js to use axiosPhil Hughes2018-02-051-10/+7
| * | | | | | | Converted project_label_subscription.js to use axiosPhil Hughes2018-02-051-5/+6
* | | | | | | | Allow moving wiki pages from the UIFrancisco Javier López2018-02-057-19/+94
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge branch '42684-set-up-ci-set-up-ci-cd' into 'master'Filipa Lacerda2018-02-051-2/+2
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Change "CI configuration" in "CI/CD configuration"42684-set-up-ci-set-up-ci-cdbikebilly2018-02-021-1/+1
| * | | | | | Change "Set up CI" to "Set up CI/CD"bikebilly2018-02-011-1/+1
* | | | | | | Merge branch '42547-upload-store-mount-point' into 'master'Sean McGivern2018-02-056-18/+50
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | apply fixes from feedback42547-upload-store-mount-pointMicaël Bergeron2018-02-022-9/+10
| * | | | | | add the uploader context to the upload modelMicaël Bergeron2018-02-026-19/+50
* | | | | | | Merge branch 'axios-preview-markdown' into 'master'Fatih Acet2018-02-051-15/+15
|\ \ \ \ \ \ \
| * | | | | | | Replace $.ajax in preview markdown with axiosClement Ho2018-02-051-15/+15
* | | | | | | | Replace $.ajax in admin broadcast messages with axiosClement Ho2018-02-053-8/+15
|/ / / / / / /
* | | | | | | Merge branch 'axios-username-validator' into 'master'Fatih Acet2018-02-051-6/+6
|\ \ \ \ \ \ \
| * | | | | | | Replace $.ajax in username validator with axiosaxios-username-validatorClement Ho2018-02-021-6/+6
* | | | | | | | Merge branch 'persistent-callouts' into 'master'Kamil Trzciński2018-02-054-0/+51
|\ \ \ \ \ \ \ \
| * | | | | | | | Refactor UserCalloutsController enum checkMatija Čupić2018-02-051-7/+3