Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Merge pull request #9812 from chrspeich/hide-tabs-lone-auth-provider"rs-revert-gh-9812 | Robert Speicher | 2015-11-15 | 1 | -27/+19 |
* | Merge branch 'relative_links_default_branch' into 'master' | Robert Speicher | 2015-11-15 | 2 | -1/+2 |
|\ | |||||
| * | Relative links in the README file shown on the repository homepage should point | Alec Cooper | 2015-11-14 | 2 | -1/+2 |
|/ | |||||
* | Merge branch 'impersonate' into 'master' | Dmitriy Zaporozhets | 2015-11-14 | 9 | -35/+88 |
|\ | |||||
| * | refactor login as to be impersonation with better login/logout | James Newton | 2015-10-29 | 9 | -35/+88 |
* | | Merge branch 'annotate-models' into 'master' | Dmitriy Zaporozhets | 2015-11-14 | 48 | -96/+311 |
|\ \ | |||||
| * | | Annotate models | Dmitriy Zaporozhets | 2015-11-13 | 48 | -96/+311 |
* | | | Merge branch 'builds_feature' into 'master' | Kamil Trzciński | 2015-11-13 | 27 | -144/+139 |
|\ \ \ | |/ / |/| | | |||||
| * | | Fix caching breaking test of build artifactsbuilds_feature | Kamil Trzcinski | 2015-11-13 | 1 | -6/+3 |
| * | | Fix broken tests | Kamil Trzcinski | 2015-11-13 | 7 | -113/+43 |
| * | | Expose CI enable option in project features | Kamil Trzcinski | 2015-11-13 | 20 | -25/+93 |
* | | | Merge branch 'refactor-complex-methods' into 'master' | Dmitriy Zaporozhets | 2015-11-13 | 8 | -155/+200 |
|\ \ \ | |||||
| * | | | Move spec to proper place and fix unused variablerefactor-complex-methods | Dmitriy Zaporozhets | 2015-11-13 | 2 | -1/+0 |
| * | | | Don't allow flog failure any more | Dmitriy Zaporozhets | 2015-11-13 | 1 | -1/+0 |
| * | | | Even more refactoring to inline_diff.rb | Dmitriy Zaporozhets | 2015-11-13 | 1 | -16/+23 |
| * | | | Split complex methods in GoogleCodeImport::Importer | Dmitriy Zaporozhets | 2015-11-13 | 1 | -46/+47 |
| * | | | Split complex Gitlab::InlineDiff::processing method | Dmitriy Zaporozhets | 2015-11-13 | 1 | -19/+36 |
| * | | | Split complex method EventsHelper#event_feed_url. | Dmitriy Zaporozhets | 2015-11-13 | 1 | -11/+15 |
| * | | | Split complex method Issues::UpdateService#execute | Dmitriy Zaporozhets | 2015-11-13 | 1 | -13/+16 |
| * | | | Split complex method SystemHooksService#build_event_data | Dmitriy Zaporozhets | 2015-11-13 | 1 | -30/+42 |
| * | | | Split huge method MergeRequests::UpdateService#execute | Dmitriy Zaporozhets | 2015-11-13 | 1 | -22/+25 |
* | | | | Merge branch 'gitlab-workhorse' into 'master' | Kamil Trzciński | 2015-11-13 | 2 | -0/+2 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Bump the GITLAB_WORKHORSE version to 0.4.1 [ci skip] | Kamil Trzcinski | 2015-11-13 | 2 | -0/+2 |
|/ / / | |||||
* | | | Merge pull request #9825 from huacnlee/cache-application-setting | Dmitriy Zaporozhets | 2015-11-13 | 2 | -3/+15 |
|\ \ \ | |||||
| * | | | Add caching for ApplicationSetting, Ci::ApplicationSetting. | Jason Lee | 2015-11-12 | 2 | -3/+15 |
* | | | | Merge pull request #9757 from yms9654/diff-option | Stan Hu | 2015-11-13 | 13 | -8/+80 |
|\ \ \ \ | |||||
| * | | | | Add ignore white space option in merge request diff | Minsik Yoon | 2015-11-13 | 13 | -8/+80 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'omniauth-doc-fix' into 'master' | Achilleas Pipinellis | 2015-11-13 | 2 | -1/+2 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Merge remote-tracking branch 'gitlab/master' into omniauth-doc-fix | Jon Cairns | 2015-11-12 | 303 | -1072/+4720 |
| |\ \ \ | |||||
| * | | | | Add missing "omniauth" prefix to option in docs [ci skip] | Jon Cairns | 2015-11-12 | 2 | -1/+2 |
* | | | | | Merge branch 'use-path-for-new-issue-button' into 'master' | Dmitriy Zaporozhets | 2015-11-12 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Use a relative link instead of full URL with New Issue button to be consistent | Stan Hu | 2015-10-17 | 1 | -1/+1 |
* | | | | | | Merge branch 'fix-avatar-not-showing' of https://gitlab.com/stanhu/gitlab-ce | Dmitriy Zaporozhets | 2015-11-12 | 5 | -4/+5 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Fix avatars not showing in Atom feeds and project issues when Gravatar disabled | Stan Hu | 2015-11-10 | 5 | -4/+5 |
* | | | | | | Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list | Dmitriy Zaporozhets | 2015-11-12 | 9 | -24/+18 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Avoid render edit_form in each notes. | Jason Lee | 2015-11-12 | 9 | -24/+18 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'ci-deprecate-dumped-yaml' into 'master' | Kamil Trzciński | 2015-11-12 | 4 | -24/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove deprecated dumped yaml file generated from previous job definitionsci-deprecate-dumped-yaml | Kamil Trzcinski | 2015-11-10 | 4 | -24/+1 |
* | | | | | | | Merge branch 'fix_project_build_links' into 'master' | Kamil Trzciński | 2015-11-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fix build link | Andy Brandt | 2015-11-10 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'caches' into 'master' | Kamil Trzciński | 2015-11-12 | 4 | -4/+175 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Allow to define cache in `.gitlab-ci.yml`caches | Kamil Trzcinski | 2015-11-10 | 4 | -4/+175 |
* | | | | | | | | | Merge branch 'flay' into 'master' | Dmitriy Zaporozhets | 2015-11-11 | 5 | -0/+23 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add flay: tool to find duplicate codeflay | Dmitriy Zaporozhets | 2015-11-11 | 5 | -0/+23 |
* | | | | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Robert Speicher | 2015-11-11 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'add-comment-to-one-link-in-email-to-prevent-people-adding-it-ba... | Dmitriy Zaporozhets | 2015-11-11 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Fix typo in email comment: hone -> one | Dmitriy Zaporozhets | 2015-11-11 | 1 | -2/+2 |
| | * | | | | | | | | | | Prevent people from adding the link back. | Sytse Sijbrandij | 2015-11-06 | 1 | -0/+1 |
* | | | | | | | | | | | | Update CHANGELOG | Robert Speicher | 2015-11-11 | 1 | -1/+1 |
* | | | | | | | | | | | | Merge branch 'flog' into 'master' | Dmitriy Zaporozhets | 2015-11-11 | 4 | -0/+38 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | |