Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | Add changelog for duplicate branch bug in mr version featuredz-improve-mr-versions | Dmitriy Zaporozhets | 2016-09-28 | 1 | -0/+1 | |
| * | | | | | | | Fix duplicate master entries in the mr versions dropdown | Dmitriy Zaporozhets | 2016-09-28 | 1 | -5/+5 | |
* | | | | | | | | Merge branch '22202-reduce-duplication-in-gitlab-diff-position_tracer' into '... | Douwe Maan | 2016-09-28 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Tell Flay to ignore Gitlab::Diff::PositionTracer22202-reduce-duplication-in-gitlab-diff-position_tracer | Rémy Coutable | 2016-09-27 | 1 | -0/+1 | |
* | | | | | | | | | Merge branch '22679-avoid-abstract-reference-filter-project-requests' into 'm... | Yorick Peterse | 2016-09-28 | 3 | -5/+22 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | AbstractReferenceFilter caches current project_ref on RequestStore when active22679-avoid-abstract-reference-filter-project-requests | Paco Guzman | 2016-09-28 | 3 | -5/+22 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'add-university-content' into 'master' | Achilleas Pipinellis | 2016-09-28 | 23 | -0/+1648 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Resolve merge request commentsadd-university-content | Sean Packham | 2016-09-28 | 1 | -5/+5 | |
| * | | | | | | | | Fix links | Sean Packham | 2016-09-27 | 1 | -3/+3 | |
| * | | | | | | | | Resolve merge request comments | Sean Packham | 2016-09-27 | 4 | -35/+27 | |
| * | | | | | | | | Merge branch 'master' into add-university-content | Sean Packham | 2016-09-27 | 12 | -27/+212 | |
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | ||||||
| * | | | | | | | | Readded images | Sean Packham | 2016-09-27 | 15 | -0/+0 | |
| * | | | | | | | | Removed lfs | Sean Packham | 2016-09-27 | 16 | -46/+0 | |
| * | | | | | | | | Fix lint error | Sean Packham | 2016-09-27 | 1 | -1/+1 | |
| * | | | | | | | | Migrate university to use lfs for images | Sean Packham | 2016-09-27 | 16 | -0/+1 | |
| * | | | | | | | | Merge branch 'master' into add-university-content | Sean Packham | 2016-09-27 | 78 | -223/+575 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Added University content | Sean Packham | 2016-09-26 | 1 | -0/+1 | |
| * | | | | | | | | | Merge branch 'master' into add-university-content | Sean Packham | 2016-09-26 | 32 | -156/+384 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Imported GitLab University content | seanpackham | 2016-09-23 | 23 | -0/+1655 | |
* | | | | | | | | | | | Merge branch '22681-avoid-empty-queries-on-reference-parsers' into 'master' | Yorick Peterse | 2016-09-28 | 2 | -1/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Avoid database queries on Banzai::ReferenceParser::BaseParser for nodes witho...22681-avoid-empty-queries-on-reference-parsers | Paco Guzman | 2016-09-28 | 2 | -1/+6 | |
* | | | | | | | | | | | | Merge branch 'bbodenmiller/gitlab-ce-patch-2' into 'master' | Rémy Coutable | 2016-09-28 | 1 | -0/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Add footnote to Markdown docs | Ben Bodenmiller | 2016-09-28 | 1 | -0/+10 | |
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'zj-bundle-quiet-mode' into 'master' | Robert Speicher | 2016-09-28 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Reduce output to the build logzj-bundle-quiet-mode | Z.J. van de Weg | 2016-09-28 | 1 | -1/+1 | |
* | | | | | | | | | | | | Merge branch 'hvlad/gitlab-ce-feature/add_test_for_git_http_ldap_user' into '... | Rémy Coutable | 2016-09-28 | 2 | -324/+381 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Added git http requests tests for user with LDAP identity | Horatiu Eugen Vlad | 2016-09-28 | 2 | -324/+381 | |
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'siemens/gitlab-ce-fix/ldap-access-errors' into 'master' | Rémy Coutable | 2016-09-28 | 5 | -5/+44 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Log LDAP lookup errors and don't swallow unrelated exceptions | Markus Koller | 2016-09-28 | 5 | -5/+44 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge branch 'glensc/gitlab-ce-ruby-prof-0.16' into 'master' | Rémy Coutable | 2016-09-28 | 3 | -3/+4 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Bump ruby prof to 0.16 | Elan Ruusamäe | 2016-09-28 | 3 | -3/+4 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'is-v-cloak-causing-master-to-fail-pls-no-why' into 'master' | Jacob Schatz | 2016-09-28 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | ||||||
| * | | | | | | | | Remove test for Ruby 2.1. | Jacob Schatz | 2016-09-27 | 1 | -2/+2 | |
| * | | | | | | | | Run Ruby 2.1 tests on non-master branches too.is-v-cloak-causing-master-to-fail-pls-no-why | Connor Shea | 2016-09-27 | 1 | -2/+2 | |
| * | | | | | | | | Changed to hash rocket and string 'true' | Luke Bennett | 2016-09-27 | 1 | -1/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge branch 'label-update-check-new' into 'master' | Jacob Schatz | 2016-09-27 | 4 | -8/+35 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Send ajax request for label update only if they are changed (#19472 !5071)label-update-check-new | Phil Hughes | 2016-09-27 | 4 | -8/+35 | |
* | | | | | | | | | Merge branch 'fix/optimize-github-importer-for-speed-and-memory' into 'master' | Yorick Peterse | 2016-09-27 | 5 | -78/+87 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Call after_remove_branch only once after importing all GitHub PRsfix/optimize-github-importer-for-speed-and-memory | Ahmad Sherif | 2016-09-27 | 2 | -2/+3 | |
| * | | | | | | | | | Import all GitHub comments after importing issues and PRs | Ahmad Sherif | 2016-09-27 | 2 | -12/+17 | |
| * | | | | | | | | | Speed up label-applying process for GitHub importing | Ahmad Sherif | 2016-09-27 | 2 | -14/+15 | |
| * | | | | | | | | | Process each page of GitHub resources instead of concating them then processing | Ahmad Sherif | 2016-09-27 | 3 | -56/+58 | |
| | |_|_|_|/ / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch '22472-wrong-table-head' into 'master' | Fatih Acet | 2016-09-27 | 1 | -7/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Removed stages loop for a single 'Stages' header22472-wrong-table-head | Luke Bennett | 2016-09-27 | 1 | -7/+1 | |
| | |_|_|_|_|/ / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'includes-projects-to-render-issue-notes' into 'master' | Yorick Peterse | 2016-09-27 | 2 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Fix IssuesController#show degradation including project on loaded notesincludes-projects-to-render-issue-notes | Paco Guzman | 2016-09-27 | 2 | -1/+2 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'add-calendar-tests' into 'master' | Jacob Schatz | 2016-09-27 | 2 | -9/+101 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Add more tests for calendar contribution | Clement Ho | 2016-09-26 | 2 | -9/+101 | |
* | | | | | | | | | Merge branch '22053-bump-gitlab-shell-to-have-git-trace' into 'master' | Rémy Coutable | 2016-09-27 | 2 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Use gitlab-shell v3.6.2 (GIT TRACE logging)22053-bump-gitlab-shell-to-have-git-trace | Paco Guzman | 2016-09-26 | 2 | -1/+2 |