summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add sorting options for /users API (admin only)42669-allow-order_by-users-in-gitlab-apiDmitriy Zaporozhets2018-02-064-1/+46
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch '39550-group-labels-redesign' into 'master'Tim Zallmann2018-02-069-37/+95
|\ | | | | | | | | | | | | Resolve "Group label list page redesign" Closes #39550 See merge request gitlab-org/gitlab-ce!16592
| * 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-304-6/+7
| |
| * 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-063-10/+20
|\ \ | | | | | | | | | | | | | | | | | | Using correct column for sorting users by Recent Sign-in Closes #26468 See merge request gitlab-org/gitlab-ce!13852
| * | Using correct column for sorting users by Recent Sign-inPoornima2018-02-053-10/+20
| | | | | | | | | | | | Removing last_sign_in_at in specs
* | | Merge branch 'qa/mk-fix-slow-wait' into 'master'Stan Hu2018-02-061-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-waitMichael Kozono2018-02-051-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 Maan2018-02-0618-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 groupMayra Cabrera2018-02-0618-50/+781
|/ / / /
* | | | Merge branch 'fj-22607-lowercase-usernames-from-ldap' into 'master'Douwe Maan2018-02-059-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 usernamesFrancisco Javier López2018-02-059-1/+106
|/ / / /
* | | | Merge branch '41672-emphasize-gke-cluster-to-new-users' into 'master'Clement Ho2018-02-0520-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-usersEric Eastwood2018-02-0520-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 Ho2018-02-053-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 pipelinesGeorge Tsiolis2018-02-043-3/+8
| | | | | |
* | | | | | 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
| | | | | | | | |