summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix changeloghighlight-blameDouwe Maan2016-01-281-3/+1
* Merge branch 'master' into highlight-blameDouwe Maan2016-01-2845-95/+147
|\
| * Merge branch 'numbered-list-rendering-in-comments-cuts-off' into 'master' Dmitriy Zaporozhets2016-01-281-1/+1
| |\
| | * Makes ol margin big enough for 3 digits.numbered-list-rendering-in-comments-cuts-offJacob Schatz2016-01-251-1/+1
| * | Merge branch 'feature/jschatz1/instant-issuable-history' into 'master' Dmitriy Zaporozhets2016-01-282-0/+4
| |\ \
| | * | Adds comment about event listenerfeature/jschatz1/instant-issuable-historyJacob Schatz2016-01-261-0/+1
| | * | Adds feature: Ajax Close/Open updates discussion automaticallyJacob Schatz2016-01-262-0/+3
| | |/
| * | Update gitlab-workhorse versions in documentationRobert Speicher2016-01-272-2/+2
| * | Update CHANGELOGRobert Speicher2016-01-271-4/+2
| * | Merge branch 'update-ruby-2.2.4' into 'master' Douwe Maan2016-01-2711-22/+44
| |\ \
| | * | updated README to include Ruby 2.1James Lopez2016-01-271-1/+1
| | * | merge spec and spinach jobsJames Lopez2016-01-271-97/+4
| | * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into update-ruby-2.2.4James Lopez2016-01-2798-452/+1134
| | |\ \
| | * | | update gitlab ci settings to include ruby 2.1 imagesJames Lopez2016-01-271-0/+116
| | * | | updated docs to reflect min requirement of 2.1 [ci skip]James Lopez2016-01-272-2/+2
| | * | | updated docs to reflect version update [ci skip]James Lopez2016-01-253-4/+3
| | * | | fix rubocop new 2.2 syntax issuesJames Lopez2016-01-253-8/+8
| | * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into update-ruby-2.2.4James Lopez2016-01-2587-804/+10965
| | |\ \ \
| | * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into update-ruby-2.2.4James Lopez2016-01-22168-834/+2997
| | |\ \ \ \
| | * | | | | update gitlab ci docker image versionJames Lopez2016-01-211-0/+1
| | * | | | | update Ruby version to 2.2.4 (latest previous stable) and update docsJames Lopez2016-01-215-9/+9
| * | | | | | Merge branch 'events-performance' into 'master' Robert Speicher2016-01-279-41/+14
| |\ \ \ \ \ \
| | * | | | | | Use Atom update times of the first eventevents-performanceYorick Peterse2016-01-277-34/+5
| | * | | | | | Don't pluck project IDs for eventsYorick Peterse2016-01-265-10/+12
| * | | | | | | Merge branch 'rs-skip-2fa-on-signout' into 'master' Robert Speicher2016-01-272-0/+4
| |\ \ \ \ \ \ \
| | * | | | | | | Update CHANGELOGRobert Speicher2016-01-271-0/+2
| | * | | | | | | Skip the 2FA requirement during logoutrs-skip-2fa-on-signoutRobert Speicher2016-01-231-0/+2
| * | | | | | | | Merge branch 'diff-colors' into 'master' Robert Speicher2016-01-275-8/+9
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Increase contrast between highlighted code comments and inline diff marker.diff-colorsDouwe Maan2016-01-275-8/+9
| | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Merge branch 'fix-ci-runners-version-update' into 'master' Robert Speicher2016-01-277-6/+42
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix CI runner version not being properly updated when asking for a buildfix-ci-runners-version-updateKamil Trzcinski2016-01-277-6/+42
| * | | | | | | | | Merge branch 'fix/unexistent-group-500' into 'master' Robert Speicher2016-01-274-0/+10
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/unexistent-...James Lopez2016-01-2730-141/+472
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | * | | | | | | | | moved and refactored feature based on feedback. Also updated CHANGELOGJames Lopez2016-01-275-9/+9
| | * | | | | | | | | update fix based on feedbackJames Lopez2016-01-271-2/+1
| | * | | | | | | | | fix for failing specJames Lopez2016-01-261-1/+2
| | * | | | | | | | | feature and fix for 500 on group missingJames Lopez2016-01-263-0/+10
| | | |_|_|/ / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'rs-require-jquery-ui' into 'master' Dmitriy Zaporozhets2016-01-271-1/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Limit jquery-ui requires to what we actually users-require-jquery-uiRobert Speicher2016-01-251-1/+4
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Merge branch 'rs-2fa-requirement-wording' into 'master' Dmitriy Zaporozhets2016-01-272-7/+7
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Update wording for 2FA requirement noticers-2fa-requirement-wordingRobert Speicher2016-01-232-7/+7
| | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'rs-issue-12672' into 'master' Dmitriy Zaporozhets2016-01-271-2/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Remove link from system hookrs-issue-12672Robert Speicher2016-01-241-2/+1
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Merge branch 'rs-bump-octokit' into 'master' Dmitriy Zaporozhets2016-01-272-3/+3
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Bump octokit to `~> 3.8.0`rs-bump-octokitRobert Speicher2016-01-212-3/+3
| * | | | | | | | | | Merge branch 'hot-reloading' into 'master' Douwe Maan2016-01-271-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| | * | | | | | | | | Fix hot reloading for CI APIhot-reloadingKamil Trzcinski2016-01-261-1/+1
* | | | | | | | | | | Move blame group logic to dedicated classDouwe Maan2016-01-285-43/+81
* | | | | | | | | | | Fix highlighting in blame view.Douwe Maan2016-01-273-4/+7
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'doc_forking_refactor' into 'master' Achilleas Pipinellis2016-01-276-18/+41
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
View Lorry Controller Status