summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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 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 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
| * | | Split complex methods in GoogleCodeImport::ImporterDmitriy Zaporozhets2015-11-131-46/+47
| * | | Split complex Gitlab::InlineDiff::processing methodDmitriy Zaporozhets2015-11-131-19/+36
| * | | Split complex method EventsHelper#event_feed_url.Dmitriy Zaporozhets2015-11-131-11/+15
| * | | Split complex method Issues::UpdateService#executeDmitriy Zaporozhets2015-11-131-13/+16
| * | | Split complex method SystemHooksService#build_event_dataDmitriy Zaporozhets2015-11-131-30/+42
| * | | Split huge method MergeRequests::UpdateService#executeDmitriy Zaporozhets2015-11-131-22/+25
* | | | Merge branch 'gitlab-workhorse' into 'master' Kamil Trzciński2015-11-132-0/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Bump the GITLAB_WORKHORSE version to 0.4.1 [ci skip]Kamil Trzcinski2015-11-132-0/+2
|/ / /
* | | Merge pull request #9825 from huacnlee/cache-application-settingDmitriy Zaporozhets2015-11-132-3/+15
|\ \ \
| * | | Add caching for ApplicationSetting, Ci::ApplicationSetting.Jason Lee2015-11-122-3/+15
* | | | Merge pull request #9757 from yms9654/diff-optionStan Hu2015-11-1313-8/+80
|\ \ \ \
| * | | | Add ignore white space option in merge request diffMinsik Yoon2015-11-1313-8/+80
| | |/ / | |/| |
* | | | Merge branch 'omniauth-doc-fix' into 'master' Achilleas Pipinellis2015-11-132-1/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Merge remote-tracking branch 'gitlab/master' into omniauth-doc-fixJon Cairns2015-11-12303-1072/+4720
| |\ \ \
| * | | | Add missing "omniauth" prefix to option in docs [ci skip]Jon Cairns2015-11-122-1/+2
* | | | | Merge branch 'use-path-for-new-issue-button' into 'master' Dmitriy Zaporozhets2015-11-121-1/+1
|\ \ \ \ \
| * | | | | Use a relative link instead of full URL with New Issue button to be consistentStan Hu2015-10-171-1/+1
* | | | | | Merge branch 'fix-avatar-not-showing' of https://gitlab.com/stanhu/gitlab-ceDmitriy Zaporozhets2015-11-125-4/+5
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix avatars not showing in Atom feeds and project issues when Gravatar disabledStan Hu2015-11-105-4/+5
* | | | | | Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-listDmitriy Zaporozhets2015-11-129-24/+18
|\ \ \ \ \ \
| * | | | | | Avoid render edit_form in each notes.Jason Lee2015-11-129-24/+18
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'ci-deprecate-dumped-yaml' into 'master' Kamil Trzciński2015-11-124-24/+1
|\ \ \ \ \ \
| * | | | | | Remove deprecated dumped yaml file generated from previous job definitionsci-deprecate-dumped-yamlKamil Trzcinski2015-11-104-24/+1
* | | | | | | Merge branch 'fix_project_build_links' into 'master' Kamil Trzciński2015-11-121-1/+1
|\ \ \ \ \ \ \
| * | | | | | | fix build linkAndy Brandt2015-11-101-1/+1
* | | | | | | | Merge branch 'caches' into 'master' Kamil Trzciński2015-11-124-4/+175
|\ \ \ \ \ \ \ \
| * | | | | | | | Allow to define cache in `.gitlab-ci.yml`cachesKamil Trzcinski2015-11-104-4/+175
* | | | | | | | | Merge branch 'flay' into 'master' Dmitriy Zaporozhets2015-11-115-0/+23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add flay: tool to find duplicate codeflayDmitriy Zaporozhets2015-11-115-0/+23
* | | | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRobert Speicher2015-11-111-1/+2
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'add-comment-to-one-link-in-email-to-prevent-people-adding-it-ba...Dmitriy Zaporozhets2015-11-111-1/+2
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix typo in email comment: hone -> oneDmitriy Zaporozhets2015-11-111-2/+2
| | * | | | | | | | | | Prevent people from adding the link back.Sytse Sijbrandij2015-11-061-0/+1
* | | | | | | | | | | | Update CHANGELOGRobert Speicher2015-11-111-1/+1
* | | | | | | | | | | | Merge branch 'flog' into 'master' Dmitriy Zaporozhets2015-11-114-0/+38
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |