Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix seedsblackst0ne-replace-sidekiq-inline-with-perform-enqueued-jobs | blackst0ne | 2018-07-23 | 5 | -5/+5 |
| | |||||
* | Replace 'Sidekiq::Testing.inline!' with 'perform_enqueued_jobs' | blackst0ne | 2018-07-23 | 27 | -44/+49 |
| | | | | | | | | | | `perform_enqueued_jobs` is a Sidekiq method. Using this method violates the Dependency inversion principle[0]. This commit replaces `perform_enqueued_jobs` with ActiveJob's abstract method `perform_enqueued_jobs` in specs. [0]: https://en.wikipedia.org/wiki/Dependency_inversion_principle | ||||
* | Merge branch 'update-mr-img-docs' into 'master'48773-gitlab-project-import-should-use-object-storage | Mike Lewis | 2018-07-22 | 1 | -0/+0 |
|\ | | | | | | | | | Update merge_request.png in docs See merge request gitlab-org/gitlab-ce!20730 | ||||
| * | Update merge_request.png in docs | Victor Wu | 2018-07-22 | 1 | -0/+0 |
|/ | |||||
* | Merge branch 'milestones-update-docs' into 'master' | Mike Lewis | 2018-07-22 | 3 | -0/+0 |
|\ | | | | | | | | | Update docs milestones See merge request gitlab-org/gitlab-ce!20731 | ||||
| * | Update docs milestones | Victor Wu | 2018-07-22 | 3 | -0/+0 |
|/ | |||||
* | Merge branch ↵ | Robert Speicher | 2018-07-20 | 8 | -39/+54 |
|\ | | | | | | | | | | | | | '6104-extract-ee-specific-files-lines-for-some-platform-related-project-views' into 'master' [CE] Resolve "Extract EE specific files/lines for some platform related project views" See merge request gitlab-org/gitlab-ce!19859 | ||||
| * | Reduce CE/EE difference in app/views/projects/tags/index.html.haml6104-extract-ee-specific-files-lines-for-some-platform-related-project-views | Rémy Coutable | 2018-07-17 | 1 | -0/+2 |
| | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Reduce CE/EE difference in ↵ | Rémy Coutable | 2018-07-17 | 3 | -33/+36 |
| | | | | | | | | | | | | app/views/projects/services/prometheus/_show.html.haml Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Reduce CE/EE difference in ↵ | Rémy Coutable | 2018-07-17 | 4 | -6/+16 |
| | | | | | | | | | | | | app/views/projects/protected_tags/_protected_tag.html.haml Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | Merge branch 'sh-bring-json-logger-to-ce' into 'master' | Robert Speicher | 2018-07-20 | 2 | -0/+51 |
|\ \ | | | | | | | | | | | | | Bring JsonLogger to CE See merge request gitlab-org/gitlab-ce!20755 | ||||
| * | | Bring JsonLogger to CE | Stan Hu | 2018-07-20 | 2 | -0/+51 |
| | | | | | | | | | | | | | | | This backports a module that was in EE for Geo so that other modules can have structured logging support. | ||||
* | | | Merge branch '_acet-fix-spec' into 'master' | Tim Zallmann | 2018-07-20 | 1 | -2/+2 |
|\ \ \ | |/ / |/| | | | | | | | | Fix one disabled spec of comment posting. See merge request gitlab-org/gitlab-ce!20747 | ||||
| * | | Fix one disabled spec of comment posting. | Fatih Acet | 2018-07-20 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch '47530-replace-label-light-with-label-bold' into 'master' | Clement Ho | 2018-07-20 | 67 | -190/+190 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Replace all usages of `label-light` with `label-bold`" Closes #47530 and #41725 See merge request gitlab-org/gitlab-ce!20727 | ||||
| * | | | Replace label-light with label-bold. Because it's bold, not light | Annabel Dunstone Gray | 2018-07-19 | 67 | -190/+190 |
| | | | | |||||
* | | | | Merge branch '48817-fix-mr-changes-discussion-navigation' into 'master' | Filipa Lacerda | 2018-07-20 | 11 | -68/+412 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve ""Jump to first/next unresolved discussion" jumps to resolved discussions" Closes #48817 and #48602 See merge request gitlab-org/gitlab-ce!20434 | ||||
| * | | | | Resolve ""Jump to first/next unresolved discussion" jumps to resolved ↵ | André Luís | 2018-07-20 | 11 | -68/+412 |
|/ / / / | | | | | | | | | | | | | discussions" | ||||
* | | | | Merge branch 'jupyter-image' into 'master' | Dmitriy Zaporozhets | 2018-07-20 | 3 | -1/+7 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Specify Jupyter Image to use with JupyterHub Installation See merge request gitlab-org/gitlab-ce!20714 | ||||
| * | | | | Better chengelog for jupyter image change | Amit Rathi | 2018-07-20 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Adds a note in the documentation about custom Jupyter Image | Amit Rathi | 2018-07-20 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Updated changelog with author name and merge request id | Amit Rathi | 2018-07-20 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge branch 'jupyter-image' of https://gitlab.com/amit1rrr/gitlab-ce into ↵ | Amit Rathi | 2018-07-20 | 0 | -0/+0 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | jupyter-image | ||||
| | * | | | | Specify Jupyter Image to use with JupyterHub Installation | Amit Rathi | 2018-07-19 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Specify Jupyter Image to use with JupyterHub Installation | Amit Rathi | 2018-07-20 | 2 | -0/+6 |
| |/ / / / | |||||
* | | | | | Merge branch 'change-discussion-label-to-plan-label' into 'master' | Sean McGivern | 2018-07-20 | 1 | -2/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Change Discussion label to Plan label and add Create label See merge request gitlab-org/gitlab-ce!20717 | ||||
| * | | | | | Change Discussion label to Plan label and add Create label | Victor Wu | 2018-07-20 | 1 | -2/+3 |
|/ / / / / | |||||
* | | | | | Merge branch '45443-unable-to-save-user-profile-update-with-safari' into ↵ | Filipa Lacerda | 2018-07-20 | 5 | -1/+14 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Unable to save user profile update with Safari" Closes #45443 See merge request gitlab-org/gitlab-ce!20676 | ||||
| * | | | | | Add formdata-polyfill45443-unable-to-save-user-profile-update-with-safari | Luke Bennett | 2018-07-20 | 3 | -0/+6 |
| | | | | | | |||||
| * | | | | | Merge remote-tracking branch 'origin/master' into ↵ | Luke Bennett | 2018-07-19 | 355 | -639/+2441 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | 45443-unable-to-save-user-profile-update-with-safari | ||||
| * | | | | | add changelog entry | Luke Bennett | 2018-07-17 | 1 | -0/+5 |
| | | | | | | |||||
| * | | | | | Delete unneeded user avatar formData | Luke Bennett | 2018-07-17 | 1 | -1/+3 |
| | | | | | | |||||
* | | | | | | Merge branch 'docs/fix-indent-problem-in-mysql_to_postgresql' into 'master' | Stan Hu | 2018-07-20 | 1 | -6/+6 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Fix indent problem in mysql_to_postgresql.md See merge request gitlab-org/gitlab-ce!20736 | ||||
| * | | | | | | Doc: Fix indent problem in mysql_to_postgresql.md | Miao Wang | 2018-07-20 | 1 | -6/+6 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'fj-49014-wiki-search-error' into 'master' | Sean McGivern | 2018-07-20 | 3 | -7/+70 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing bug with wiki ref in ProjectSearchResults Closes #49014 See merge request gitlab-org/gitlab-ce!20722 | ||||
| * | | | | | | | Fixing bug with wiki ref in ProjectSearchResults | Francisco Javier López | 2018-07-20 | 3 | -7/+70 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch '45230-bootsnap-for-development' into 'master' | Douwe Maan | 2018-07-20 | 4 | -0/+14 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables Bootsnap to GitLab (development) Closes #45230 See merge request gitlab-org/gitlab-ce!20743 | ||||
| * | | | | | | | Add bootsnap to development/test bundle and enable it if available | Gabriel Mazetto | 2018-07-20 | 4 | -0/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will enable bootsnap whenver the gem is available. | ||||
* | | | | | | | | Merge branch '23705-add-single-file-download-in-repo' into 'master' | Douwe Maan | 2018-07-20 | 6 | -21/+26 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Ability to download single file" Closes #23705 See merge request gitlab-org/gitlab-ce!20480 | ||||
| * | | | | | | | | Refactor code for single file download in repository | Kia Mei Somabes | 2018-07-18 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Refactor code for single file download in repository | Kia Mei Somabes | 2018-07-18 | 1 | -0/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Refactor code for single file download in repository | Kia Mei Somabes | 2018-07-13 | 5 | -18/+17 |
| | | | | | | | | | |||||
| * | | | | | | | | Set content-disposition header for single file download in repository | Kia Mei Somabes | 2018-07-12 | 4 | -15/+13 |
| | | | | | | | | | |||||
| * | | | | | | | | Add single file download in repository | Kia Mei Somabes | 2018-07-09 | 3 | -11/+17 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'fix/gb/fix-deserializing-ci-yaml-variables' into 'master' | Kamil Trzciński | 2018-07-20 | 6 | -6/+48 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix deserializing YAML variables when a build has been imported Closes #49406 See merge request gitlab-org/gitlab-ce!20713 | ||||
| * | | | | | | | | Fix Rubocop offense in build_spec.rb :cop: | Grzegorz Bizon | 2018-07-20 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix passing a hash with string keys when fabricating a variable | Grzegorz Bizon | 2018-07-19 | 2 | -1/+9 |
| | | | | | | | | | |||||
| * | | | | | | | | Add changelog for accessing imported builds fix | Grzegorz Bizon | 2018-07-19 | 1 | -0/+5 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix deserializing yaml variables in imported projects | Grzegorz Bizon | 2018-07-19 | 3 | -5/+34 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'zj-remove-refs-cleanup' into 'master' | Kamil Trzciński | 2018-07-20 | 1 | -23/+0 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove refs cleanup job See merge request gitlab-org/gitlab-ce!20716 |