summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch ↵Kamil Trzciński2018-03-231-4/+13
|\ | | | | | | | | | | | | | | | | '43482-enabling-auto-devops-on-an-empty-project-gives-you-wrong-information' into 'master' Resolve "Enabling Auto DevOps on an empty project gives you wrong information" Closes #43482 See merge request gitlab-org/gitlab-ce!17605
| * Refactor AutoDevops pipeline logic into methodMatija Čupić2018-03-221-8/+13
| |
| * Add empty repo check before running AutoDevOps pipelineMatija Čupić2018-03-111-2/+6
| |
* | Add read-only banner to all pagesToon Claes2018-03-221-14/+0
| | | | | | | | | | | | | | When the database is in a read-only state, display a banner on each page informing the user they cannot write to that GitLab instance. Closes gitlab-org/gitlab-ce#43937.
* | Merge branch 'fix/auth0-unsafe-login-10-6' into 'security-10-6'James Lopez2018-03-211-0/+14
| | | | | | | | | | | | [10.6] Fix GitLab Auth0 integration signs in the wrong user See merge request gitlab/gitlabhq!2354
* | Move IDE to CEPhil Hughes2018-03-201-0/+6
| | | | | | | | This also makes the IDE generally available
* | Resolve "Projects::MergeRequestsController#show is slow (implement skeleton ↵Simon Knox2018-03-131-0/+6
|/ | | | loading)"
* Merge branch ↵Kamil Trzciński2018-03-081-4/+6
|\ | | | | | | | | | | | | | | | | '43770-change-clear-runners-cache-ujs-action-to-an-axios-request' into 'master' Resolve "Change Clear Runners cache UJS action to an API request" Closes #43770 See merge request gitlab-org/gitlab-ce!17466
| * [ci skip] Merge branch 'master' into ↵Filipa Lacerda2018-03-074-7/+18
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 43770-change-clear-runners-cache-ujs-action-to-an-axios-request * master: (68 commits) Upgrade Workhorse to 4.0.0 naming things Update GitLab Pages to v0.7.0 Minor fixes in API doc Use Project#full_name instead of name_with_namespace Fix tests not completely disabling Gitaly Move OperationService#UserRemoveBranch Move OperationService#UserCreateBranch Move CommitService#Languages to OPT_OUT Move RefService#CreateBranch to OPT_OUT Move RefService#DeleteBranch to OPT_OUT Move OperationService#UserRevert to OPT_OUT Move OperationService#UserAddTag to OPT_OUT Move CommitService::CommitPatch to OPT_OUT Change to Pacific Time Zone Merge branch 'pages-6-1-gitlab-10-5' into 'security-10-5' Merge branch 'sh-fix-otp-backup-invalidation-10-5' into 'security-10-5' Remove wrong assumption about Runners cache GC Add CommonMark markdown engine add nginx_status monitoring details ...
| * \ [ci skip] Merge branch 'master' into ↵Filipa Lacerda2018-03-078-31/+150
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 43770-change-clear-runners-cache-ujs-action-to-an-axios-request * master: (97 commits) Remove common_vue bundle Gitlab::Utils - backport `.ensure_array_from_string` from EE Fix false positive spec of using digest instead of hexdigest Change queue namespace of UpdateHeadPipelineForMergeRequestWorker prefer checking explicitly for null replace fixture with simple mount point add new tests for metrics dashboard changes Set sha256 checksum when archiving traces Move update_head_pipeline_for_merge_request queue to pipeline_processing namespace Docs guidelines: cherry-picking commits from CE to EE CI charts now include the current day New .dedicated-no-docs-pull-cache-job and .no-db-job definitions Add date calls in .gitlab-ci.yml to see how long each step take move misplaced entry point Arg.id via method pointer Backport description composition from EE Fix a typo, a conflict and improve documentation Remove extra breadcrumb on tags Lazy fetch parent commits for a commit Fix Gitaly n+1 in NetworkController#show ...
| * \ \ [ci skip] Merge branch 'master' into ↵Filipa Lacerda2018-03-0615-64/+69
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 43770-change-clear-runners-cache-ujs-action-to-an-axios-request * master: (163 commits) Resolve "Group Leave action is broken on Groups Dashboard and Homepage" So that it's consistent with other entries and EE Fix race condition when previewing docs Resolve "Enable privileged mode for Runner installed on Kubernetes" Change column to file_sha256. Add test. Add changelog Add checksum at runner grape api Revert logic of calculating checksum Add post migration for checksum calculation Add ObjectStorageQueue concern and test Import use_file method from EE and use it for calculation of checksum Change column type to binary from string Add checksum to ci_job_artifacts Make oauth provider login generic Don't error out in system hook if user has `nil` datetime columns Use host URL to build JIRA remote link icon CI/CD-only projects FE Resolve "SSH key add text" Changes after review Projects and groups badges API Remove default scope from todos ...
| * | | | Make Projects::Settings:CiCdController#reset_cache a json endpointMatija Čupić2018-03-011-4/+6
| | | | |
* | | | | Merge branch 'ce-jej/github-project-service-for-ci' into 'master'Douwe Maan2018-03-081-12/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Backport changes from introducing GithubService interation in EE See merge request gitlab-org/gitlab-ce!17607
| * | | | | Service integration displays validation errors on test failJames Edwards-Jones2018-03-071-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes attempts to update a service integration which had `can_test?` set to true but validations were causing the "Test and save changes" button to return "Something went wrong on our end." Removes references to index action left from 0af99433143727088b6a0a1b2163751c05d80ce6
| * | | | | Backport changes from EE's GithubService integrationJames Edwards-Jones2018-03-071-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds detailed_status to pipeline hook data Adds detailed_description option for Services Integration edit page renders 404 if a service is disabled
* | | | | | Merge branch 'master' into 'ce-3839-ci-cd-only-github-projects-fe'ce-3839-ci-cd-only-github-projects-feDouwe Maan2018-03-076-13/+38
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | # Conflicts: # locale/gitlab.pot
| * \ \ \ \ \ Merge branch 'bvl-allow-maintainer-to-push' into 'master'Douwe Maan2018-03-074-7/+22
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow maintainers to push forks of a project for branches that have open MRs Closes #22292 See merge request gitlab-org/gitlab-ce!17395
| | * | | | | Allow maintainers to edit directly in a forkBob Van Landuyt2018-03-073-7/+21
| | | | | | |
| | * | | | | Allow a user to select `allow maintainer to push`Bob Van Landuyt2018-03-071-0/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a project is not private, and the source branch not protected the user can now select the option to allow maintainers to push to this branch
| * | | | | Merge branch 'jivl-new-modal-project-labels-milestones' into 'master'Filipa Lacerda2018-03-072-6/+16
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve: Modal and banner designs for project label and project milestone promotion Closes #41895 See merge request gitlab-org/gitlab-ce!17197
| | * | | | | used respond_to formats for persisting flash messages insteadjivl-new-modal-project-labels-milestonesJose Ivan Vargas2018-03-062-5/+15
| | | | | | |
| | * | | | | Add persistent flash messagesJose Ivan Vargas2018-03-012-3/+5
| | | | | | |
| | * | | | | Added vue based promotion modals for labels and milestonesJose Ivan Vargas2018-03-012-4/+2
| | | | | | |
* | | | | | | CE backport for creating CI/CD projects from GitHubRubén Dávila2018-03-071-4/+14
|/ / / / / /
* | | | | | Merge remote-tracking branch 'dev/master'Robert Speicher2018-03-071-0/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Merge branch 'sh-fix-otp-backup-invalidation-10-5' into 'security-10-5'Douwe Maan2018-03-071-0/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | Ensure that OTP backup codes are always invalidated - 10.5 port See merge request gitlab/gitlabhq!2324
* | | | | Merge branch 'mr-commit-optimization' into 'master'Sean McGivern2018-03-071-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Use persisted/memoized value for MRs sha's instead of doing git lookups See merge request gitlab-org/gitlab-ce!17555
| * | | | Use persisted/memoized value for MRs shas instead of doing git lookupsAlejandro Rodríguez2018-03-061-1/+1
| | | | |
* | | | | Merge branch 'issue_38337' into 'master'Sean McGivern2018-03-064-8/+94
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring one group board to CE Closes #38337 See merge request gitlab-org/gitlab-ce!17274
| * \ \ \ \ Merge branch 'master' into 'issue_38337'Felipe Artur2018-03-069-37/+64
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/group.rb # db/schema.rb
| * | | | | | Address review commentsFelipe Artur2018-03-051-7/+6
| | | | | | |
| * | | | | | Bring one group board to CEFelipe Artur2018-03-034-9/+96
| | | | | | |
* | | | | | | Merge remote-tracking branch 'upstream/master' into ↵5029-support-cluster-metrics-cePawel Chojnacki2018-03-0630-196/+272
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5029-support-cluster-metrics-ce # Conflicts: # spec/models/clusters/applications/prometheus_spec.rb
| * | | | | | Fix Gitaly n+1 in NetworkController#showAndrew Newdigate2018-03-061-14/+11
| | | | | | |
| * | | | | | Merge branch '40187-project-branch-dashboard-with-active-stale-branches' ↵Rémy Coutable2018-03-061-5/+36
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add overview of branches and filtered views for active/stale branches Closes #40187 et #17293 See merge request gitlab-org/gitlab-ce!15402
| | * | | | | Add overview of branches and a filter for active/stale branchesTakuya Noguchi2018-03-061-5/+36
| | | | | | |
| * | | | | | Merge branch 'ce-3839-ci-cd-only-projects-fe' into 'master'Robert Speicher2018-03-051-3/+11
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create CI/CD-only projects by URL -- CE backport See merge request gitlab-org/gitlab-ce!17342
| | * | | | | | CI/CD-only projects FEEric Eastwood2018-03-051-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ee/issues/3839 Conflicts: app/assets/javascripts/projects/project_new.js app/views/shared/_import_form.html.haml ee/app/controllers/ee/projects_controller.rb ee/spec/features/projects/new_project_spec.rb locale/gitlab.pot
| | * | | | | | Backport BE changes from CI/CD projects ee!4567Eric Eastwood2018-03-021-2/+6
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4567
| * | | | | | Merge branch 'dz-use-less-deprecated-methods' into 'master'Douwe Maan2018-03-054-4/+4
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Reduce usage of deprecated *_with_namespace methods See merge request gitlab-org/gitlab-ce!17523
| | * | | | | Replace deprecated name_with_namespace with full_name in app and specDmitriy Zaporozhets2018-03-054-4/+4
| | |/ / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Merge branch 'fix-impersonate-ui' into 'master'Rémy Coutable2018-03-051-1/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove impersonate token from flash scope in UI See merge request gitlab-org/gitlab-ce!17480
| | * | | | | Remove impersonate token from flash scopejulien MILLAU2018-03-021-1/+0
| | | |_|/ / | | |/| | |
| * | | | | Merge branch ↵Rémy Coutable2018-03-051-4/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '37430-projects-comparecontroller-show-is-calling-gitaly-n-1-times-per-request' into 'master' Resolve "Projects::CompareController#show is calling Gitaly n+1 times per request" Closes #37430 See merge request gitlab-org/gitlab-ce!17439
| | * | | | | Fix n+1 issue by not reloading fully loaded blobsAlejandro Rodríguez2018-03-051-4/+2
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'remove-ide' into 'master'Tim Zallmann2018-03-051-6/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | Remove IDE from CE See merge request gitlab-org/gitlab-ce!17458
| | * | | | Remove IDE from CEPhil Hughes2018-03-021-6/+0
| | |/ / /
| * | | | Merge branch 'feature/fetch-commit-signs-from-gitaly-in-batch' into 'master'Sean McGivern2018-03-021-25/+19
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fetch commit signatures from Gitaly in batches Closes gitaly#1046 See merge request gitlab-org/gitlab-ce!17456
| | * | | | Fetch commit signatures from Gitaly in batchesfeature/fetch-commit-signs-from-gitaly-in-batchAhmad Sherif2018-03-011-25/+19
| | | | | | | | | | | | | | | | | | | | | | | | Closes gitaly#1046
| * | | | | Allow to include also descendant group labelsJan Provaznik2018-03-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because epic index page includes also epics from subgroups it's necessary to also get descendant group labels for filtering. https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4773#note_61236542
View Lorry Controller Status