summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Handle empty states for job pageFilipa Lacerda2018-03-093-21/+36
|
* Merge branch 'fl-svg' into 'master'Clement Ho2018-03-0817-3/+17
|\ | | | | | | | | Update svgs content See merge request gitlab-org/gitlab-ce!17650
| * Update svgs contentfl-svgFilipa Lacerda2018-03-0817-3/+17
| |
* | Merge branch '37211-diff-comments-fix-ctrl-enter-tooltip' into 'master'Fatih Acet2018-03-081-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Resolve ""You can also press Ctrl-Enter" tooltip lingers after Tab+Enter" Closes #37211 See merge request gitlab-org/gitlab-ce!17560
| * | Hide hotkey tooltip after click event in diff comments37211-diff-comments-fix-ctrl-enter-tooltipDennis Tang2018-03-061-1/+1
| | |
* | | Merge branch 'refactor/move-mr-widget-memory-usage-and-graph-components' ↵Phil Hughes2018-03-083-55/+78
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | into 'master' Move MemoryGraph and MemoryUsage vue components See merge request gitlab-org/gitlab-ce!17533
| * | Move MemoryGraph and MemoryUsage vue componentsGeorge Tsiolis2018-03-083-55/+78
| | |
* | | Merge branch 'jivl-fix-delete-milestone-button-showing-up' into 'master'Phil Hughes2018-03-081-10/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix delete milestone button showing up for all users Closes #43778 See merge request gitlab-org/gitlab-ce!17576
| * | | Fix milestone delete button showing for all usersjivl-fix-delete-milestone-button-showing-upJose Ivan Vargas2018-03-061-10/+10
| | | |
* | | | Fix Error 500 when updating a projectsh-fix-update-serviceStan Hu2018-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If no parameters were specified for project features but Wikis were disabled, we would get "NoMethodError: undefined method `[]' for nil:NilClass". Closes #44019
* | | | Merge branch '40525-listing-user-activity-timeouts' into 'master'Yorick Peterse2018-03-082-8/+41
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve database response time for listing user activity Closes #40525 See merge request gitlab-org/gitlab-ce!17454
| * | | | Leverage user_contributed_projects to find recent events.40525-listing-user-activity-timeoutsAndreas Brandl2018-03-072-8/+41
| | | | | | | | | | | | | | | | | | | | Closes #40525.
* | | | | Merge branch 'jprovazn-revert-commit-cleanup' into 'master'Sean McGivern2018-03-081-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Revert "Cleanup after adding MR diff's commit_count" See merge request gitlab-org/gitlab-ce!17639
| * | | | | Revert "Cleanup after adding MR diff's commit_count"Jan Provaznik2018-03-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0b7d10851456018328da137beeca931767b4fd0a.
* | | | | | [CE] Add Naming/FileName rule checking expected class/module per filenameGabriel Mazetto2018-03-081-0/+0
|/ / / / /
* | | | | Merge branch 'sh-remove-double-caching-repo-empty' into 'master'Sean McGivern2018-03-081-3/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove double caching of Repository#empty? Closes #43882 See merge request gitlab-org/gitlab-ce!17588
| * | | | | Memoize Repository#empty? instead of double caching the valuesh-remove-double-caching-repo-emptyStan Hu2018-03-071-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We saw that in a customer instance, `empty?` was cached to be `true` even though `has_visible_content?` and `exists?` were `true`. This double caching can run into edge cases because there's no guarantee that the inner values will properly expire the outer one, especially if there is Redis replication lag. Consider this scenario: 1. `exists?` and `has_visible_content?` are false 2. `empty?` is expired 3. A subsequent call to `empty?` returns `true` because `exists?` is false even though `empty` is true 4. `exists?` and `has_visible_content?` are then expired 5. `exists?` and `has_visible_content?` are set to true 6. `empty?` is still stuck in the wrong value as `true` Closes #43882
* | | | | | Merge branch ↵Kamil Trzciński2018-03-084-14/+50
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-0746-181/+673
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| * | | | | | | Removes UJS from reset cache buttonFilipa Lacerda2018-03-073-10/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses loading button for better UX
| * | | | | | | [ci skip] Merge branch 'master' into ↵Filipa Lacerda2018-03-0788-412/+924
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-06254-4327/+1957
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-084-14/+37
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport changes from introducing GithubService interation in EE See merge request gitlab-org/gitlab-ce!17607
| * | | | | | | | | | Hides Triggers if integration only has one eventJames Edwards-Jones2018-03-082-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes confusing/unnecessary checkboxes when trying to configure an integration. If there is only one supported event we don't need to allow these to be individually disabled since the integration can be disabled instead. E.g. Project Integrations for GitHub, Bugzilla, Asana, Pipeline emails and Gemnasium Allows integrations to override which triggers are configurable
| * | | | | | | | | | 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-072-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'unassign-when-leaving' into 'master'Robert Speicher2018-03-084-57/+30
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't delete todos or unassign issues and MRs when a user leaves a project Closes #43899 See merge request gitlab-org/gitlab-ce!17615
| * | | | | | | | | | | Don't delete todos or unassign issues and MRs when a user leaves a projectunassign-when-leavingDouwe Maan2018-03-074-57/+30
| | | | | | | | | | | |
* | | | | | | | | | | | Address frontend feedbackBob Van Landuyt2018-03-082-3/+3
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jivl-backport-custom-metrics-frontend' into 'master'Filipa Lacerda2018-03-075-31/+59
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backport of custom metrics for the common metrics section of CE See merge request gitlab-org/gitlab-ce!17586
| * | | | | | | | | | | | backport of custom metrics for the common metrics section of CEjivl-backport-custom-metrics-frontendJose Ivan Vargas2018-03-075-31/+59
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'da-update-project-activity' into 'master'Stan Hu2018-03-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update project activity when pushing to a wiki repository See merge request gitlab-org/gitlab-ce!17621
| * | | | | | | | | | | | Update project activity when pushing to a wiki repositoryda-update-project-activityDouglas Barbosa Alexandre2018-03-071-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'ce-3839-ci-cd-only-github-projects-fe' into 'master'Douwe Maan2018-03-077-48/+105
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create CI/CD-only projects from GitHub -- CE backport See merge request gitlab-org/gitlab-ce!17432
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 'ce-3839-ci-cd-only-github-projects-fe'ce-3839-ci-cd-only-github-projects-feDouwe Maan2018-03-0748-153/+691
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # locale/gitlab.pot
| * | | | | | | | | | | | | | CE backport for creating CI/CD projects from GitHubRubén Dávila2018-03-077-48/+105
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'backport-ee-3892-to-ce' into 'master'Douwe Maan2018-03-072-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport relevant changes from EE https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4827 to CE See merge request gitlab-org/gitlab-ce!17608
| * | | | | | | | | | | | | | | Backport relevant changes from EE ↵backport-ee-3892-to-ceTiago Botelho2018-03-072-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4827 to CE
* | | | | | | | | | | | | | | | Merge branch 'refactor/move-sidebar-assignee-vue-component' into 'master'Clement Ho2018-03-072-44/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move SidebarAssignees vue component See merge request gitlab-org/gitlab-ce!17398
| * | | | | | | | | | | | | | | Move SidebarAssignees vue componentGeorge Tsiolis2018-03-072-44/+47
| | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Resolve "Add a mention and link to doc for security implications in the ↵Mayra Cabrera2018-03-071-0/+6
| |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Kubernetes cluster page"
* | | | | | | | | | | | | | Merge branch 'bvl-allow-maintainer-to-push' into 'master'Douwe Maan2018-03-0727-44/+219
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow maintainers to push forks of a project for branches that have open MRs Closes #22292 See merge request gitlab-org/gitlab-ce!17395
| * | | | | | | | | | | | | Only allow users that can merge to push to sourcebvl-allow-maintainer-to-pushBob Van Landuyt2018-03-072-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We only allow users that can merge the merge request to push to the fork.
| * | | | | | | | | | | | | Link correct project when adding file to empty MRBob Van Landuyt2018-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When creating a cross project merge request without changes. The MR widget shows the option to create a new file. It would however link to the wrong project.
| * | | | | | | | | | | | | Use Project#source_of_merge_requests-relationBob Van Landuyt2018-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the relation `Project#source_of_merge_requests` in `Ci::CreatePipelineService` That way we take advantage of all the `ActiveRecord::Relation` magic
| * | | | | | | | | | | | | Limit queries to a user-branch combinationBob Van Landuyt2018-03-072-31/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The query becomes a lot simpler if we can check the branch name as well instead of having to load all branch names.
| * | | | | | | | | | | | | Add documentation for allowing maintainers to pushBob Van Landuyt2018-03-071-0/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Allow maintainers to edit directly in a forkBob Van Landuyt2018-03-0713-38/+70
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Allow abilities on forks while MR is openBob Van Landuyt2018-03-072-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an MR is created using `allow_maintainer_to_push`, we enable some abilities while the MR is open. This should allow every user with developer abilities on the target project, to push to the source project.