summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | Merge branch 'api-star-restful' into 'master'Rémy Coutable2017-02-205-8/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Moved `DELETE /projects/:id/star` to `POST /projects/:id/unstar` Closes #28328 See merge request !9328
| * | | | | | | | | | | | | API: Moved `DELETE /projects/:id/star` to `POST /projects/:id/unstar`api-star-restfulRobert Schilling2017-02-205-8/+13
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'zj-improve-performance-user-agent-details' into 'master' Rémy Coutable2017-02-207-7/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve performance of User Agent Detail See merge request !9129
| * | | | | | | | | | | | | Improve performance of User Agent DetailZ.J. van de Weg2017-02-207-7/+43
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'fix-vue-production-build' into 'master' Jacob Schatz2017-02-201-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-buildMike Greiling2017-02-191-2/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'fix-grammar' into 'master' Robert Speicher2017-02-203-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix some grammar in the API docs See merge request !9379
| * | | | | | | | | | | | | | Fix some grammar in the API docsRobert Schilling2017-02-203-5/+5
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'link-to-rspec-features-docs' into 'master' Rémy Coutable2017-02-201-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add link to external documentation of rspec-rails feature specs See merge request !8973
| * | | | | | | | | | | | | | Add more links in the Features/Integration testing documentationRichard Macklin2017-02-131-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 specsRichard Macklin2017-02-031-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | Merge branch 'api-post-block' into 'master' Sean McGivern2017-02-207-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-blockRobert Schilling2017-02-207-21/+127
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'api-grape-datetime' into 'master' Rémy Coutable2017-02-203-22/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use grape validation for dates See merge request !9375
| * | | | | | | | | | | | | Use grape validation for datesapi-grape-datetimeRobert Schilling2017-02-203-22/+3
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '21240_snippets_line_ending' into 'master' Sean McGivern2017-02-209-25/+100
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Download snippets with LF line-endings by default Closes #21240 See merge request !8999
| * | | | | | | | | | | | | Download snippets with LF line-endings by defaultJarka Kadlecova2017-02-209-25/+100
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'docs/ldap-location' into 'master' Achilleas Pipinellis2017-02-201-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 locationAchilleas Pipinellis2017-02-201-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | Merge branch 'sh-fix-project-team-truncation-in-destroy' into 'master' Rémy Coutable2017-02-202-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-destroyStan Hu2017-02-192-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 Coutable2017-02-202-5/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Link from Push Events for deleted branches Closes #28082 See merge request !9203
| * | | | | | | | | | | | | | | Remove Link from Push Events for deleted branchesJan Christophersen2017-02-152-5/+7
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'api-remove-deploy-key-disable' into 'master'Sean McGivern2017-02-205-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-disableRobert Schilling2017-02-205-73/+14
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch ↵Rémy Coutable2017-02-203-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_lintwendy04022017-02-191-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | fix incorrect sidekiq concurrency count in admin background pagewendy04022017-02-193-1/+6
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'remove-imports-loader-window-bind' into 'master' Filipa Lacerda2017-02-20132-143/+129
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove window-binding hack with imports-loader See merge request !9123
| * | | | | | | | | | | | | | | fix overlooked window binding in spec filesremove-imports-loader-window-bindMike Greiling2017-02-1724-24/+24
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | remove imports loaderMike Greiling2017-02-173-14/+0
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | replace implicit this == window with explicit bindingMike Greiling2017-02-17105-105/+105
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch '28295-mr-loading-icon' into 'master' Filipa Lacerda2017-02-202-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix MR jobs loading icon visibility Closes #28295 See merge request !9324
| * | | | | | | | | | | | | | | | loading icon sometimes toggled alongside MR pipeline contents28295-mr-loading-iconSimon Knox2017-02-192-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unbind existing listenerss and remove duplicate MiniPipelineGraph init
* | | | | | | | | | | | | | | | | Merge branch 'patch-13' into 'master'Rémy Coutable2017-02-201-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | exclude rpc_pipefs from system disk info See merge request !9355
| * | | | | | | | | | | | | | | | exclude rpc_pipefs from system disc infoBen Bodenmiller2017-02-181-0/+1
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'add-additional-checks-to-ca-data' into 'master' Jacob Schatz2017-02-1813-28/+166
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Small improvements for Cycle Analytics See merge request !9153
| * | | | | | | | | | | | | | | Make sure events have most properties definedadd-additional-checks-to-ca-dataAlfredo Sumaran2017-02-105-28/+137
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Restore exposure of legend property for eventsAlfredo Sumaran2017-02-108-0/+29
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch '25465-todo-done-clicking-is-kind-of-unsafe' into 'master' Clement Ho2017-02-1812-149/+214
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Todo done clicking is kind of unusable. Closes #25465 See merge request !8691
| * | | | | | | | | | | | | | | | Todo done clicking is kind of unusable.Jacopo2017-02-1712-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 Peterse2017-02-182-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 3blackst0ne2017-02-172-1/+5
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'global-dropdown-edits' into 'master' Alfredo Sumaran2017-02-175-26/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Global dropdown edits See merge request !9336
| * | | | | | | | | | | | | | | | | Fix issuables_counter_specglobal-dropdown-editsAnnabel Dunstone Gray2017-02-171-2/+2
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Remove application theme settings from preferencesAnnabel Dunstone Gray2017-02-172-14/+0
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Remove badge styling in dropdown; remove blue outlineAnnabel Dunstone Gray2017-02-172-9/+7
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Make active links in dropdown boldAnnabel Dunstone Gray2017-02-171-1/+1
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch '28313-words' into 'master' Achilleas Pipinellis2017-02-172-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix job status -> pipeline status Closes #28313 See merge request !9320
| * | | | | | | | | | | | | | | | | | Fix job status -> pipeline status28313-wordsMark Pundsack2017-02-162-5/+5
| | |_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | |