summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Explicitly set cwd in Sidekiq memory killer instead of depending on getcwddm-sidekiq-memory-killer-getcwdDouwe Maan2018-02-061-1/+1
|
* Merge branch 'better-issues-closed-at-cleanup' into 'master'Stan Hu2018-02-051-3/+16
|\ | | | | | | | | | | | | Handle EE edge cases in issues.closed_at migration Closes gitlab-ee#4803 See merge request gitlab-org/gitlab-ce!16926
| * Handle EE edge cases in issues.closed_at migrationbetter-issues-closed-at-cleanupYorick Peterse2018-02-051-3/+16
| | | | | | | | | | | | | | | | | | EE seems to have had an outdated schema at some point, leading to some environments not having the right columns in place. This adjusts the migration for `issues.closed_at` so it takes care of those cases, ensuring data can be migrated properly. Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/4803
* | Merge branch '42584-fix-margins-in-tag-list' into 'master'Filipa Lacerda2018-02-052-1/+6
|\ \ | | | | | | | | | | | | | | | | | | 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-052-1/+6
| | |
* | | Merge branch '32282-add-foreign-keys-to-todos' into 'master'Yorick Peterse2018-02-0511-6/+145
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-055-3/+31
| | | |
| * | | Add foreign keys to todos table.Andreas Brandl2018-02-058-4/+115
| | | | | | | | | | | | | | | | Fixes #32282.
* | | | Merge branch 'ph-axios-4' into 'master'Filipa Lacerda2018-02-0515-273/+313
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 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-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 UI Closes #37273 See merge request gitlab-org/gitlab-ce!16313
| * | | | | 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
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-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-8 See merge request gitlab-org/gitlab-ce!16925
| * | | | | | 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
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-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 axios See merge request gitlab-org/gitlab-ce!16893
| * | | | | | | 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 axios See merge request gitlab-org/gitlab-ce!16840
| * | | | | | | 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-0512-0/+203
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Add backend for persistently dismissible callouts See merge request gitlab-org/gitlab-ce!16735
| * | | | | | | 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
| |\ \ \ \ \ \ \ \
View Lorry Controller Status