summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix gitlab import project loadFrancisco Javier López2018-07-239-20/+135
|
* Merge branch 'rs-web_url-for-pipelines-and-jobs' into 'master'Douwe Maan2018-07-238-18/+50
|\ | | | | | | | | Expose web_url attribute in PipelineBasic and JobBasic See merge request gitlab-org/gitlab-ce!20703
| * Ensure a job preloads the project's namespace to avoid N+1Robert Speicher2018-07-201-1/+1
| |
| * Ensure basic pipeline schema matches new definitionRobert Speicher2018-07-201-2/+4
| |
| * Expose web_url attribute in PipelineBasic and JobBasicrs-web_url-for-pipelines-and-jobsRobert Speicher2018-07-186-15/+45
| |
* | Merge branch '48932-disable-saml-if-omniauth-is-disabled' into 'master'Douwe Maan2018-07-2312-38/+41
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Disable SAML and Bitbucket if OmniAuth is disabled" Closes #48932 See merge request gitlab-org/gitlab-ce!20608
| * | Disable SAML if OmniAuth is disabled48932-disable-saml-if-omniauth-is-disabledLin Jen-Shin2018-07-2012-38/+41
| | | | | | | | | | | | | | | We also try to unify the way we setup OmniAuth, and how we check if it's enabled or not.
* | | Merge branch '49341-show-runner-overflow' into 'master'Phil Hughes2018-07-231-1/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Admin > Runners > Edit page overflows screen" Closes #49341 See merge request gitlab-org/gitlab-ce!20757
| * | | Add container to show runner pageAnnabel Dunstone Gray2018-07-201-1/+0
| | | |
* | | | Merge branch '46126-project-counters-space' into 'master'Phil Hughes2018-07-231-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Uneven spaces between project page counters" Closes #46126 See merge request gitlab-org/gitlab-ce!20753
| * | | | Remove extra whitespace in star project buttonAnnabel Dunstone Gray2018-07-201-1/+1
| | | | |
* | | | | Merge branch 'update-mr-img-docs' into 'master'48773-gitlab-project-import-should-use-object-storageMike Lewis2018-07-221-0/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update merge_request.png in docs See merge request gitlab-org/gitlab-ce!20730
| * | | | | Update merge_request.png in docsVictor Wu2018-07-221-0/+0
|/ / / / /
* | | | | Merge branch 'milestones-update-docs' into 'master'Mike Lewis2018-07-223-0/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update docs milestones See merge request gitlab-org/gitlab-ce!20731
| * | | | | Update docs milestonesVictor Wu2018-07-223-0/+0
|/ / / / /
* | | | | Merge branch ↵Robert Speicher2018-07-208-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-viewsRémy Coutable2018-07-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Reduce CE/EE difference in ↵Rémy Coutable2018-07-173-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 Coutable2018-07-174-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 Speicher2018-07-202-0/+51
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring JsonLogger to CE See merge request gitlab-org/gitlab-ce!20755
| * | | | | | Bring JsonLogger to CEStan Hu2018-07-202-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 Zallmann2018-07-201-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 Acet2018-07-201-2/+2
| | | | | |
* | | | | | Merge branch '47530-replace-label-light-with-label-bold' into 'master'Clement Ho2018-07-2067-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 lightAnnabel Dunstone Gray2018-07-1967-190/+190
| | | | | | |
* | | | | | | Merge branch '48817-fix-mr-changes-discussion-navigation' into 'master'Filipa Lacerda2018-07-2011-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ís2018-07-2011-68/+412
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | discussions"
* | | | | | | Merge branch 'jupyter-image' into 'master'Dmitriy Zaporozhets2018-07-203-1/+7
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | Specify Jupyter Image to use with JupyterHub Installation See merge request gitlab-org/gitlab-ce!20714
| * | | | | | Better chengelog for jupyter image changeAmit Rathi2018-07-201-1/+1
| | | | | | |
| * | | | | | Adds a note in the documentation about custom Jupyter ImageAmit Rathi2018-07-201-1/+1
| | | | | | |
| * | | | | | Updated changelog with author name and merge request idAmit Rathi2018-07-201-2/+2
| | | | | | |
| * | | | | | Merge branch 'jupyter-image' of https://gitlab.com/amit1rrr/gitlab-ce into ↵Amit Rathi2018-07-200-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | jupyter-image
| | * | | | | | Specify Jupyter Image to use with JupyterHub InstallationAmit Rathi2018-07-191-0/+1
| | | | | | | |
| * | | | | | | Specify Jupyter Image to use with JupyterHub InstallationAmit Rathi2018-07-202-0/+6
| |/ / / / / /
* | | | | | | Merge branch 'change-discussion-label-to-plan-label' into 'master'Sean McGivern2018-07-201-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 labelVictor Wu2018-07-201-2/+3
|/ / / / / / /
* | | | | | | Merge branch '45443-unable-to-save-user-profile-update-with-safari' into ↵Filipa Lacerda2018-07-205-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-safariLuke Bennett2018-07-203-0/+6
| | | | | | | |
| * | | | | | | Merge remote-tracking branch 'origin/master' into ↵Luke Bennett2018-07-19355-639/+2441
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | 45443-unable-to-save-user-profile-update-with-safari
| * | | | | | | add changelog entryLuke Bennett2018-07-171-0/+5
| | | | | | | |
| * | | | | | | Delete unneeded user avatar formDataLuke Bennett2018-07-171-1/+3
| | | | | | | |
* | | | | | | | Merge branch 'docs/fix-indent-problem-in-mysql_to_postgresql' into 'master'Stan Hu2018-07-201-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.mdMiao Wang2018-07-201-6/+6
| | | | | | | | |
* | | | | | | | | Merge branch 'fj-49014-wiki-search-error' into 'master'Sean McGivern2018-07-203-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 ProjectSearchResultsFrancisco Javier López2018-07-203-7/+70
|/ / / / / / / / /
* | | | | | | | | Merge branch '45230-bootsnap-for-development' into 'master'Douwe Maan2018-07-204-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 availableGabriel Mazetto2018-07-204-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will enable bootsnap whenver the gem is available.
* | | | | | | | | | Merge branch '23705-add-single-file-download-in-repo' into 'master'Douwe Maan2018-07-206-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 repositoryKia Mei Somabes2018-07-181-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Refactor code for single file download in repositoryKia Mei Somabes2018-07-181-0/+2
| | | | | | | | | | |
View Lorry Controller Status