summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix wait conditionqa/mk-fix-slow-waitMichael Kozono2018-02-051-2/+1
* Merge branch 'ph-axios-4' into 'master'Filipa Lacerda2018-02-0515-273/+313
|\
| * fixed typo :see_no_evil:ph-axios-4Phil Hughes2018-02-051-1/+1
| * fixed unhandled promise rejectionPhil Hughes2018-02-052-4/+3
| * fixed task list specPhil Hughes2018-02-052-15/+37
| * Converted users_select to use axiosPhil Hughes2018-02-051-53/+45
| * converted user_tabs.js to use axiosPhil Hughes2018-02-051-15/+18
| * fixed notes_spec.jsPhil Hughes2018-02-051-1/+1
| * fixed failing karma specs caused by TaskListPhil Hughes2018-02-056-80/+113
| * 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-052-29/+24
| * 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-052-28/+33
| * Converted project_label_subscription.js to use axiosPhil Hughes2018-02-051-5/+6
* | Merge branch 'fj-37273-moving-wiki-pages-from-the-ui' into 'master'Sean McGivern2018-02-0519-41/+567
|\ \
| * | Allow moving wiki pages from the UIFrancisco Javier López2018-02-0519-41/+567
|/ /
* | Merge branch '42684-set-up-ci-set-up-ci-cd' into 'master'Filipa Lacerda2018-02-056-10/+15
|\ \
| * | Change "CI configuration" in "CI/CD configuration"42684-set-up-ci-set-up-ci-cdbikebilly2018-02-022-2/+2
| * | Add changelogbikebilly2018-02-021-0/+5
| * | Change "Set up CI" to "Set up CI/CD"bikebilly2018-02-015-8/+8
* | | Merge branch 'fix/gitaly-wiki-encoding-issues' into 'master'Robert Speicher2018-02-052-1/+17
|\ \ \
| * | | Encode GitalyClient::WikiPage attributes to UTF-8fix/gitaly-wiki-encoding-issuesAhmad Sherif2018-02-053-2/+18
* | | | Merge branch '42547-upload-store-mount-point' into 'master'Sean McGivern2018-02-0515-30/+120
|\ \ \ \
| * | | | apply fixes from feedback42547-upload-store-mount-pointMicaël Bergeron2018-02-023-9/+37
| * | | | fix the schema.rbMicaël Bergeron2018-02-021-0/+2
| * | | | fix specsMicaël Bergeron2018-02-022-1/+6
| * | | | add the uploader context to the upload modelMicaël Bergeron2018-02-0212-30/+85
* | | | | 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
* | | | | | Merge branch 'axios-admin-message' into 'master'Fatih Acet2018-02-053-8/+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-0512-0/+203
|\ \ \ \ \ \
| * | | | | | Add CHANGELOGMatija Čupić2018-02-051-0/+5
| * | | | | | Refactor UserCalloutsController enum checkMatija Čupić2018-02-051-7/+3
| * | | | | | Refactor .show_gke_cluster_integration_callout?Matija Čupić2018-02-052-20/+12
| * | | | | | Bump UserCallout feature_name enum indexMatija Čupić2018-02-051-1/+1
| * | | | | | Merge branch 'master' into persistent-calloutspersistent-calloutsMatija Čupić2018-02-0322-350/+664
| |\ \ \ \ \ \
| * | | | | | | Change UserCallout feautre_name to enumMatija Čupić2018-02-038-22/+42
| * | | | | | | Merge branch 'master' into persistent-calloutsMatija Čupić2018-02-02619-5021/+8644
| |\ \ \ \ \ \ \
| * | | | | | | | Rename Callout to UserCalloutMatija Čupić2018-02-0211-27/+25
| * | | | | | | | Remove timestamps from CalloutsMatija Čupić2018-02-021-2/+0
| * | | | | | | | Refactor CalloutsControllerMatija Čupić2018-02-023-8/+10
| * | | | | | | | Use policies instead of role checks in ClustersHelperMatija Čupić2018-02-022-18/+9
| * | | | | | | | Remove dismissed_state from Callout modelMatija Čupić2018-02-028-25/+20
| * | | | | | | | Add callout priority enumMatija Čupić2018-02-011-0/+5
| * | | | | | | | Fix CalloutsHelper spec subjectMatija Čupić2018-01-301-1/+1
View Lorry Controller Status