| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix timezone on issue boards due dateissue_27317 | Felipe Artur | 2017-02-14 | 2 | -1/+5 |
| | | |||||
| * | Merge branch 'create-connection-pool' into 'master' | Yorick Peterse | 2017-02-14 | 2 | -0/+73 |
| |\ | | | | | | | | | Introduce Gitlab::Database.with_connection_pool See merge request !9192 | ||||
| | * | Only ensure against yield so that pool should be availablecreate-connection-pool | Lin Jen-Shin | 2017-02-14 | 1 | -4/+5 |
| | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9192#note_23293693 | ||||
| | * | Have some simple way to create connection pool | Lin Jen-Shin | 2017-02-14 | 2 | -0/+72 |
| | | | |||||
| * | | Merge branch '14492-change-fork-endpoint' into 'master' | Sean McGivern | 2017-02-14 | 6 | -136/+133 |
| |\ \ | | | | | | | | | | | | | | | | | | | Move /projects/fork/:id to /projects/:id/fork in V4 API Closes #14492 See merge request !8940 | ||||
| | * | | Move /projects/fork/:id to /projects/:id/fork14492-change-fork-endpoint | Oswaldo Ferreira | 2017-02-13 | 6 | -136/+133 |
| | | | | |||||
| * | | | Merge branch 'fix-ar-connection-leaks' into 'master' | Rémy Coutable | 2017-02-14 | 3 | -1/+11 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix ActiveRecord connection leaks Closes #27949 and gitlab-com/infrastructure#1139 See merge request !9109 | ||||
| | * | | | Don't connect in Gitlab::Database.adapter_namefix-ar-connection-leaks | Yorick Peterse | 2017-02-13 | 3 | -1/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | We don't need to connect when requesting the name of the database adapter. This in turn should prevent us from requesting/leaking connections just by asking whether we're using PostgreSQL or MySQL. | ||||
| * | | | | Merge branch '22645-add-discussion-contribs-to-calendar' into 'master' | Sean McGivern | 2017-02-14 | 6 | -105/+142 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add discussion events to contributions calendar Closes #22645 See merge request !8821 | ||||
| | * | | | | Add comment events to contributions calendar22645-add-discussion-contribs-to-calendar | Rémy Coutable | 2017-02-13 | 6 | -105/+142 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | Merge branch '27966-branch-ref-switcher-input-filter-broken' into 'master' | Filipa Lacerda | 2017-02-14 | 4 | -3/+17 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display loading indicator when filtering ref switcher dropdown Closes #27966 See merge request !9144 | ||||
| | * | | | | | Add tests27966-branch-ref-switcher-input-filter-broken | Clement Ho | 2017-02-13 | 1 | -0/+8 |
| | | | | | | | |||||
| | * | | | | | Display loading indicator when filtering ref switcher dropdown | Clement Ho | 2017-02-13 | 3 | -3/+9 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'add-omniauth-oauth2-generic' into 'master' | Rémy Coutable | 2017-02-14 | 5 | -0/+73 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add omniauth-oauth2-generic strategy Closes #26744 See merge request !9048 | ||||
| | * | | | | | | Adjust doc formatting | Joe Marty | 2017-02-13 | 1 | -4/+4 |
| | | | | | | | | |||||
| | * | | | | | | Fix spelling errors in docs and changelog | Joe Marty | 2017-02-13 | 2 | -7/+7 |
| | | | | | | | | |||||
| | * | | | | | | Edit omniauth-oauth2-generic docs for style conformance | Joe Marty | 2017-02-13 | 1 | -26/+31 |
| | | | | | | | | |||||
| | * | | | | | | Add changelog entry for #26744 | Joe Marty | 2017-02-13 | 1 | -0/+3 |
| | | | | | | | | |||||
| | * | | | | | | Add omniauth-oauth2-generic strategy | Joe Marty | 2017-02-13 | 4 | -0/+65 |
| | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Allows configurable Single Sign On with most simple OAuth2 providers - Adds documentation for the new strategy Closes #26744 | ||||
| * | | | | | | Merge branch 'dz-nested-groups-gfm-alt' into 'master' | Dmitriy Zaporozhets | 2017-02-14 | 8 | -7/+36 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add GFM support to nested groups See merge request !9184 | ||||
| | * | | | | | | Add GFM support to nested groupsdz-nested-groups-gfm-alt | Dmitriy Zaporozhets | 2017-02-13 | 8 | -7/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | | | | Merge branch 'patch-12' into 'master' | Allison Whilden | 2017-02-14 | 1 | -192/+192 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | Fix UX Guide apostrophe use for singular common nouns See merge request !9190 | ||||
| | * | | | | | | Fix UX Guide apostrophe use for singular common nounspatch-12 | Pedro Moreira da Silva | 2017-02-13 | 1 | -192/+192 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'quick-submit-fixture' into 'master' dz-rename-path-with-namespace | Alfredo Sumaran | 2017-02-13 | 3 | -24/+32 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace static fixture for behaviors/quick_submit_spec.js See merge request !9086 | ||||
| | * | | | | | | | Replace static fixture for behaviors/quick_submit_spec.js (!9086) | winniehell | 2017-02-11 | 3 | -10/+17 |
| | | | | | | | | | |||||
| | * | | | | | | | Use textarea for quick submit spec | winniehell | 2017-02-11 | 2 | -14/+15 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'merge-request-tabs-fixture' into 'master' | Alfredo Sumaran | 2017-02-13 | 4 | -24/+42 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace static fixture for merge_request_tabs_spec.js See merge request !9172 | ||||
| | * | | | | | | | | Replace static fixture for merge_request_tabs_spec.js (!9172) | winniehell | 2017-02-13 | 4 | -24/+42 |
| | |/ / / / / / / | |||||
| * | | | | | | | | Merge branch '27480_deploy_keys_should_not_show_up_in_users_keys_list' into ↵ | Douwe Maan | 2017-02-13 | 5 | -13/+53 |
| |\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Make deploy key not show in User's keys list Closes #27480 See merge request !9024 | ||||
| | * | | | | | | | Make deploy key not show in User's keys list | Pawel Chojnacki | 2017-02-13 | 5 | -13/+53 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch '22818-licence-gitignore-and-yml-endpoints-removal' into 'master' | Rémy Coutable | 2017-02-13 | 8 | -97/+398 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove deprecated templates endpoints in V4 Closes #22818 See merge request !8853 | ||||
| | * | | | | | | | | Remove deprecated templates endpoints in V422818-licence-gitignore-and-yml-endpoints-removal | Oswaldo Ferreira | 2017-02-13 | 8 | -97/+398 |
| | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | | Merge branch 'option-to-be-notified-of-own-activity' into 'master' | Douwe Maan | 2017-02-13 | 10 | -6/+168 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add option to receive email notifications about your own activity See merge request !8836 | ||||
| | * | | | | | | | | Remove `try` from NotificationService#build_recipients | Richard Macklin | 2017-02-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After refactoring pipeline_finished to avoid passing `nil` for current_user, we shouldn't need to use `try` here anymore. | ||||
| | * | | | | | | | | Refactor NotificationService#pipeline_finished to use skip_current_user | Richard Macklin | 2017-02-03 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of passing nil for current_user | ||||
| | * | | | | | | | | Use `let` in Profiles::NotificationsController spec | Richard Macklin | 2017-02-03 | 1 | -12/+9 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Use check and uncheck methods from Capybara DSL | Richard Macklin | 2017-02-01 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in user_changes_notified_of_own_activity_spec | ||||
| | * | | | | | | | | Add missing newline in Profiles::NotificationsController spec | Richard Macklin | 2017-02-01 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Add changelog entry for option to be notified of your own activity | Richard Macklin | 2017-02-01 | 1 | -0/+4 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Add checkbox in UI to opt into receiving notifications about your activity | Richard Macklin | 2017-02-01 | 3 | -0/+38 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Update NotificationService to respect User#notified_of_own_activity | Richard Macklin | 2017-02-01 | 2 | -3/+62 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Add notified_of_own_activity to permitted attributes | Richard Macklin | 2017-02-01 | 2 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in Profiles::NotificationsController#update | ||||
| | * | | | | | | | | Add notified_of_own_activity column to users table | Richard Macklin | 2017-02-01 | 2 | -0/+15 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Add controller spec for Profiles::NotificationsController | Richard Macklin | 2017-02-01 | 1 | -0/+46 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch '24333-close-issues-with-merge-request-title-ui' into 'master' | Rémy Coutable | 2017-02-13 | 3 | -5/+36 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show mentioned/issues being closed from a Merge Requests title Closes #24333 See merge request !9194 | ||||
| | * | | | | | | | | | Show mentioned/issues being closed from a Merge Requests title | Jan Christophersen | 2017-02-13 | 3 | -5/+36 |
| | | |_|/ / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | | Merge branch '27395-reduce-group-activity-sql-queries' into 'master' | Yorick Peterse | 2017-02-13 | 4 | -14/+21 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "GroupsController#activity.json is REALLY slow due to SQL" Closes #27395 See merge request !9088 | ||||
| | * | | | | | | | | | Use preload for Event#target since it's a polymorphic association27395-reduce-group-activity-sql-queries | Rémy Coutable | 2017-02-13 | 2 | -13/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, don't use limit in subquery, MySQL don't like that. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | | | | | | | | Include :author, :project, and :target in Event.with_associations | Rémy Coutable | 2017-02-13 | 2 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | | | | | | | | Don't instantiate AR objects in Event.in_projects | Rémy Coutable | 2017-02-13 | 2 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |