summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | Merge branch '41851-enable-eslint-codeclimate' into 'master'Dmitriy Zaporozhets2018-02-272-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Enable eslint in codeclimate" Closes #41851 See merge request gitlab-org/gitlab-ce!17392
| * | | | | | | | | | | | Adds MR ID to changelog entry41851-enable-eslint-codeclimateFilipa Lacerda2018-02-271-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Enables eslint in codeclimate jobFilipa Lacerda2018-02-272-2/+7
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'backstage/gb/build-stages-catch-up-migration' into 'master'Kamil Trzciński2018-02-277-0/+199
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fully migrate build stages again Closes #38756 See merge request gitlab-org/gitlab-ce!15741
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge commit '981b5905a02ac89ca9f33ad7c91d8c1a576ed9af' into ↵backstage/gb/build-stages-catch-up-migrationGrzegorz Bizon2018-02-23242-1329/+4349
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backstage/gb/build-stages-catch-up-migration * commit '981b5905a02ac89ca9f33ad7c91d8c1a576ed9af': (40 commits)
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 'backstage/gb/build-stages-catch-up-migration'Grzegorz Bizon2018-02-22654-8676/+7402
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | | | | | | | | | | | | Add changelog entry for pipeline stages migrationGrzegorz Bizon2018-02-211-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | | | Create index on id instead of stage_id in migrationGrzegorz Bizon2018-02-212-6/+6
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Separate adding and removing index from stages migrationGrzegorz Bizon2018-02-204-6/+29
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add index before going through builds in a migrationGrzegorz Bizon2018-02-201-0/+5
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Use a helper to schedule pipeline stages migrationGrzegorz Bizon2018-02-162-7/+6
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'master' into backstage/gb/build-stages-catch-up-migrationGrzegorz Bizon2018-02-16103-668/+1218
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (38 commits)
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 'backstage/gb/build-stages-catch-up-migration'Grzegorz Bizon2018-02-15342-14015/+20374
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: db/schema.rb
| * | | | | | | | | | | | | | | | | Recover from unique constraint violation in stages migrationGrzegorz Bizon2018-02-153-10/+21
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Migrate pipeline stages in batches instead of single rowGrzegorz Bizon2018-02-142-64/+32
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Schedule pipeline stages migration every 5 minutesGrzegorz Bizon2018-02-132-15/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | | | | | Move pipeline stages background migration in timeGrzegorz Bizon2018-02-123-2/+2
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'master' into backstage/gb/build-stages-catch-up-migrationGrzegorz Bizon2018-02-1287-770/+1354
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (26 commits)
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into backstage/gb/build-stages-catch-up-migrationGrzegorz Bizon2018-02-092776-34184/+66618
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (1480 commits) Conflicts: db/schema.rb
| * | | | | | | | | | | | | | | | | | | Fix rubocop offense in build stage migration classesGrzegorz Bizon2018-01-062-5/+3
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Randomize build ids in stages migration test dataGrzegorz Bizon2018-01-061-7/+7
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Do not attempt to migrate legacy pipeline stagesGrzegorz Bizon2018-01-062-13/+25
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Reduce batch size of stages we schedule for a migrationGrzegorz Bizon2018-01-061-1/+1
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Update specs for delayed background migration of stagesGrzegorz Bizon2018-01-061-4/+4
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Update background stages migration timestampGrzegorz Bizon2018-01-064-4/+4
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Fix Rubocop offenses in build status migrations :cop:Grzegorz Bizon2018-01-062-4/+2
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Migrate a build stage completely in a background migrationGrzegorz Bizon2018-01-062-0/+115
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Schedule full build stage migration in the backgroundGrzegorz Bizon2018-01-062-0/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For builds that are still missing `stage_id`.
* | | | | | | | | | | | | | | | | | | | Merge branch 'refactor-commit-show' into 'master'Phil Hughes2018-02-273-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove diff notes webpack entry point See merge request gitlab-org/gitlab-ce!17382
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 'refactor-commit-show'refactor-commit-showPhil Hughes2018-02-2722-26/+49
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # config/webpack.config.js
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into refactor-commit-showClement Ho2018-02-26125-379/+343
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Remove diff notes webpack entry pointClement Ho2018-02-263-3/+2
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'ph-webpack-bundle-tags' into 'master'Filipa Lacerda2018-02-2711-34/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Converted webpack_bundle_tag to be automatic webpack bundles See merge request gitlab-org/gitlab-ce!17364
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 'ph-webpack-bundle-tags'ph-webpack-bundle-tagsPhil Hughes2018-02-27162-480/+557
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/pages/projects/merge_requests/show/index.js
| * | | | | | | | | | | | | | | | | | | | | | Converted webpack_bundle_tag to be automatic webpack bundlesPhil Hughes2018-02-2611-34/+25
| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch '43510-merge-requests-and-issues-don-t-show-for-all-subgroups' ↵Grzegorz Bizon2018-02-278-60/+107
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Merge requests and issues don't show for all subgroups" Closes #43510 See merge request gitlab-org/gitlab-ce!17312
| * | | | | | | | | | | | | | | | | | | | | | Fix subgroup issue and MR pages empty states and counts43510-merge-requests-and-issues-don-t-show-for-all-subgroupsSean McGivern2018-02-278-60/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, these wouldn't count issues or MRs in subgroups - meaning that if _this_ group had no issues or MRs, we'd show the empty state, which was wrong.
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'slash-commands-changes-for-chatops' into 'master'Kamil Trzciński2018-02-2712-24/+81
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose ChatName objects to slash commands See merge request gitlab-org/gitlab-ce!17295
| * | | | | | | | | | | | | | | | | | | | | | Expose ChatName objects to slash commandsslash-commands-changes-for-chatopsYorick Peterse2018-02-2312-24/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of only exposing a User to slash commands we now also expose the ChatName object that the User object is retrieved from. This is necessary for GitLab Chatops as we need for example the user ID of the chat user.
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refactor-pipelines-list' into 'master'Phil Hughes2018-02-276-5/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove commit_pipelines webpack entry point See merge request gitlab-org/gitlab-ce!17379
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into refactor-pipelines-listrefactor-pipelines-listClement Ho2018-02-26125-379/+343
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Remove commit_pipelines webpack entry pointClement Ho2018-02-266-5/+8
| | |_|_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch '43315-gpg-popover' into 'master'Phil Hughes2018-02-273-9/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Verified commits not displaying properly" Closes #43315 See merge request gitlab-org/gitlab-ce!17323
| * | | | | | | | | | | | | | | | | | | | | | | Add missing class to parent element and remove extra CSS43315-gpg-popoverFilipa Lacerda2018-02-264-11/+3
| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | [ci skip] Merge branch 'master' into 43315-gpg-popoverFilipa Lacerda2018-02-26145-565/+2310
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (39 commits) Restart Unicorn and Sidekiq when GRPC throws 14:Endpoint read failed Add changelog entry Use imported `DropdownUtils` Update CHANGELOG.md for 10.5.2 Respond 404 when repo does not exist Fix deletion attempts on dropped tables Fix specs prevent localStorage.clear from running when it would cause an error Removed webpack tag move webpack bundles we intend to keep below the list of bundles we're refactoring to reduce conflicts Explicitly add uncovered files to troubleMakers Backport custom metrics ce components remove issue_show webpack bundle in favor of pages/projects/issues/show/index.js Revert "Revert "Use Dir.mktmpdir"" Revert "Use Dir.mktmpdir" Use Dir.mktmpdir Refactored webpack bundle tag for deploy keys Change FileUtils.cp to FileUtils.copy Bring back the initial commit Add a button to deploy a runner to a Kubernetes cluster in the settings page ...
| * | | | | | | | | | | | | | | | | | | | | | | | Fix gpg popover boxFilipa Lacerda2018-02-233-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '43275-improve-variables-validation-message' into 'master'Kamil Trzciński2018-02-277-4/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Improve Variables validation message" Closes #43275 See merge request gitlab-org/gitlab-ce!17135
| * | | | | | | | | | | | | | | | | | | | | | | | | Include CI Variable Key in its uniqueness validation error message43275-improve-variables-validation-messageMatija Čupić2018-02-234-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Add CHANGELOG entryMatija Čupić2018-02-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Skip variables duplicates validator if variable is already a duplicateMatija Čupić2018-02-223-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | |