Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add CHANGELOG.md entry for !9386update-vue-2.1 | Mike Greiling | 2017-02-20 | 1 | -0/+4 |
| | |||||
* | use CommonJS vue distribution | Mike Greiling | 2017-02-20 | 1 | -1/+1 |
| | |||||
* | upgrade Vue from v2.0.3 to v2.1.10 | Mike Greiling | 2017-02-20 | 2 | -7/+7 |
| | |||||
* | Merge branch 'fix-vue-production-build' into 'master' | Jacob Schatz | 2017-02-20 | 1 | -2/+1 |
|\ | | | | | | | | | Utilize bundler-ready Vue distribution See merge request !9357 | ||||
| * | utilize pre-minified Vue in production since no CJS distribution is availablefix-vue-production-build | Mike Greiling | 2017-02-19 | 1 | -2/+1 |
| | | |||||
* | | Merge branch 'fix-grammar' into 'master' | Robert Speicher | 2017-02-20 | 3 | -5/+5 |
|\ \ | | | | | | | | | | | | | Fix some grammar in the API docs See merge request !9379 | ||||
| * | | Fix some grammar in the API docs | Robert Schilling | 2017-02-20 | 3 | -5/+5 |
| | | | |||||
* | | | Merge branch 'link-to-rspec-features-docs' into 'master' | Rémy Coutable | 2017-02-20 | 1 | -0/+8 |
|\ \ \ | | | | | | | | | | | | | | | | | Add link to external documentation of rspec-rails feature specs See merge request !8973 | ||||
| * | | | Add more links in the Features/Integration testing documentation | Richard Macklin | 2017-02-13 | 1 | -3/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Move the rspec-rails feature spec link to the Features/Integration section - Mention and link to capybara and poltergeist there as well [ci skip] | ||||
| * | | | Add link to external documentation of rspec-rails feature specs | Richard Macklin | 2017-02-03 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | Merge branch 'api-post-block' into 'master' | Sean McGivern | 2017-02-20 | 7 | -21/+127 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | API: Use POST to (un)block a user Closes #14596 See merge request !9371 | ||||
| * | | | API: Use POST to (un)block a userapi-post-block | Robert Schilling | 2017-02-20 | 7 | -21/+127 |
| | | | | |||||
* | | | | Merge branch 'api-grape-datetime' into 'master' | Rémy Coutable | 2017-02-20 | 3 | -22/+3 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | Use grape validation for dates See merge request !9375 | ||||
| * | | | Use grape validation for datesapi-grape-datetime | Robert Schilling | 2017-02-20 | 3 | -22/+3 |
| | | | | |||||
* | | | | Merge branch '21240_snippets_line_ending' into 'master' | Sean McGivern | 2017-02-20 | 9 | -25/+100 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Download snippets with LF line-endings by default Closes #21240 See merge request !8999 | ||||
| * | | | | Download snippets with LF line-endings by default | Jarka Kadlecova | 2017-02-20 | 9 | -25/+100 |
| | | | | | |||||
* | | | | | Merge branch 'docs/ldap-location' into 'master' | Achilleas Pipinellis | 2017-02-20 | 1 | -3/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Change wording for LDAP doc that was moved to a new location See merge request !9373 | ||||
| * | | | | | Change wording for LDAP doc that was moved to a new location | Achilleas Pipinellis | 2017-02-20 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | | Merge branch 'sh-fix-project-team-truncation-in-destroy' into 'master' | Rémy Coutable | 2017-02-20 | 2 | -2/+20 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | Prevent project team from being truncated too early during project destruction See merge request !9361 | ||||
| * | | | | | Prevent project team from being truncated too early during project destructionsh-fix-project-team-truncation-in-destroy | Stan Hu | 2017-02-19 | 2 | -2/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are two issues with truncating the project team early: 1. `Projects::UnlinkForkService` may not close merge requests properly since permissions may be revoked early. 2. If an error is encountered during flushing of caches, then the user will lose all privileges, possibly causing an issue on deletion on retry. | ||||
* | | | | | | Merge branch '28082-deleted-branch-event-404' into 'master' | Rémy Coutable | 2017-02-20 | 2 | -5/+7 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Link from Push Events for deleted branches Closes #28082 See merge request !9203 | ||||
| * | | | | | | Remove Link from Push Events for deleted branches | Jan Christophersen | 2017-02-15 | 2 | -5/+7 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'api-remove-deploy-key-disable' into 'master' | Sean McGivern | 2017-02-20 | 5 | -73/+14 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Remove `DELETE projects/:id/deploy_keys/:key_id/disable` Closes #28286 See merge request !9366 | ||||
| * | | | | | | | API: Remove `DELETE projects/:id/deploy_keys/:key_id/disable`api-remove-deploy-key-disable | Robert Schilling | 2017-02-20 | 5 | -73/+14 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch ↵ | Rémy Coutable | 2017-02-20 | 3 | -1/+6 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'fix_sidekiq_concurrency_warning_message_in_admin_background_job_page' into 'master' fix incorrect sidekiq concurrency count in admin background page Closes #19862 See merge request !9359 | ||||
| * | | | | | | | fix failed spec because haml_lint | wendy0402 | 2017-02-19 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | fix incorrect sidekiq concurrency count in admin background page | wendy0402 | 2017-02-19 | 3 | -1/+6 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'remove-imports-loader-window-bind' into 'master' | Filipa Lacerda | 2017-02-20 | 132 | -143/+129 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove window-binding hack with imports-loader See merge request !9123 | ||||
| * | | | | | | | fix overlooked window binding in spec filesremove-imports-loader-window-bind | Mike Greiling | 2017-02-17 | 24 | -24/+24 |
| | | | | | | | | |||||
| * | | | | | | | remove imports loader | Mike Greiling | 2017-02-17 | 3 | -14/+0 |
| | | | | | | | | |||||
| * | | | | | | | replace implicit this == window with explicit binding | Mike Greiling | 2017-02-17 | 105 | -105/+105 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch '28295-mr-loading-icon' into 'master' | Filipa Lacerda | 2017-02-20 | 2 | -2/+1 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix MR jobs loading icon visibility Closes #28295 See merge request !9324 | ||||
| * | | | | | | | | loading icon sometimes toggled alongside MR pipeline contents28295-mr-loading-icon | Simon Knox | 2017-02-19 | 2 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unbind existing listenerss and remove duplicate MiniPipelineGraph init | ||||
* | | | | | | | | | Merge branch 'patch-13' into 'master' | Rémy Coutable | 2017-02-20 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | exclude rpc_pipefs from system disk info See merge request !9355 | ||||
| * | | | | | | | | exclude rpc_pipefs from system disc info | Ben Bodenmiller | 2017-02-18 | 1 | -0/+1 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'add-additional-checks-to-ca-data' into 'master' | Jacob Schatz | 2017-02-18 | 13 | -28/+166 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Small improvements for Cycle Analytics See merge request !9153 | ||||
| * | | | | | | | Make sure events have most properties definedadd-additional-checks-to-ca-data | Alfredo Sumaran | 2017-02-10 | 5 | -28/+137 |
| | | | | | | | | |||||
| * | | | | | | | Restore exposure of legend property for events | Alfredo Sumaran | 2017-02-10 | 8 | -0/+29 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch '25465-todo-done-clicking-is-kind-of-unsafe' into 'master' | Clement Ho | 2017-02-18 | 12 | -149/+214 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Todo done clicking is kind of unusable. Closes #25465 See merge request !8691 | ||||
| * | | | | | | | | Todo done clicking is kind of unusable. | Jacopo | 2017-02-17 | 12 | -149/+214 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Done button will change to an Undo button and the line item will be greyed out. Bold links will be unbolded. The user can undo the task by clicking the Undo button. | ||||
* | | | | | | | | | Merge branch 'change_queue_weight' into 'master' | Yorick Peterse | 2017-02-18 | 2 | -1/+5 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase process_commit queue weight from 2 to 3 Closes #25828 See merge request !9326 | ||||
| * | | | | | | | | | Increase process_commit queue weight from 2 to 3 | blackst0ne | 2017-02-17 | 2 | -1/+5 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'global-dropdown-edits' into 'master' | Alfredo Sumaran | 2017-02-17 | 5 | -26/+10 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Global dropdown edits See merge request !9336 | ||||
| * | | | | | | | | | | Fix issuables_counter_specglobal-dropdown-edits | Annabel Dunstone Gray | 2017-02-17 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Remove application theme settings from preferences | Annabel Dunstone Gray | 2017-02-17 | 2 | -14/+0 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Remove badge styling in dropdown; remove blue outline | Annabel Dunstone Gray | 2017-02-17 | 2 | -9/+7 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Make active links in dropdown bold | Annabel Dunstone Gray | 2017-02-17 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch '28313-words' into 'master' | Achilleas Pipinellis | 2017-02-17 | 2 | -5/+5 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix job status -> pipeline status Closes #28313 See merge request !9320 | ||||
| * | | | | | | | | | | | Fix job status -> pipeline status28313-words | Mark Pundsack | 2017-02-16 | 2 | -5/+5 |
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'directly-addressed-todo-docs' into 'master' | Achilleas Pipinellis | 2017-02-17 | 1 | -1/+25 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs for directly addressed todos See merge request !9312 |