summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove example.net, replace with example.comdocs/fix-example-dot-netBrendan O'Leary2019-02-252-2/+2
|
* Merge branch 'zj-load-languages-from-database' into 'master'Nick Thomas2019-02-255-2/+60
|\ | | | | | | | | | | | | Load repository language from the DB if detected Closes #47390 See merge request gitlab-org/gitlab-ce!25518
| * Load repository language from the DB if detectedZeger-Jan van de Weg2019-02-255-2/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The repository charts page used to detect the repository language for each request that was made to the page. Given the detection is an expensive operation and the same data is stored in the database the database is now serving the request. The same goes for an API endpoint that serves the languages. When a repository is empty or non-existent the languages will always be empty. And the language detection RPC isn't requested. Closes: https://gitlab.com/gitlab-org/gitlab-ce/issues/47390
* | Merge branch 'refactor/56367-extract-resolve-with-issue-button-component' ↵Filipa Lacerda2019-02-255-10/+118
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Extract ResolveWithIssueButton from NoteableDiscussion component Closes #56367 See merge request gitlab-org/gitlab-ce!25093
| * | Extract ResolveWithIssueButton from NoteableDiscussion componentWinnie Hellmann2019-02-255-10/+118
|/ /
* | Merge branch ↵Filipa Lacerda2019-02-253-30/+70
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '55925-if-there-is-only-one-changed-page-in-review-app-go-directly-there' into 'master' If there is one changed page in review app, link to it Closes #55925 See merge request gitlab-org/gitlab-ce!25048
| * | Link to Changed Page if Only One Change PresentAndrew Fontaine2019-02-253-30/+70
| | | | | | | | | | | | | | | | | | Given a static page mapping, and a review app with a single static page change, the review app link will now go directly to that change instead of to the home page of the review app.
* | | Merge branch '53655-board-milestone-fix' into 'master'Douwe Maan2019-02-251-0/+16
|\ \ \ | | | | | | | | | | | | | | | | Port of See merge request gitlab-org/gitlab-ce!23868
| * | | Add specs checking keeping milestonesJarka Košanová2019-02-251-0/+16
| | | |
* | | | Merge branch '58020-fix-merge-api-endpoint-param' into 'master'Lin Jen-Shin2019-02-253-2/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Respect the `should_remove_source_branch` parameter to the merge API Closes #58020 See merge request gitlab-org/gitlab-ce!25525
| * | | | Respect the should_remove_source_branch parameter to the merge APINick Thomas2019-02-253-2/+22
| | | | |
* | | | | Merge branch '57794-project-template-for-net' into 'master'Filipa Lacerda2019-02-256-0/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project template for .NET Closes #57794 See merge request gitlab-org/gitlab-ce!25486
| * | | | | Merge branch '57794-project-template-for-net' of ↵Jason Lenny2019-02-256-0/+14
|/ / / / / | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce into 57794-project-template-for-net
* | | | | Merge branch 'ce-gitaly-np1-mr-creations' into 'master'Stan Hu2019-02-251-1/+5
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | CE Allow Gitaly N+1 in MR CreationsController See merge request gitlab-org/gitlab-ce!25499
| * | | | Allow Gitaly N+1 queries in MR CreationsControllerLuke Bennett2019-02-221-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes a master failure due to a reduction in the accepted Gitaly query count.
* | | | | Merge branch '57712-project-import-error-user-expected-got-hash' into 'master'Lin Jen-Shin2019-02-253-1/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Project import error, User expected, got Hash" Closes #57712 See merge request gitlab-org/gitlab-ce!25495
| * | | | | Fix project import error on releasesJames Lopez2019-02-223-1/+13
| | | | | |
* | | | | | Merge branch '52734-styling-of-user-project-and-group-avatars' into 'master'Filipa Lacerda2019-02-2520-22/+69
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Styling of user, project and group avatars" Closes #52734 See merge request gitlab-org/gitlab-ce!25098
| * | | | | | Style avatars for groups and projectsMartin Wortschack2019-02-2520-22/+69
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add rectangular avatar classes - Update avatar for groups - Update avatar for projects - Update avatar for frequent items - Update avatar on "Fork project" page - Conditionally add rectangular avatar class to autocomplete items
* | | | | | Merge branch 'docs/remove-unnecessary-difference' into 'master'Marcia Ramos2019-02-251-2/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary difference between CE and EE Closes #58070 See merge request gitlab-org/gitlab-ce!25513
| * | | | | | Remove unnecessary difference between CE and EEEvan Read2019-02-251-2/+1
|/ / / / / /
* | | | | | Merge branch '7861-cross-project-pipeline-dashboard-mvc-2-ce' into 'master'Grzegorz Bizon2019-02-252-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delegate last_pipeline to Project See merge request gitlab-org/gitlab-ce!25422
| * | | | | | Delegate last_pipeline to ProjectMatija Čupić2019-02-202-0/+2
| | | | | | |
* | | | | | | Merge branch 'allow-maintainers-to-remove-pages' into 'master'Kamil Trzciński2019-02-257-70/+60
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow maintainers to remove pages See merge request gitlab-org/gitlab-ce!25458
| * | | | | | | Allow maintainers to remove pagesVladimir Shushlin2019-02-257-70/+60
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move remove_pages permission to maintainer Fix before_action in pages controller to check `remove_pages` permission Add specs
* | | | | | | Merge branch 'expose-merge-ref-to-runner' into 'master'Kamil Trzciński2019-02-257-13/+202
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose refspec and depth to runner See merge request gitlab-org/gitlab-ce!25233
| * | | | | | | Expose refspec and depth to runnerShinya Maeda2019-02-257-13/+202
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix fix and fix Allow full ref specification for pipeline creation Add spec Support backward compatibility Use ref path Runner feature flag Simplify the things Support fork workflow (Public only) Expose ref spec Use refspec Glooming Decouple unrelated changes Add changelog Revert unrelated file Decouple unnecessary Add spec Use refspecs Fix changelog Simplify Fix coding offence Fix a ok ok ok ok ok a a Fix Add workaround for ignore_column Fix git depth Fix coding offence Fix spec Simplify more Do not set ignored column Fix tests Fix pipeline Fix spec fix fixture yes Revert nonsense fix Revert more ok Decouple mr pipelines fix spev Remove unrelated changes
* | | | | | | | Merge branch 'docs-update-reviewers-guidelines' into 'master'Douwe Maan2019-02-251-1/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: update code review guidelines Closes #57305 See merge request gitlab-org/gitlab-ce!25460
| * | | | | | | | Apply suggestion to doc/development/code_review.mdMarcia Ramos2019-02-211-1/+1
| | | | | | | | |
| * | | | | | | | Update code review guidelinesMarcia Ramos2019-02-211-1/+4
| | | | | | | | |
* | | | | | | | | Merge branch '40795-set-project-name-on-fork-api' into 'master'Douwe Maan2019-02-255-2/+67
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ability to set project path and name on fork using API Closes #40795 See merge request gitlab-org/gitlab-ce!25363
| * | | | | | | | | Add specs: setting path/name to project fork APIBalasankar "Balu" C2019-02-201-0/+48
| | | | | | | | | |
| * | | | | | | | | Let users set name/path on project fork using APIBalasankar "Balu" C2019-02-204-2/+19
| | | | | | | | | |
* | | | | | | | | | Merge branch 'sh-fix-users-controller-ruby-2.6-compat' into 'master'Douwe Maan2019-02-254-9/+23
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Admin::UsersController work with Ruby 2.6 See merge request gitlab-org/gitlab-ce!25316
| * | | | | | | | | | Make Admin::UsersController work with Ruby 2.6Stan Hu2019-02-194-9/+23
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ruby 2.6 introduced `Enumerable#filter`, which takes no arguments. Attempting to call `filter` on an `ActiveRecord::Relation` with a scope will fail with a `wrong number of arguments (given 1, expected 0)` message because the `Enumerable#filter` implementation overrides the delegated `ActiveRecord::Relation#filter` method. To make Admin::UsersController compatible with Ruby 2.6, rename `User.filter` to `User.filter_items`.
* | | | | | | | | | Merge branch '58098-auto-devops-postgres-version-variable' into 'master'Sean McGivern2019-02-253-0/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow configuring POSTGRES_VERSION in Auto DevOps Closes #58098 See merge request gitlab-org/gitlab-ce!25500
| * | | | | | | | | | Allow configuring POSTGRES_VERSION in Auto DevOpsDylan Griffith2019-02-223-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We set the default value to 9.6.2 since this was the previous default being used by `stable/postgresql --version=0.7.1` which is used in auto-deploy-app.
* | | | | | | | | | | Merge branch '52778-don-t-display-pipeline-status-if-pipelines-are-disabled' ↵Kamil Trzciński2019-02-254-4/+92
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Don't display pipeline status if pipelines are disabled" Closes #52778 See merge request gitlab-org/gitlab-ce!25204
| * | | | | | | | | | | Hide CI status when pipelines disabledScott Hampton2019-02-254-4/+92
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pipeline status was showing failed on projects when CI was disabled. This checks to see if the feature is enabled before showing the status.
* | | | | | | | | | | Merge branch 'am-fix-pagination-relative-links' into 'master'Rémy Coutable2019-02-255-154/+109
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly implement API pagination headers and add specs Closes #57684 See merge request gitlab-org/gitlab-ce!25267
| * | | | | | | | | | | Properly implement API pagination headers and add specsAdam Mulvany2019-02-215-154/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | Merge branch 'filter-confidential-issues' into 'master'Kamil Trzciński2019-02-2517-5/+145
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ability to filter confidential issues Closes #50747 See merge request gitlab-org/gitlab-ce!24960
| * | | | | | | | | | | | Only use boolean parameters internallyRobert Schilling2019-02-225-19/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use internally only boolean params.
| * | | | | | | | | | | | Add confidential_only scop to issue modelRobert Schilling2019-02-213-9/+13
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add API support for filtering confidential issuesRobert Schilling2019-02-213-0/+53
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add specs for filtering confidential issuesRobert Schilling2019-02-212-1/+36
| | | | | | | | | | | | |
| * | | | | | | | | | | | Ability to filter confidential issuesRobert Schilling2019-02-2111-3/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new search bar filter for confidential issues. Add filtering support to the IssuesFinder.
* | | | | | | | | | | | | Merge branch '49449-add-an-api-endpoint-for-bulk-updating-issues-and-mrs' ↵Rémy Coutable2019-02-256-0/+273
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' API endpoint for bulk updating issues and MRs Closes #49449 See merge request gitlab-org/gitlab-ce!25201
| * | | | | | | | | | | | | Incorporate review feedbackRobert Schilling2019-02-184-106/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use shared examples for issues and merge requests rather than a loop creating common specs.
| * | | | | | | | | | | | | Add new to test bulk_update endpoint for issues and MRsRobert Schilling2019-02-145-5/+222
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation for issues and MRs. Add shared tests for both bulk updating issues and MRs.