summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* testpersist-source-sha-and-target-sha-for-pipelines-testShinya Maeda2019-02-261-4/+0
|
* Persist source sha and target sha for merge pipelinesShinya Maeda2019-02-2613-7/+283
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add changelog Fix doc Fix Add safe model attributes Use binary column Allow nil source sha and target sha Fix spec Fix doc Add scopes Add spec Fix coding offence Fix Fix spec ok ok
* Merge branch 'enable_trace_sidekiq_development' into 'master'Douwe Maan2019-02-261-0/+4
|\ | | | | | | | | Turn on backtrace for sidekiq in development See merge request gitlab-org/gitlab-ce!25515
| * Turn on backtrace for sidekiq in developmentThong Kuah2019-02-251-0/+4
| | | | | | | | This enables easier debugging in GDK
* | Merge branch ↵Lin Jen-Shin2019-02-261-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 'quarantine-spec/features/issues/filtered_search/search_bar_spec.rb' into 'master' [CE] Quarantine spec/features/issues/filtered_search/search_bar_spec.rb:89 See merge request gitlab-org/gitlab-ce!25551
| * | Quarantine spec/features/issues/filtered_search/search_bar_spec.rb:89Rémy Coutable2019-02-261-1/+1
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch '50313-use-kaniko-to-build-containers-in-autodevops' into 'master'Kamil Trzciński2019-02-262-49/+8
|\ \ \ | | | | | | | | | | | | | | | | Use auto-build-image in AutoDevOps See merge request gitlab-org/gitlab-ce!24279
| * | | Use auto-build-image for build stageJames Fargher2019-02-252-49/+8
| | | |
* | | | Merge branch '54417-improve-authorize-dsl' into 'master'Kamil Trzciński2019-02-2613-72/+175
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Improve GraphQL Authorization DSL Closes #57828 See merge request gitlab-org/gitlab-ce!25328
| * | | Improve GraphQL Authorization DSLLuke Duncalfe2019-02-2613-72/+175
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously GraphQL field authorization happened like this: class ProjectType field :my_field, MyFieldType do authorize :permission end end This change allowed us to authorize like this instead: class ProjectType field :my_field, MyFieldType, authorize: :permission end A new initializer registers the `authorize` metadata keyword on GraphQL Schema Objects and Fields, and we can collect this data within the context of Instrumentation like this: field.metadata[:authorize] The previous functionality of authorize is still being used for mutations, as the #authorize method here is called at during the code that executes during the mutation, rather than when a field resolves. https://gitlab.com/gitlab-org/gitlab-ce/issues/57828
* | | | Merge branch 'docs-anchors4-ha' into 'master'Evan Read2019-02-263-5/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Docs: Fix anchors in HA docs See merge request gitlab-org/gitlab-ce!25415
| * | | | Add punctuation.Marcel Amirault2019-02-211-2/+2
| | | | |
| * | | | Fix anchors in CE HA docsMarcel Amirault2019-02-203-5/+5
| | | | |
* | | | | Merge branch 'revert-82d7b5a0-ce' into 'master'Robert Speicher2019-02-2645-479/+30
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [CE port] Revert "Automatic merge of gitlab-org/gitlab-ce master" See merge request gitlab-org/gitlab-ce!25537
| * | | | | Revert "Merge branch 'fix-misspellings-app-comments' into 'master'"Michael Kozono2019-02-2520-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9202bbd129537a698b986e6295d0c783b5a84815, reversing changes made to 4b282e9ce1ae246c4538b3ede18d1380ea778029.
| * | | | | Revert "Merge branch 'sh-fix-cpp-templates-404' into 'master'"Michael Kozono2019-02-253-37/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4b282e9ce1ae246c4538b3ede18d1380ea778029, reversing changes made to b6f37434a7022be1be40c0d0519aea3ceca25ea5.
| * | | | | Revert "Merge branch ↵Michael Kozono2019-02-256-273/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '49449-add-an-api-endpoint-for-bulk-updating-issues-and-mrs' into 'master'" This reverts commit 7981c0292b07a0138b096fa082341fcb13e9ce2b, reversing changes made to 9202bbd129537a698b986e6295d0c783b5a84815.
| * | | | | Revert "Merge branch 'filter-confidential-issues' into 'master'"Michael Kozono2019-02-2517-145/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d133bf84c668df3dfc9938bb04150754cb873c8b, reversing changes made to 7981c0292b07a0138b096fa082341fcb13e9ce2b.
* | | | | | Merge branch ↵Clement Ho2019-02-263-22/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '57582-dropdown-icon-misalignment-on-issues-list-on-mobile-screen' into 'master' Fix alignment of dropdown icon on issuable on mobile Closes #57582 See merge request gitlab-org/gitlab-ce!25205
| * | | | | Fix alignment of dropdown icon on issuable on mobileTakuya Noguchi2019-02-203-22/+6
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | 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