Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Improve and fix specs for raw tracefeature/raw-trace-output | Tomasz Maczukin | 2016-04-19 | 1 | -4/+8 |
* | Use Rails-way to send file by X-Sendfile | Tomasz Maczukin | 2016-04-19 | 1 | -5/+2 |
* | Update CHANGELOG | Tomasz Maczukin | 2016-04-19 | 1 | -0/+1 |
* | Add feature specs for raw trace | Tomasz Maczukin | 2016-04-19 | 3 | -2/+28 |
* | Switch raw trace to use X-Sendfile header | Tomasz Maczukin | 2016-04-19 | 2 | -4/+7 |
* | Add raw trace output for GitLab Workhorse | Tomasz Maczukin | 2016-04-19 | 3 | -1/+13 |
* | Merge remote-tracking branch 'dev/master' into 'master' | Robert Speicher | 2016-04-19 | 2 | -7/+7 |
|\ | |||||
| * | Merge branch 'rs-label-xss' into 'master' | Jacob Schatz | 2016-04-19 | 2 | -7/+7 |
| |\ | |||||
| | * | Remove XSS vulnerability in Label and Milestone dropdowns | Robert Speicher | 2016-04-19 | 2 | -7/+7 |
| |/ | |||||
* | | CLearify shared runner warning. | Sytse Sijbrandij | 2016-04-19 | 1 | -1/+1 |
* | | Merge branch '15139-fix-constants-redefinition-warnings' into 'master' | Robert Speicher | 2016-04-19 | 10 | -17/+6 |
|\ \ | |||||
| * | | Get rid of more requires, which causes warnings when code is reloaded15139-fix-constants-redefinition-warnings | Rémy Coutable | 2016-04-19 | 4 | -12/+7 |
| * | | Remove useless require 'file_size_validator' causing warnings | Rémy Coutable | 2016-04-19 | 6 | -6/+0 |
| * | | Define constants only if not defined yet and freeze them | Rémy Coutable | 2016-04-19 | 2 | -7/+7 |
* | | | Merge branch 'imported-ghe-project-names-links-to-github' into 'master' | Robert Speicher | 2016-04-19 | 4 | -2/+46 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Fix GitHub project's link on import page when provider has a custom URL | Douglas Barbosa Alexandre | 2016-04-19 | 4 | -2/+46 |
* | | | Merge branch 'pmq20/gitlab-ce-issue_12785' | Douwe Maan | 2016-04-19 | 26 | -80/+390 |
|\ \ \ | |||||
| * | | | Add support to cherry-pick any commit | P.S.V.R | 2016-04-18 | 26 | -80/+390 |
* | | | | Merge branch 'mr-formatting' into 'master' | Robert Speicher | 2016-04-19 | 24 | -36/+37 |
|\ \ \ \ | |||||
| * | | | | format merge request references properly | Ben Bodenmiller | 2016-04-18 | 24 | -36/+37 |
* | | | | | Merge branch '14566-confidential-issue-branches' into 'master' | Robert Speicher | 2016-04-19 | 4 | -15/+50 |
|\ \ \ \ \ | |||||
| * | | | | | A new branch created for a confidential issue is named `<id>-confidential-iss...14566-confidential-issue-branches | Timothy Andrew | 2016-04-19 | 2 | -2/+2 |
| * | | | | | Remove unused variable in `IssuesController`. | Timothy Andrew | 2016-04-18 | 1 | -2/+0 |
| * | | | | | Merge remote-tracking branch 'origin/master' into 14566-confidential-issue-br... | Timothy Andrew | 2016-04-15 | 177 | -636/+3115 |
| |\ \ \ \ \ | |||||
| * | | | | | | Make a few style changes based on MR feedback. | Timothy Andrew | 2016-04-15 | 1 | -2/+2 |
| * | | | | | | Merge remote-tracking branch 'origin/master' into 14566-confidential-issue-br... | Timothy Andrew | 2016-04-13 | 96 | -479/+3791 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Update CHANGELOG | Timothy Andrew | 2016-04-13 | 1 | -0/+1 |
| * | | | | | | | Fix the rubocop check. | Timothy Andrew | 2016-04-13 | 1 | -2/+3 |
| * | | | | | | | Test the `Issue#to_branch_name` method. | Timothy Andrew | 2016-04-12 | 1 | -2/+11 |
| * | | | | | | | Augment the tests for `Issue#related_branches` | Timothy Andrew | 2016-04-12 | 1 | -3/+19 |
| * | | | | | | | Refactor `Issue#related_branches` | Timothy Andrew | 2016-04-12 | 3 | -5/+13 |
| * | | | | | | | Sanitize branch names for confidential issues. | Timothy Andrew | 2016-04-12 | 1 | -1/+5 |
* | | | | | | | | Merge branch 'toggle-points-per-packet' into 'master' | Rémy Coutable | 2016-04-19 | 6 | -24/+40 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Configuring of points per UDP packettoggle-points-per-packet | Yorick Peterse | 2016-04-19 | 6 | -24/+40 |
* | | | | | | | | | Merge branch 'bump-version' into 'master' | Yorick Peterse | 2016-04-19 | 2 | -1/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Bump version to 8.8.0-prebump-version | Dmitriy Zaporozhets | 2016-04-19 | 2 | -1/+3 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2016-04-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'patch-1' into 'master' | Hannes Rosenögger | 2016-04-19 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | "git lfs init" is deprecated, use "git lfs install" instead. | Con Vissenberg | 2016-04-18 | 1 | -1/+1 |
| | | |_|_|_|_|_|/ / | | |/| | | | | | | | |||||
* | | | | | | | | | | Merge branch 'rs-issue-15126' into 'master' | Douwe Maan | 2016-04-19 | 6 | -5/+35 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Remove additional misuse of `data-original-title` attribute | Robert Speicher | 2016-04-18 | 3 | -3/+3 |
| * | | | | | | | | | Remove persistent XSS vulnerability in `commit_person_link` helper | Robert Speicher | 2016-04-17 | 3 | -2/+32 |
* | | | | | | | | | | Merge branch 'profile-aside-toggle' into 'master' | Jacob Schatz | 2016-04-19 | 1 | -2/+0 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
| * | | | | | | | | | Removed aside toggle on profile pagesprofile-aside-toggle | Phil Hughes | 2016-04-18 | 1 | -2/+0 |
* | | | | | | | | | | Merge branch 'dropdown-filter-after-load' into 'master' | Jacob Schatz | 2016-04-19 | 2 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Trigger filtering after ajax is complete in dropdowndropdown-filter-after-load | Phil Hughes | 2016-04-19 | 2 | -0/+4 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'api-fix-annotated-tags' into 'master' | Rémy Coutable | 2016-04-19 | 3 | -1/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Ensure that annoation is presented properly | Robert Schilling | 2016-04-18 | 1 | -0/+2 |
| * | | | | | | | | | API: Present an array of Gitlab::Git::Tag instead of array of rugged tags | Robert Schilling | 2016-04-17 | 2 | -1/+2 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'docs/notice-about-gitlab-runner' into 'master' | Grzegorz Bizon | 2016-04-19 | 2 | -1/+25 |
|\ \ \ \ \ \ \ \ \ |