Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-11-16Add support for git lfs.Marin Jankovski
2015-11-16Merge branch 'test_env_cache' into 'master' Valery Sizov
Disabling cache for test environment See merge request !1807
2015-11-16Disabling cache for test environmentValery Sizov
2015-11-16Merge branch 'fix_trailing_title_space' of ↵Dmitriy Zaporozhets
https://gitlab.com/dblessing/gitlab-ce
2015-11-16Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets
2015-11-16Merge branch 'releases-feature'Dmitriy Zaporozhets
2015-11-16Improve english textDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-16Merge branch 'rs-revert-gh-9812' into 'master' Valery Sizov
Revert "Merge pull request #9812 from chrspeich/hide-tabs-lone-auth-provider" This reverts commit 84999611d8f7894219eb4ebc76555c79b1f14794, reversing changes made to 0d9fb211f3f842d10e1c57dcb9d3d42a9c11cd0b. See merge request !1805
2015-11-16Revert "Merge pull request #9812 from chrspeich/hide-tabs-lone-auth-provider"Robert Speicher
This reverts commit 84999611d8f7894219eb4ebc76555c79b1f14794, reversing changes made to 0d9fb211f3f842d10e1c57dcb9d3d42a9c11cd0b.
2015-11-15Merge branch 'relative_links_default_branch' into 'master' Robert Speicher
Relative links in project README should point to default branch, not master Relative links in the README shown on a project's main page currently always point to the "master" branch. This is a particularly obvious problem for projects that have no "master" branch, since the link points to a non-existent file. This patch changes the relative links to instead point to the default branch. Resolves #2707, #1134, #1852 See merge request !1801
2015-11-14Relative links in the README file shown on the repository homepage should pointAlec Cooper
to the default branch, not to master
2015-11-14Merge branch 'impersonate' into 'master' Dmitriy Zaporozhets
refactor login as to be impersonation with better login/logout Modifies the existing "login as" feature to be called impersonation. This also adds: * Application keep track of who is impersonating the user so they can revert back to the original user without having to log out. * Stores the user profile via `HTTP_REFERER` so you get redirected back to the person you have impersonated once you stop. ## Screenshots: ![](http://sindacio.us/i/2015-10-28_17-52-41.png) ![](http://sindacio.us/i/2015-10-28_17-53-08.png) See merge request !1702
2015-11-14Merge branch 'annotate-models' into 'master' Dmitriy Zaporozhets
Annotate models Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1799
2015-11-13Annotate modelsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-13Merge branch 'builds_feature' into 'master' Kamil Trzciński
Expose builds feature Expose builds feature in project settings (as feature). Enable it by default for a new projects. I deliberately named it builds instead of CI, because we actualy allow to run tests using infrastructure built-in GitLab. I'm free to change it. ![Screen_Shot_2015-11-09_at_16.42.21](/uploads/a8af0a56fc0498688c0428ff22252d9c/Screen_Shot_2015-11-09_at_16.42.21.png) If we are ok, I'll add feature tests for it. /cc @sytses @dzaporozhets See merge request !1767
2015-11-13Fix caching breaking test of build artifactsKamil Trzcinski
2015-11-13Merge branch 'refactor-complex-methods' into 'master' Dmitriy Zaporozhets
Refactor complex methods Make flog part of CI check which is not allowed to fail. I used high score (70) and refactored most complex method. In future releases we should lower acceptable score to something like 40..50 Part of #3444 See merge request !1794
2015-11-13Merge branch 'gitlab-workhorse' into 'master' Kamil Trzciński
Bump Gitlab Workhorse See merge request !1795
2015-11-13Bump the GITLAB_WORKHORSE version to 0.4.1 [ci skip]Kamil Trzcinski
2015-11-13Fix broken testsKamil Trzcinski
2015-11-13Expose CI enable option in project featuresKamil Trzcinski
- Enable CI by default for all new projects
2015-11-13Merge pull request #9825 from huacnlee/cache-application-settingDmitriy Zaporozhets
Add caching for ApplicationSetting, Ci::ApplicationSetting.
2015-11-13Move spec to proper place and fix unused variableDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-13Merge pull request #9757 from yms9654/diff-optionStan Hu
Add ignore white space option in merge request diff
2015-11-13Add ignore white space option in merge request diffMinsik Yoon
fix this issue(https://gitlab.com/gitlab-org/gitlab-ce/issues/1393). Add ignore whitespace optoin to Commits Compare view
2015-11-13Merge branch 'omniauth-doc-fix' into 'master' Achilleas Pipinellis
Add missing "omniauth" prefix to option in docs This MR is specifically a fix for #3319. I wanted to make my first contribution to GitLab, so I picked a simple one! This changes the omniauth documentation for the `block_auto_created_users` option to `omniauth_block_auto_created_users`. Thanks --- closes #3319 See merge request !1734
2015-11-13Don't allow flog failure any moreDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-13Even more refactoring to inline_diff.rbDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-13Split complex methods in GoogleCodeImport::ImporterDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-13Split complex Gitlab::InlineDiff::processing methodDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-13Split complex method EventsHelper#event_feed_url.Dmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-13Split complex method Issues::UpdateService#executeDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-13Split complex method SystemHooksService#build_event_dataDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-13Split huge method MergeRequests::UpdateService#executeDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-13Add api test for creating tag with release infoDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-13Add API docs and correctly expose release apiDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-13Merge branch 'use-path-for-new-issue-button' into 'master' Dmitriy Zaporozhets
Use a relative link instead of full URL with New Issue button to be consistent Relates to #3095 See merge request !1631
2015-11-12Expose release notes to tags apiDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-12Add releases apiDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-12Add grape routing printDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-12Move git tags API to separate fileDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-12Add release notes documentationDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-12Fix changelog itemDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-12Merge branch 'fix-avatar-not-showing' of https://gitlab.com/stanhu/gitlab-ceDmitriy Zaporozhets
2015-11-12Merge remote-tracking branch 'gitlab/master' into omniauth-doc-fixJon Cairns
2015-11-12Add missing "omniauth" prefix to option in docs [ci skip]Jon Cairns
Changes block_auto_created_users to omniauth_block_auto_created_users, otherwise the option is ignored. Fixes #3319.
2015-11-12Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-listDmitriy Zaporozhets
Avoid render edit_form in each notes.
2015-11-12Merge branch 'ci-deprecate-dumped-yaml' into 'master' Kamil Trzciński
Remove deprecated dumped yaml file generated from previous job definitions See merge request !1777
2015-11-12Merge branch 'fix_project_build_links' into 'master' Kamil Trzciński
Fix "Other Builds" links in Projects Build page Found a minor issue where all links in the "Other Builds" section of Project Builds was linking to the same build #. This should fix it. See merge request !1785
2015-11-12Merge branch 'caches' into 'master' Kamil Trzciński
Allow to define cache in `.gitlab-ci.yml` This extends `.gitlab-ci.yml` syntax to allow specifying caching files and directories between builds, making it easy to preserve ex. gems. ``` cache: paths: - .bundle - vendor/ before_script: - bundle install --path vendor/ rspec: script: - bundle exec rspec ``` This is based on Build Artifacts changes. /cc@dzaporozhets See merge request !1786