summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update warn message for MySQL fixmrchrisw/mysql-connection-warnChris Wilson2016-09-281-1/+1
* Merge branch '22352-cannot-install-gitlab-shell-on-ubuntu-server-with-no-prev...Robert Speicher2016-09-281-1/+1
|\
| * [ci-skip] Correct gitlab-shell installation instructions in docs22352-cannot-install-gitlab-shell-on-ubuntu-server-with-no-previous-gitlab-installAlejandro Rodríguez2016-09-281-1/+1
|/
* Merge branch 'pipelines-for-commit' into 'master' Fatih Acet2016-09-2810-21/+39
|\
| * Rearranged commit tabs and changed commit `Commit` column header to `Pipeline`pipelines-for-commitLuke Bennett2016-09-273-6/+6
| * Update CHANGELOGKamil Trzcinski2016-09-271-0/+1
| * Commit status icon now links to pipelines tab of commit viewLuke Bennett2016-09-273-10/+13
| * Add Pipelines for CommitKamil Trzcinski2016-09-275-9/+23
* | Merge branch 'lfs-ssh-authorization-fix' into 'master' Douwe Maan2016-09-287-21/+47
|\ \
| * | Handle LFS token creation and retrieval in the same method, and in the same R...lfs-ssh-authorization-fixPatricio Cano2016-09-287-24/+21
| * | Do not regenerate the `lfs_token` every time `git-lfs-authenticate` is called...Patricio Cano2016-09-272-0/+29
* | | Merge branch '22592-can-set-due-date-through-slash-commands-even-though-i-m-n...Douwe Maan2016-09-289-66/+216
|\ \ \
| * | | Fix permission for setting an issue's due dateRémy Coutable2016-09-289-66/+216
* | | | Merge branch 'fix-csfr-typo-in-doc' into 'master' Achilleas Pipinellis2016-09-281-8/+8
|\ \ \ \
| * | | | Fix typo `CSFR` -> `CSRF` in the OAuth2 docfix-csfr-typo-in-docRémy Coutable2016-09-271-8/+8
* | | | | Merge branch '18297-i-would-like-text-to-wrap-when-in-edit-mode-on-web-app' i...Fatih Acet2016-09-287-0/+117
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Added CHANGELOG entry.Fatih Acet2016-09-282-0/+3
| * | | | Review changesLuke Bennett2016-09-286-41/+33
| * | | | Added soft wrap logic and button to editorLuke Bennett2016-09-287-2/+124
|/ / / /
* | | | Merge branch 'dz-improve-mr-versions' into 'master' Rémy Coutable2016-09-282-5/+6
|\ \ \ \
| * | | | Add changelog for duplicate branch bug in mr version featuredz-improve-mr-versionsDmitriy Zaporozhets2016-09-281-0/+1
| * | | | Fix duplicate master entries in the mr versions dropdownDmitriy Zaporozhets2016-09-281-5/+5
* | | | | Merge branch '22202-reduce-duplication-in-gitlab-diff-position_tracer' into '...Douwe Maan2016-09-281-0/+1
|\ \ \ \ \
| * | | | | Tell Flay to ignore Gitlab::Diff::PositionTracer22202-reduce-duplication-in-gitlab-diff-position_tracerRémy Coutable2016-09-271-0/+1
* | | | | | Merge branch '22679-avoid-abstract-reference-filter-project-requests' into 'm...Yorick Peterse2016-09-283-5/+22
|\ \ \ \ \ \
| * | | | | | AbstractReferenceFilter caches current project_ref on RequestStore when active22679-avoid-abstract-reference-filter-project-requestsPaco Guzman2016-09-283-5/+22
|/ / / / / /
* | | | | | Merge branch 'add-university-content' into 'master' Achilleas Pipinellis2016-09-2823-0/+1648
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Resolve merge request commentsadd-university-contentSean Packham2016-09-281-5/+5
| * | | | | Fix linksSean Packham2016-09-271-3/+3
| * | | | | Resolve merge request commentsSean Packham2016-09-274-35/+27
| * | | | | Merge branch 'master' into add-university-contentSean Packham2016-09-2712-27/+212
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Readded imagesSean Packham2016-09-2715-0/+0
| * | | | | Removed lfsSean Packham2016-09-2716-46/+0
| * | | | | Fix lint errorSean Packham2016-09-271-1/+1
| * | | | | Migrate university to use lfs for imagesSean Packham2016-09-2716-0/+1
| * | | | | Merge branch 'master' into add-university-contentSean Packham2016-09-2778-223/+575
| |\ \ \ \ \
| * | | | | | Added University contentSean Packham2016-09-261-0/+1
| * | | | | | Merge branch 'master' into add-university-contentSean Packham2016-09-2632-156/+384
| |\ \ \ \ \ \
| * | | | | | | Imported GitLab University contentseanpackham2016-09-2323-0/+1655
* | | | | | | | Merge branch '22681-avoid-empty-queries-on-reference-parsers' into 'master' Yorick Peterse2016-09-282-1/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Avoid database queries on Banzai::ReferenceParser::BaseParser for nodes witho...22681-avoid-empty-queries-on-reference-parsersPaco Guzman2016-09-282-1/+6
* | | | | | | | | Merge branch 'bbodenmiller/gitlab-ce-patch-2' into 'master' Rémy Coutable2016-09-281-0/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add footnote to Markdown docsBen Bodenmiller2016-09-281-0/+10
* | | | | | | | | | Merge branch 'zj-bundle-quiet-mode' into 'master' Robert Speicher2016-09-281-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Reduce output to the build logzj-bundle-quiet-modeZ.J. van de Weg2016-09-281-1/+1
* | | | | | | | | | Merge branch 'hvlad/gitlab-ce-feature/add_test_for_git_http_ldap_user' into '...Rémy Coutable2016-09-282-324/+381
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Added git http requests tests for user with LDAP identityHoratiu Eugen Vlad2016-09-282-324/+381
* | | | | | | | | | Merge branch 'siemens/gitlab-ce-fix/ldap-access-errors' into 'master' Rémy Coutable2016-09-285-5/+44
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Log LDAP lookup errors and don't swallow unrelated exceptionsMarkus Koller2016-09-285-5/+44
| |/ / / / / / / /
* | | | | | | | | Merge branch 'glensc/gitlab-ce-ruby-prof-0.16' into 'master' Rémy Coutable2016-09-283-3/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
View Lorry Controller Status