Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix stray pipelines API request when showing MR27925-fix-mr-stray-pipelines-api-request | Eric Eastwood | 2017-02-14 | 5 | -8/+21 |
* | Merge branch '28142-overlap-bugs' into 'master' | Alfredo Sumaran | 2017-02-14 | 2 | -1/+2 |
|\ | |||||
| * | Fix z index bugs | Annabel Dunstone Gray | 2017-02-14 | 2 | -1/+2 |
* | | Merge branch 'master' into 'master' | Clement Ho | 2017-02-14 | 1 | -7/+8 |
|\ \ | |||||
| * | | #27631: Add missing top-area div to activity header page | nerro | 2017-02-14 | 1 | -7/+8 |
* | | | Merge branch 'issue_27317' into 'master' | Alfredo Sumaran | 2017-02-14 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Fix timezone on issue boards due dateissue_27317 | Felipe Artur | 2017-02-14 | 1 | -1/+1 |
* | | | | Merge branch '26287-link-branch-in-calendar-activity' into 'master' | Rémy Coutable | 2017-02-14 | 1 | -5/+9 |
|\ \ \ \ | |||||
| * | | | | Add Links to Branches in Calendar Activity | Jan Christophersen | 2017-02-14 | 1 | -5/+9 |
| |/ / / | |||||
* | | | | Merge branch '19302-wiki-page-delete-does-not-trigger-the-webhook' into 'mast... | Rémy Coutable | 2017-02-14 | 3 | -1/+16 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Execute web hooks for WikiPage delete operation | Mark Fletcher | 2017-02-14 | 2 | -1/+12 |
| * | | | Make WikiPage comparable according to StaticModel interface | Mark Fletcher | 2017-02-14 | 1 | -0/+4 |
* | | | | Merge branch '26286-most-recent-activity-profile-header' into 'master' | Annabel Dunstone Gray | 2017-02-14 | 1 | -0/+2 |
|\ \ \ \ | |||||
| * | | | | Add 'Most Recent Activity' header to the User Profile page | Jan Christophersen | 2017-02-13 | 1 | -0/+2 |
* | | | | | Merge branch 'use-es6-promise-package' into 'master' | Alfredo Sumaran | 2017-02-14 | 1 | -2/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Use es6-promise package to avoid webpack warningsuse-es6-promise-package | Eric Eastwood | 2017-02-13 | 1 | -2/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch '27932-merge-request-pipelines-displays-json' into 'master' | Alfredo Sumaran | 2017-02-14 | 1 | -1/+16 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into 27932-merge-request-pipelines-displays-json27932-merge-request-pipelines-displays-json | Filipa Lacerda | 2017-02-10 | 13 | -152/+49 |
| |\ \ \ \ \ | |||||
| * | | | | | | Adds verification in case the endpoint already has `.json` | Filipa Lacerda | 2017-02-10 | 1 | -2/+17 |
| * | | | | | | Merge branch 'master' into 27932-merge-request-pipelines-displays-json | Filipa Lacerda | 2017-02-10 | 23 | -70/+193 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into 27932-merge-request-pipelines-displays-json | Filipa Lacerda | 2017-02-10 | 2 | -3/+3 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into 27932-merge-request-pipelines-displays-json | Filipa Lacerda | 2017-02-10 | 39 | -97/+141 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Adds `.json` to the endpoint requested in order to avoid showing JSON | Filipa Lacerda | 2017-02-09 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch '27924-set-max-width-mini-pipeline-text' into 'master' | Filipa Lacerda | 2017-02-14 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||||
| * | | | | | | | | | Set max width for text in mini pipeline graph27924-set-max-width-mini-pipeline-text | Sam Rose | 2017-02-14 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch '22645-add-discussion-contribs-to-calendar' into 'master' | Sean McGivern | 2017-02-14 | 3 | -6/+9 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Add comment events to contributions calendar22645-add-discussion-contribs-to-calendar | Rémy Coutable | 2017-02-13 | 3 | -6/+9 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch '27966-branch-ref-switcher-input-filter-broken' into 'master' | Filipa Lacerda | 2017-02-14 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Display loading indicator when filtering ref switcher dropdown | Clement Ho | 2017-02-13 | 1 | -0/+2 |
* | | | | | | | | | | | Add GFM support to nested groupsdz-nested-groups-gfm-alt | Dmitriy Zaporozhets | 2017-02-13 | 3 | -3/+3 |
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge branch '27480_deploy_keys_should_not_show_up_in_users_keys_list' into '... | Douwe Maan | 2017-02-13 | 1 | -1/+6 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Make deploy key not show in User's keys list | Pawel Chojnacki | 2017-02-13 | 1 | -1/+6 |
* | | | | | | | | | | | Merge branch '22818-licence-gitignore-and-yml-endpoints-removal' into 'master' | Rémy Coutable | 2017-02-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Remove deprecated templates endpoints in V422818-licence-gitignore-and-yml-endpoints-removal | Oswaldo Ferreira | 2017-02-13 | 1 | -1/+1 |
* | | | | | | | | | | | | Merge branch 'option-to-be-notified-of-own-activity' into 'master' | Douwe Maan | 2017-02-13 | 4 | -6/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Remove `try` from NotificationService#build_recipients | Richard Macklin | 2017-02-03 | 1 | -1/+1 |
| * | | | | | | | | | | | | Refactor NotificationService#pipeline_finished to use skip_current_user | Richard Macklin | 2017-02-03 | 1 | -2/+3 |
| * | | | | | | | | | | | | Add checkbox in UI to opt into receiving notifications about your activity | Richard Macklin | 2017-02-01 | 2 | -0/+6 |
| * | | | | | | | | | | | | Update NotificationService to respect User#notified_of_own_activity | Richard Macklin | 2017-02-01 | 1 | -3/+3 |
| * | | | | | | | | | | | | Add notified_of_own_activity to permitted attributes | Richard Macklin | 2017-02-01 | 1 | -1/+1 |
* | | | | | | | | | | | | | Merge branch '24333-close-issues-with-merge-request-title-ui' into 'master' | Rémy Coutable | 2017-02-13 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Show mentioned/issues being closed from a Merge Requests title | Jan Christophersen | 2017-02-13 | 1 | -2/+2 |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch '27395-reduce-group-activity-sql-queries' into 'master' | Yorick Peterse | 2017-02-13 | 2 | -14/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | 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 |
| * | | | | | | | | | | | | Include :author, :project, and :target in Event.with_associations | Rémy Coutable | 2017-02-13 | 1 | -1/+1 |
| * | | | | | | | | | | | | Don't instantiate AR objects in Event.in_projects | Rémy Coutable | 2017-02-13 | 1 | -1/+1 |
* | | | | | | | | | | | | | Merge branch 'rs-rubocop-rspec' into 'master' | Rémy Coutable | 2017-02-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Enable `Style/RedundantException` cop and correct offense | Robert Speicher | 2017-02-10 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'dm-quick-fix-web-edit-new-lines' into 'master' | Robert Speicher | 2017-02-13 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Respect autocrlf setting when creating/updating file through web UIdm-quick-fix-web-edit-new-lines | Douwe Maan | 2017-02-13 | 1 | -0/+8 |
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | |