summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into jivl-update-katexJose Ivan Vargas2018-02-051012-11060/+16607
|\
| * Merge branch '42584-fix-margins-in-tag-list' into 'master'Filipa Lacerda2018-02-051-1/+1
| |\ | | | | | | | | | | | | | | | | | | Resolve "Different margins between buttons in tag list" Closes #42584 See merge request gitlab-org/gitlab-ce!16927
| | * 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
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Add missing foreign key and NOT NULL constraints to todos table. Closes #32282 See merge request gitlab-org/gitlab-ce!16849
| | * | 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
| | | | | | | | | | | | | | | | Fixes #32282.
| * | | Merge branch 'ph-axios-4' into 'master'Filipa Lacerda2018-02-059-166/+140
| |\ \ \ | | | | | | | | | | | | | | | | | | | | More conversions of $.ajax to axios See merge request gitlab-org/gitlab-ce!16882
| | * | | 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
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "`Set up CI` => `Set up CI/CD`" Closes #42684 See merge request gitlab-org/gitlab-ce!16870
| | * | | | 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
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Store uploader context in uploads Closes #42547 See merge request gitlab-org/gitlab-ce!16779
| | * | | | 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 axios See merge request gitlab-org/gitlab-ce!16893
| | * | | | | 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 axios See merge request gitlab-org/gitlab-ce!16892
| | * | | | | 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
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add backend for persistently dismissible callouts See merge request gitlab-org/gitlab-ce!16735
| | * | | | | | Refactor UserCalloutsController enum checkMatija Čupić2018-02-051-7/+3
| | | | | | | |
| | * | | | | | Refactor .show_gke_cluster_integration_callout?Matija Čupić2018-02-051-2/+2
| | | | | | | |
| | * | | | | | Bump UserCallout feature_name enum indexMatija Čupić2018-02-051-1/+1
| | | | | | | |
| | * | | | | | Merge branch 'master' into persistent-calloutspersistent-calloutsMatija Čupić2018-02-0315-187/+403
| | |\ \ \ \ \ \
| | * | | | | | | Change UserCallout feautre_name to enumMatija Čupić2018-02-033-7/+13
| | | | | | | | |
| | * | | | | | | Merge branch 'master' into persistent-calloutsMatija Čupić2018-02-02219-1997/+2426
| | |\ \ \ \ \ \ \
| | * | | | | | | | Rename Callout to UserCalloutMatija Čupić2018-02-024-4/+4
| | | | | | | | | |
| | * | | | | | | | Refactor CalloutsControllerMatija Čupić2018-02-021-3/+7
| | | | | | | | | |
| | * | | | | | | | Use policies instead of role checks in ClustersHelperMatija Čupić2018-02-021-2/+1
| | | | | | | | | |
| | * | | | | | | | Remove dismissed_state from Callout modelMatija Čupić2018-02-023-15/+10
| | | | | | | | | |
| | * | | | | | | | Add callout priority enumMatija Čupić2018-02-011-0/+5
| | | | | | | | | |
| | * | | | | | | | Extract feature name into constantMatija Čupić2018-01-301-2/+4
| | | | | | | | | |
| | * | | | | | | | Show GKE cluster callout for project owner as wellMatija Čupić2018-01-301-1/+3
| | | | | | | | | |
| | * | | | | | | | Add safe navigation for users without callout stateMatija Čupić2018-01-301-1/+1
| | | | | | | | | |
| | * | | | | | | | Add check for guest userMatija Čupić2018-01-301-1/+1
| | | | | | | | | |
| | * | | | | | | | Implement CalloutsHelperMatija Čupić2018-01-271-0/+11
| | | | | | | | | |
| | * | | | | | | | Merge branch 'master' into persistent-calloutsMatija Čupić2018-01-2712-81/+114
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Implement Callouts controllerMatija Čupić2018-01-261-0/+27
| | | | | | | | | | |
View Lorry Controller Status