summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '43460-track-projects-a-user-contributed-to' into 'master'Yorick Peterse2018-03-078-0/+299
|\ | | | | | | | | | | | | Keep track of projects a user interacted with Closes #43460 See merge request gitlab-org/gitlab-ce!17327
| * Shortcut and return on duplicate record error.43460-track-projects-a-user-contributed-toAndreas Brandl2018-03-061-3/+3
| |
| * Improve robustness of migration.Andreas Brandl2018-03-061-6/+39
| |
| * Nested transaction for find_or_create_by! queries.Andreas Brandl2018-03-061-5/+11
| | | | | | | | | | For background see https://apidock.com/rails/v4.2.7/ActiveRecord/Relation/find_or_create_by.
| * Remove unnecessary safe guard.Andreas Brandl2018-03-061-6/+0
| |
| * Operate on ids to avoid unnecessary loading.Andreas Brandl2018-03-062-5/+5
| |
| * Singularize model name.Andreas Brandl2018-03-064-9/+9
| |
| * For MySQL, foreign keys are dependent on index.Andreas Brandl2018-03-062-3/+6
| |
| * Rename to UserInteractedProjects.Andreas Brandl2018-03-0610-60/+60
| | | | | | | | | | | | This is to avoid a mix-up with the existing concept of 'user contributions'. See `User#contributed_projects` or `Event#contributions`.
| * Improve migration robustness and speed.Andreas Brandl2018-03-063-4/+10
| |
| * Add changelog.Andreas Brandl2018-03-061-0/+5
| |
| * Flush cached information about schema.Andreas Brandl2018-03-061-0/+6
| | | | | | | | | | This is only relevant for migration specs. See spec/support/migrations_helpers.rb.
| * Only track contributions if table is available.Andreas Brandl2018-03-064-2/+36
| | | | | | | | | | | | | | This is due to the problem that the callback can be called while running an earlier database schema version (for example during earlier migrations). We work around this by checking the current schema version and only track contributions if the table is available.
| * Address rubocop offenses.Andreas Brandl2018-03-062-34/+35
| |
| * Treat special cases accordingly.Andreas Brandl2018-03-062-1/+23
| | | | | | | | | | * Event without project * Fail early on unexpectedly missing author
| * Cache project/user combinations.Andreas Brandl2018-03-062-6/+23
| |
| * Track which projects a user contributed to.Andreas Brandl2018-03-064-0/+63
| | | | | | | | Closes #43460.
| * Simpler migration strategy for MySQL.Andreas Brandl2018-03-061-29/+58
| | | | | | | | | | MySQL does not return the number of inserted rows (or at least not expose them through cmd_tuples). Let's do one-shot INSERT instead.
| * Add post-migration to populate user_contributed_projects table.Andreas Brandl2018-03-061-0/+48
| | | | | | | | | | Trying to be a good citizen here, we spread the load building that table. Maybe not required, but at least good practice and no harm.
| * Create user_contributed_projects table.Andreas Brandl2018-03-062-0/+32
| |
* | Merge branch 'dz-plugins-project-integrations' into 'master'Dmitriy Zaporozhets2018-03-075-50/+88
|\ \ | | | | | | | | | | | | | | | | | | Show plugins list on system hooks page Closes #40812 See merge request gitlab-org/gitlab-ce!17518
| * | Add feature test for plugins on system hooks pagedz-plugins-project-integrationsDmitriy Zaporozhets2018-03-061-0/+10
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Remove plugins from project integrations pageDmitriy Zaporozhets2018-03-063-6/+14
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Remove boolean icons from plugins pageDmitriy Zaporozhets2018-03-051-1/+0
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Render plugins list on system hooks pageDmitriy Zaporozhets2018-03-053-53/+53
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Show plugins list on project integrations pageDmitriy Zaporozhets2018-03-052-0/+21
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'consistent-deployment_platform' into 'master'Grzegorz Bizon2018-03-072-2/+3
|\ \ \ | | | | | | | | | | | | | | | | Unify deployment_platform interface with EE See merge request gitlab-org/gitlab-ce!17594
| * | | Unify deployment_platform interface with EELin Jen-Shin2018-03-072-2/+3
| | | |
* | | | Merge branch 'fix-group-boards-migration-name' into 'master'Sean McGivern2018-03-071-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix group boards migration name See merge request gitlab-org/gitlab-ce!17592
| * | | | Fix group boards migration nameSean McGivern2018-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | This had the same name in EE, so give it a different name in CE.
* | | | | Merge branch 'include-mr-discussions-calendar-activity' into 'master'Sean McGivern2018-03-073-2/+9
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Count discussions on issues and merge requests as contributions for the contributions calendar See merge request gitlab-org/gitlab-ce!17557
| * | | | Count discussions on issues and merge requests as contributions for the ↵Riccardo Padovani2018-03-073-2/+9
|/ / / / | | | | | | | | | | | | contributions calendar
* | | | Merge branch '43502-clipboard-btn' into 'master'Phil Hughes2018-03-077-2/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Update clipboard button component not to render default css classes" Closes #43502 See merge request gitlab-org/gitlab-ce!17529
| * | | | Removes btn-transparent and btn-clipboard as default classes for clipboard ↵43502-clipboard-btnFilipa Lacerda2018-03-067-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | button component Changes after review
* | | | | Merge branch 'gitlab-shell-6-0-4' into 'master'Sean McGivern2018-03-071-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Bump Gitlab Shell to v6.0.4 Closes #43739 See merge request gitlab-org/gitlab-ce!17582
| * | | | Bump Gitlab Shell to v6.0.4gitlab-shell-6-0-4Alejandro Rodríguez2018-03-061-1/+1
| |/ / /
* | | | Merge branch 'master' into 'master'Grzegorz Bizon2018-03-073-6/+59
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CI charts now include the current day Closes #42921 See merge request gitlab-org/gitlab-ce!17032
| * | | | CI charts now include the current dayDakkaron2018-03-063-6/+59
| | | | |
* | | | | Merge branch 'sh-make-prune-optional-in-git-fetch' into 'master'43962-add-wip-to-merge-requests-titles-by-default43958-include-adding-a-specific-runner-to-another-project-from-the-admin-area-to-docsNick Thomas2018-03-078-30/+68
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Make --prune a configurable parameter in fetching a git remote See merge request gitlab-org/gitlab-ce!17346
| * | | | | Make --prune a configurable parameter in fetching a git remotesh-make-prune-optional-in-git-fetchStan Hu2018-03-068-30/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default, --prune is added to the command-line of a `git fetch` operation, but for repositories with many references this can take a long time to run. We shouldn't need to run --prune the first time we fetch a new repository.
* | | | | | Merge branch 'remove-common-vue' into 'master'Clement Ho2018-03-0612-31/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove common_vue bundle See merge request gitlab-org/gitlab-ce!17551
| * | | | | | Remove common_vue bundleMike Greiling2018-03-0612-31/+8
|/ / / / / /
* | | | | | Merge branch 'ee-183-common-code-backport' into 'master'Sean McGivern2018-03-062-1/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab::Utils - backport `.ensure_array_from_string` from EE See merge request gitlab-org/gitlab-ce!17574
| * | | | | | Gitlab::Utils - backport `.ensure_array_from_string` from EEMario de la Ossa2018-03-062-1/+23
|/ / / / / /
* | | | | | Merge branch 'banzai-n-plus-one' into 'master'Douwe Maan2018-03-061-1/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | Gitaly N+1 notice on Banzai filtering See merge request gitlab-org/gitlab-ce!17540
| * | | | | Add Gitaly N+1 notice for Banzai filteringAlejandro Rodríguez2018-03-051-1/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch ↵Kamil Trzciński2018-03-065-2/+83
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'move-pipeline_default-update_head_pipeline_for_merge_request-queue-to-pipeline_processing-namespace' into 'master' Move update_head_pipeline_for_merge_request queue to `pipeline_processing` namespace Closes #43919 See merge request gitlab-org/gitlab-ce!17572
| * | | | | Change queue namespace of UpdateHeadPipelineForMergeRequestWorkerShinya Maeda2018-03-071-0/+2
| | | | | |
| * | | | | Move update_head_pipeline_for_merge_request queue to pipeline_processing ↵Shinya Maeda2018-03-074-2/+81
| | | | | | | | | | | | | | | | | | | | | | | | namespace
* | | | | | Merge branch 'sha256-checksum-for-trace' into 'master'Kamil Trzciński2018-03-062-5/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set sha256 checksum when archiving traces Closes #43940 See merge request gitlab-org/gitlab-ce!17570
View Lorry Controller Status