summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add changelog entry43011-typecast-markdownversion-prop-notesappKushal Pandya2018-07-241-0/+5
* Use `parseInt` to convert markdownVersion into numberKushal Pandya2018-07-241-1/+1
* Merge branch 'fix-theme-index' into 'master'Douwe Maan2018-07-231-8/+8
|\
| * Fix theme index to match realityBalasankar "Balu" C2018-07-231-8/+8
* | Merge branch 'update-team-labels-manage-docs' into 'master'Douwe Maan2018-07-231-2/+2
|\ \
| * | Correct label sequenceAndreas Kämmerle2018-07-201-1/+1
| * | Update CONTRIBUTING.mdAndreas Kämmerle2018-07-201-2/+2
* | | Merge branch 'fj-48123-fix-gitlab-import' into 'master'Douwe Maan2018-07-239-20/+135
|\ \ \
| * | | 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
|\ \ \
| * | | 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
|\ \ \ \
| * | | | Disable SAML if OmniAuth is disabled48932-disable-saml-if-omniauth-is-disabledLin Jen-Shin2018-07-2012-38/+41
* | | | | Merge branch '49341-show-runner-overflow' into 'master'Phil Hughes2018-07-231-1/+0
|\ \ \ \ \
| * | | | | 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
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | 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 docsVictor Wu2018-07-221-0/+0
|/ / / / /
* | | | | Merge branch 'milestones-update-docs' into 'master'Mike Lewis2018-07-223-0/+0
|\ \ \ \ \
| * | | | | Update docs milestonesVictor Wu2018-07-223-0/+0
|/ / / / /
* | | | | Merge branch '6104-extract-ee-specific-files-lines-for-some-platform-related-...Robert Speicher2018-07-208-39/+54
|\ \ \ \ \
| * | | | | 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
| * | | | | Reduce CE/EE difference in app/views/projects/services/prometheus/_show.html....Rémy Coutable2018-07-173-33/+36
| * | | | | Reduce CE/EE difference in app/views/projects/protected_tags/_protected_tag.h...Rémy Coutable2018-07-174-6/+16
* | | | | | Merge branch 'sh-bring-json-logger-to-ce' into 'master'Robert Speicher2018-07-202-0/+51
|\ \ \ \ \ \
| * | | | | | Bring JsonLogger to CEStan Hu2018-07-202-0/+51
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '_acet-fix-spec' into 'master'Tim Zallmann2018-07-201-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | 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
|\ \ \ \ \ \
| * | | | | | 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 discuss...André Luís2018-07-2011-68/+412
|/ / / / / / /
* | | | | | | Merge branch 'jupyter-image' into 'master'Dmitriy Zaporozhets2018-07-203-1/+7
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | 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 ju...Amit Rathi2018-07-200-0/+0
| |\ \ \ \ \ \
| | * | | | | | 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 labelVictor Wu2018-07-201-2/+3
|/ / / / / / /
* | | | | | | Merge branch '45443-unable-to-save-user-profile-update-with-safari' into 'mas...Filipa Lacerda2018-07-205-1/+14
|\ \ \ \ \ \ \
| * | | | | | | Add formdata-polyfill45443-unable-to-save-user-profile-update-with-safariLuke Bennett2018-07-203-0/+6
| * | | | | | | Merge remote-tracking branch 'origin/master' into 45443-unable-to-save-user-p...Luke Bennett2018-07-19355-639/+2441
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| * | | | | | | 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
|\ \ \ \ \ \ \ \
View Lorry Controller Status