Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Using correct column for sorting users by Recent Sign-in | Poornima | 2018-02-05 | 3 | -10/+20 | |
| | | | | | | | | | | | | | | | | Removing last_sign_in_at in specs | |||||
* | | | | Merge branch 'qa/mk-fix-slow-wait' into 'master' | Stan Hu | 2018-02-06 | 1 | -2/+1 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix QA project clone wait condition Closes gitlab-qa#175 See merge request gitlab-org/gitlab-ce!16932 | |||||
| * | | | | Fix wait conditionqa/mk-fix-slow-wait | Michael Kozono | 2018-02-05 | 1 | -2/+1 | |
| | | | | | | | | | | | | | | | | | | | | The `has_css?` line was always timing out false because `$(‘…’).val(url)` does not change the input’s value attribute. | |||||
* | | | | | Merge branch '31885-ability-to-transfer-groups-to-another-group' into 'master' | Douwe Maan | 2018-02-06 | 18 | -50/+781 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31885 - Ability to transfer a single group to another group Closes #31885 See merge request gitlab-org/gitlab-ce!16302 | |||||
| * | | | | | 31885 - Ability to transfer a single group to another group | Mayra Cabrera | 2018-02-06 | 18 | -50/+781 | |
|/ / / / / | ||||||
* | | | | | Merge branch 'fj-22607-lowercase-usernames-from-ldap' into 'master' | Douwe Maan | 2018-02-05 | 9 | -1/+106 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added ldap config setting to lower case usernames Closes #22607 See merge request gitlab-org/gitlab-ce!16791 | |||||
| * | | | | | Added ldap config setting to lower case usernames | Francisco Javier López | 2018-02-05 | 9 | -1/+106 | |
|/ / / / / | ||||||
* | | | | | Merge branch '41672-emphasize-gke-cluster-to-new-users' into 'master' | Clement Ho | 2018-02-05 | 20 | -7/+687 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add feature highlight blue dot to GKE "Clusters" sidebar item Closes #41672 See merge request gitlab-org/gitlab-ce!16379 | |||||
| * | | | | | Restore feature_highlight code41672-emphasize-gke-cluster-to-new-users | Eric Eastwood | 2018-02-05 | 20 | -7/+687 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From https://gitlab.com/gitlab-org/gitlab-ce/issues/36760 Was reverted in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14373 | |||||
* | | | | | | Merge branch 'style/include-branch-in-mobile-view' into 'master' | Clement Ho | 2018-02-05 | 3 | -3/+8 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include branch in mobile view for pipelines Closes #42650 See merge request gitlab-org/gitlab-ce!16910 | |||||
| * | | | | | | Include branch in mobile view for pipelines | George Tsiolis | 2018-02-04 | 3 | -3/+8 | |
| | | | | | | | ||||||
* | | | | | | | Merge branch 'better-issues-closed-at-cleanup' into 'master' | Stan Hu | 2018-02-05 | 1 | -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-cleanup | Yorick Peterse | 2018-02-05 | 1 | -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 Lacerda | 2018-02-05 | 2 | -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 list | Jacopo | 2018-02-05 | 2 | -1/+6 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge branch '32282-add-foreign-keys-to-todos' into 'master' | Yorick Peterse | 2018-02-05 | 11 | -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-todos | Andreas Brandl | 2018-02-05 | 5 | -3/+31 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Add foreign keys to todos table. | Andreas Brandl | 2018-02-05 | 8 | -4/+115 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #32282. | |||||
* | | | | | | | | | Merge branch 'ph-axios-4' into 'master' | Filipa Lacerda | 2018-02-05 | 15 | -273/+313 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | More conversions of $.ajax to axios See merge request gitlab-org/gitlab-ce!16882 | |||||
| * | | | | | | | | fixed typo :see_no_evil:ph-axios-4 | Phil Hughes | 2018-02-05 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | fixed unhandled promise rejection | Phil Hughes | 2018-02-05 | 2 | -4/+3 | |
| | | | | | | | | | ||||||
| * | | | | | | | | fixed task list spec | Phil Hughes | 2018-02-05 | 2 | -15/+37 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Converted users_select to use axios | Phil Hughes | 2018-02-05 | 1 | -53/+45 | |
| | | | | | | | | | ||||||
| * | | | | | | | | converted user_tabs.js to use axios | Phil Hughes | 2018-02-05 | 1 | -15/+18 | |
| | | | | | | | | | ||||||
| * | | | | | | | | fixed notes_spec.js | Phil Hughes | 2018-02-05 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | fixed failing karma specs caused by TaskList | Phil Hughes | 2018-02-05 | 6 | -80/+113 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Converted task_list.js to use axios | Phil Hughes | 2018-02-05 | 1 | -7/+5 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Converted shortcuts.js to use axios | Phil Hughes | 2018-02-05 | 1 | -13/+14 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Converted right_sidebar.js to use axios | Phil Hughes | 2018-02-05 | 2 | -29/+24 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Converted protected_tag_edit.js to use axios | Phil Hughes | 2018-02-05 | 1 | -18/+13 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Converted protected_branch_edit.js to use axios | Phil Hughes | 2018-02-05 | 1 | -22/+18 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Converted prometheus_metrics.js to use axios | Phil Hughes | 2018-02-05 | 2 | -28/+33 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Converted project_label_subscription.js to use axios | Phil Hughes | 2018-02-05 | 1 | -5/+6 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge branch 'fj-37273-moving-wiki-pages-from-the-ui' into 'master' | Sean McGivern | 2018-02-05 | 19 | -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 UI | Francisco Javier López | 2018-02-05 | 19 | -41/+567 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge branch '42684-set-up-ci-set-up-ci-cd' into 'master' | Filipa Lacerda | 2018-02-05 | 6 | -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-cd | bikebilly | 2018-02-02 | 2 | -2/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | Add changelog | bikebilly | 2018-02-02 | 1 | -0/+5 | |
| | | | | | | | | ||||||
| * | | | | | | | Change "Set up CI" to "Set up CI/CD" | bikebilly | 2018-02-01 | 5 | -8/+8 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge branch 'fix/gitaly-wiki-encoding-issues' into 'master' | Robert Speicher | 2018-02-05 | 2 | -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-issues | Ahmad Sherif | 2018-02-05 | 3 | -2/+18 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge branch '42547-upload-store-mount-point' into 'master' | Sean McGivern | 2018-02-05 | 15 | -30/+120 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store uploader context in uploads Closes #42547 See merge request gitlab-org/gitlab-ce!16779 | |||||
| * | | | | | | | | apply fixes from feedback42547-upload-store-mount-point | Micaël Bergeron | 2018-02-02 | 3 | -9/+37 | |
| | | | | | | | | | ||||||
| * | | | | | | | | fix the schema.rb | Micaël Bergeron | 2018-02-02 | 1 | -0/+2 | |
| | | | | | | | | | ||||||
| * | | | | | | | | fix specs | Micaël Bergeron | 2018-02-02 | 2 | -1/+6 | |
| | | | | | | | | | ||||||
| * | | | | | | | | add the uploader context to the upload model | Micaël Bergeron | 2018-02-02 | 12 | -30/+85 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge branch 'axios-preview-markdown' into 'master' | Fatih Acet | 2018-02-05 | 1 | -15/+15 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace $.ajax in preview markdown with axios See merge request gitlab-org/gitlab-ce!16893 | |||||
| * | | | | | | | | | Replace $.ajax in preview markdown with axios | Clement Ho | 2018-02-05 | 1 | -15/+15 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'axios-admin-message' into 'master' | Fatih Acet | 2018-02-05 | 3 | -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 axios | Clement Ho | 2018-02-05 | 3 | -8/+15 | |
|/ / / / / / / / / |