summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix review commentsfix-commit-status-renderingKamil Trzcinski2016-03-146-25/+27
* Fix commit_spec: invalid validationKamil Trzcinski2016-03-141-1/+1
* Cleanup CiCommit and CiBuildKamil Trzcinski2016-03-1418-304/+174
* Merge branch 'improve-issues-filter-all-spec' into 'master' Dmitriy Zaporozhets2016-03-142-9/+6
|\
| * Use Capybara find methods and remove sleeps in feature specs in "All Issues" ...improve-issues-filter-all-specStan Hu2016-03-132-9/+6
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqMarin Jankovski2016-03-145-23/+20
|\ \
| * \ Merge branch 'redirect-host-check' into 'master' Douwe Maan2016-03-135-23/+20
| |\ \
| | * | Fix denting and specZeger-Jan van de Weg2016-03-133-4/+4
| | * | ContinueToParams -> ContinueParamsZeger-Jan van de Weg2016-03-134-4/+5
| | * | Check redirect path in the continue_paramsZeger-Jan van de Weg2016-03-133-21/+17
| |/ /
* | | Merge branch 'upcoming' into 'master' Douwe Maan2016-03-134-0/+14
|\ \ \
| * | | fixes small issuestiagonbotelho2016-03-132-3/+2
| * | | removes tab and replaces with space in changelogtiagonbotelho2016-03-121-0/+1
| * | | adds my name to changelogtiagonbotelho2016-03-121-0/+1
| * | | fixes issuestiagonbotelho2016-03-122-5/+4
| * | | fixes issues for mr acceptancetiagonbotelho2016-03-122-8/+12
| * | | implements upcoming filter in milstonestiagonbotelho2016-03-123-0/+10
* | | | Merge branch 'reduce-example-duplication' into 'master' Sytse Sijbrandij2016-03-133-37/+13
|\ \ \ \
| * | | | Remove duplicate entries.Sytse Sijbrandij2016-03-121-6/+2
| * | | | Reduce example documentation.reduce-example-duplicationSytse Sijbrandij2016-03-103-37/+17
* | | | | Merge branch 'revert-5a586f36' into 'master' Douwe Maan2016-03-126-16/+82
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Revert "Revert "Merge branch 'support-go-subpackages' into 'master' ""Stan Hu2016-03-126-16/+82
|/ / / /
* | | | Merge branch 'remove-goget-spec' into 'master' Douwe Maan2016-03-121-13/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove unnecessary go-get test (superseded by middleware)Stan Hu2016-03-121-13/+0
|/ / /
* | | Revert "Merge branch 'support-go-subpackages' into 'master' "Douwe Maan2016-03-126-82/+16
* | | Merge branch 'support-go-subpackages' into 'master' Douwe Maan2016-03-126-16/+82
|\ \ \ | |_|/ |/| |
| * | Ensure PATH_INFO exists for go-getStan Hu2016-03-121-1/+1
| * | Add spec for go-import middlewareStan Hu2016-03-121-0/+30
| * | Simplify codeStan Hu2016-03-121-4/+3
| * | Remove existing go_import.html.haml implementationStan Hu2016-03-122-16/+0
| * | Support Golang subpackage fetchingsupport-go-subpackagesStan Hu2016-03-123-0/+53
* | | Merge branch 'projects-finder-ee-compatible' into 'master' Dmitriy Zaporozhets2016-03-122-7/+4
|\ \ \
| * | | Removed User#project_relationsprojects-finder-ee-compatibleYorick Peterse2016-03-122-7/+4
* | | | Merge branch 'filter-import-url' into 'master' Douwe Maan2016-03-121-1/+1
|\ \ \ \
| * | | | Filter import_url params because they may contain auth information. Fixes #14199filter-import-urlJosh Frye2016-03-101-1/+1
| | |/ / | |/| |
* | | | Merge branch 'fix-gh-pr-import' into 'master' Douwe Maan2016-03-123-45/+40
|\ \ \ \
| * | | | Fix importing PR's from GitHub when the source repo was removedDouglas Barbosa Alexandre2016-03-103-45/+40
* | | | | Merge branch 'rs-disallow-blank-line-code' into 'master' Douwe Maan2016-03-123-1/+23
|\ \ \ \ \
| * | | | | Disallow blank (non-null) values for a Note's `line_code` attributers-disallow-blank-line-codeRobert Speicher2016-03-113-1/+23
* | | | | | Merge branch 'ignore-byebug-history' into 'master' Douwe Maan2016-03-121-0/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Ignore .byebug_historyignore-byebug-historyZeger-Jan van de Weg2016-03-091-0/+1
* | | | | | Merge branch 'fix/token-timing-attack' into 'master' Douwe Maan2016-03-122-3/+3
|\ \ \ \ \ \
| * | | | | | add SHA256 to secure_comparefix/token-timing-attackJames Lopez2016-03-082-3/+3
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/token-timin...James Lopez2016-03-08356-3055/+4414
| |\ \ \ \ \ \
| * | | | | | | fix token issue - timing attackJames Lopez2016-03-022-3/+3
* | | | | | | | Merge branch 'nico-de-ceulaer/gitlab-ce-13865-handle-other-emails-for-avatar-...Douwe Maan2016-03-121-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | ensure also alternative email addresses are used when looking up usernico de ceulaer2016-03-031-1/+1
* | | | | | | | | Merge branch 'fix_responsive_layout_bug' into 'master' Jacob Schatz2016-03-111-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix responsive bug top navigationDennis van de Hoef2016-03-111-1/+1
* | | | | | | | | | Merge branch 'rs-issue-12944' into 'master' Douwe Maan2016-03-113-18/+52
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |