summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into ce-to-eece-to-eeValery Sizov2015-11-1632-108/+1290
|\
| * Merge branch 'ci-runners-master-or-owner' into 'master' Dmitriy Zaporozhets2015-11-163-6/+22
| |\
| | * Show specific runners from projects where user is master or ownerci-runners-master-or-ownerKamil Trzcinski2015-11-163-6/+22
| * | Merge branch 'refactor-duplication' into 'master' Dmitriy Zaporozhets2015-11-167-93/+46
| |\ \
| | * | Fix wrong variable namerefactor-duplicationDmitriy Zaporozhets2015-11-161-2/+2
| | * | Remove duplicate code in Repository#*_names_containsDmitriy Zaporozhets2015-11-161-16/+7
| | * | Fix code duplication in NotificationsHelperDmitriy Zaporozhets2015-11-161-25/+13
| | * | Set less strict flay option for nowDmitriy Zaporozhets2015-11-161-1/+1
| | * | Remove duplicate methods in uploadersDmitriy Zaporozhets2015-11-164-51/+25
| | |/
| * | Merge branch 'lfs' into 'master' Dmitriy Zaporozhets2015-11-1623-13/+1226
| |\ \ | | |/ | |/|
| | * Add support for git lfs.lfsMarin Jankovski2015-11-1623-13/+1226
| |/
* | fix testsValery Sizov2015-11-162-10/+13
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into ce-to-eeValery Sizov2015-11-161-0/+91
|\ \
| * \ Merge branch 'rs-update-guides' into 'master' Robert Speicher2015-11-131-0/+91
| |\ \
| | * | Add 8.2 CE-to-EE update guideRobert Speicher2015-11-131-0/+91
| |/ /
* | | Merge remote-tracking branch 'origin/master' into ce-to-eeValery Sizov2015-11-1618-214/+382
|\ \ \ | | |/ | |/|
| * | Merge branch 'test_env_cache' into 'master' Valery Sizov2015-11-162-9/+13
| |\ \
| | * | Disabling cache for test environmentValery Sizov2015-11-162-9/+13
| * | | Merge branch 'fix_trailing_title_space' of https://gitlab.com/dblessing/gitla...Dmitriy Zaporozhets2015-11-163-2/+7
| |\ \ \
| | * | | Fix trailing space issue with merge requests and issues. Fixes #2514Drew Blessing2015-11-103-2/+7
| * | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2015-11-163-28/+21
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge branch 'releases-feature'Dmitriy Zaporozhets2015-11-1614-203/+362
| |\ \ \ \
| | * | | | Improve english textreleases-featureDmitriy Zaporozhets2015-11-162-7/+7
| | * | | | Add api test for creating tag with release infoDmitriy Zaporozhets2015-11-121-0/+13
| | * | | | Add API docs and correctly expose release apiDmitriy Zaporozhets2015-11-123-26/+57
| | * | | | Expose release notes to tags apiDmitriy Zaporozhets2015-11-122-5/+31
| | * | | | Add releases apiDmitriy Zaporozhets2015-11-123-2/+36
| | * | | | Add grape routing printDmitriy Zaporozhets2015-11-121-0/+8
| | * | | | Move git tags API to separate fileDmitriy Zaporozhets2015-11-127-184/+209
| | * | | | Add release notes documentationDmitriy Zaporozhets2015-11-124-0/+21
| | * | | | Fix changelog itemDmitriy Zaporozhets2015-11-121-0/+1
* | | | | | Merge branch 'master' into ce-to-eeValery Sizov2015-11-163-39/+30
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'rs-revert-gh-9812' into 'master' Valery Sizov2015-11-161-27/+19
| |\ \ \ \ \
| | * | | | | Revert "Merge pull request #9812 from chrspeich/hide-tabs-lone-auth-provider"rs-revert-gh-9812Robert Speicher2015-11-151-27/+19
| |/ / / / /
| * | | | | Merge branch 'relative_links_default_branch' into 'master' Robert Speicher2015-11-152-1/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Relative links in the README file shown on the repository homepage should pointAlec Cooper2015-11-142-1/+2
| |/ / / /
* | | | | Merge remote-tracking branch 'ce/master' into ce-to-eeRobert Speicher2015-11-1582-279/+562
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'impersonate' into 'master' Dmitriy Zaporozhets2015-11-149-35/+88
| |\ \ \ \
| | * | | | refactor login as to be impersonation with better login/logoutJames Newton2015-10-299-35/+88
| * | | | | Merge branch 'annotate-models' into 'master' Dmitriy Zaporozhets2015-11-1448-96/+311
| |\ \ \ \ \
| | * | | | | Annotate modelsDmitriy Zaporozhets2015-11-1348-96/+311
| * | | | | | Merge branch 'builds_feature' into 'master' Kamil TrzciƄski2015-11-1327-144/+139
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fix caching breaking test of build artifactsbuilds_featureKamil Trzcinski2015-11-131-6/+3
| | * | | | | Fix broken testsKamil Trzcinski2015-11-137-113/+43
| | * | | | | Expose CI enable option in project featuresKamil Trzcinski2015-11-1320-25/+93
* | | | | | | Merge remote-tracking branch 'ce/master' into ce-to-eeRobert Speicher2015-11-13258-925/+4106
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | Merge branch 'refactor-complex-methods' into 'master' Dmitriy Zaporozhets2015-11-138-155/+200
| |\ \ \ \ \
| | * | | | | Move spec to proper place and fix unused variablerefactor-complex-methodsDmitriy Zaporozhets2015-11-132-1/+0
| | * | | | | Don't allow flog failure any moreDmitriy Zaporozhets2015-11-131-1/+0
| | * | | | | Even more refactoring to inline_diff.rbDmitriy Zaporozhets2015-11-131-16/+23