summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Create compare object with default branch when target branch is missingissue_28051_2Felipe Artur2017-02-213-18/+25
|
* Merge branch 'dm-fix-editing-files-on-forks-quick' into 'master' Robert Speicher2017-02-202-37/+44
|\ | | | | | | | | | | | | Fix issue where files on a fork could not be edited Closes #28188 See merge request !9349
| * Don't use potentially slow ForkService in specdm-fix-editing-files-on-forks-quickDouwe Maan2017-02-201-4/+6
| |
| * Fix issue where files on a fork could not be editedDouwe Maan2017-02-172-31/+36
| |
* | Merge branch 'ux-guide-add-personas' into 'master' Régis Freyd (GitLab)2017-02-204-11/+159
|\ \ | | | | | | | | | | | | UX Guide: Add personas See merge request !9390
| * | [ci skip] UX Guide: Add personasAllison Whilden2017-02-204-11/+159
| | |
* | | Merge branch '26315-unify-labels-filter-behavior' into 'master' Rémy Coutable2017-02-205-19/+52
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Unify issues search behavior by always filtering when ALL labels matches Closes #26315 See merge request !8849
| * | | Unify issues search behavior by always filtering when ALL labels matches26315-unify-labels-filter-behaviorOswaldo Ferreira2017-02-205-19/+52
| | | |
* | | | Merge branch 'feature/github-find-users-by-email' into 'master' Robert Speicher2017-02-2012-50/+196
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitHub Importer - Find users based on their email address Closes #15181 See merge request !8958
| * | | | Reuse User#find_by_any_email on UserFormatter#find_by_emailDouglas Barbosa Alexandre2017-02-201-10/+2
| | | | |
| * | | | Use leading periods on UserFormatter#find_by_external_uidDouglas Barbosa Alexandre2017-02-201-2/+3
| | | | |
| * | | | Add CHANGELOG entryDouglas Barbosa Alexandre2017-02-201-0/+4
| | | | |
| * | | | Add a simple cache for Gitlab::GithubImport::Client#userDouglas Barbosa Alexandre2017-02-201-0/+8
| | | | |
| * | | | GitHub Importer - Find users based on their email addressDouglas Barbosa Alexandre2017-02-2010-50/+191
| | |/ / | |/| | | | | | | | | | | | | | | | | | The returned email by the GitHub API is the user's publicly visible email address (or null if the user has not specified a public email address in their profile)
* | | | Merge branch '28204-option-to-disable-webpack-dev-server-livereload' into ↵Alfredo Sumaran2017-02-202-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Pick up option from GDK to disable webpack dev server livereload Closes #28204 See merge request !9287
| * | | | Pick up option from gdk to disable webpack dev server livereload28204-option-to-disable-webpack-dev-server-livereloadEric Eastwood2017-02-152-0/+6
| | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/28204
* | | | | Merge branch 'rs-document-timecop' into 'master' Rémy Coutable2017-02-201-0/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Document Timecop usage for time-sensitive tests See merge request !9383
| * | | | | Document Timecop usage for time-sensitive testsrs-document-timecopRobert Speicher2017-02-201-0/+19
| | | | | |
* | | | | | Merge branch 'authentiq-backchannel-logout' into 'master' Douwe Maan2017-02-206-4/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remote logout functionality on Authentiq OAuth provider See merge request !9381
| * | | | | | Added support for Authentiq Back-Channel LogoutAlexandros Keramidas2017-02-206-4/+26
| | | | | | |
* | | | | | | Merge branch 'updated-pages-0.3.1' into 'master' Robert Speicher2017-02-202-1/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update GitLab Pages to v0.3.1 See merge request !9387
| * | | | | | | Update GitLab Pages to v0.3.1Nick Thomas2017-02-202-1/+5
| | | | | | | |
* | | | | | | | Merge branch 'artifactsdoc' into 'master'Robert Speicher2017-02-202-3/+32
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added documentation for permalinks to most recent build artifacts Closes #27361 See merge request !8934
| * | | | | | | Added documentation for permalinks to most recent build artifactsChristian Godenschwager2017-02-202-3/+32
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | - Documented how to download single files from most recent artifacts - Documented how to browse most recent artifacts
* | | | | | | Merge branch 'pedro-fix-line-ending' into 'master' Clement Ho2017-02-201-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix wrong line ending [ci-skip] See merge request !9270
| * | | | | | | Fix wrong line ending [ci-skip]pedro-fix-line-endingPedro Moreira da Silva2017-02-171-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'remove-paginated-ressource' into 'master'Rémy Coutable2017-02-207-44/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove shared example for pagination See merge request !9377
| * | | | | | | | Remove shared example for paginationremove-paginated-ressourceRobert Schilling2017-02-207-44/+6
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | 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