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-12-18Automatically fork a project when not allowed to edit a file.Douwe Maan
2015-12-08Merge branch 'serve_lfs_object' into 'master' Douwe Maan
Serve LFS object Depends on gitlab-org/gitlab_git!57 See merge request !1976
2015-12-08All for you rubocop.Marin Jankovski
2015-12-08Stub the calls to disk and check what send_file returns.Marin Jankovski
2015-12-08Fix specs caused by update of gitlab-test repo.Marin Jankovski
2015-12-07Merge branch 'master' into fix-merge-request-that-removes-submoduleDouglas Barbosa Alexandre
2015-12-07Add specs for showing lfs object in UI.Marin Jankovski
2015-12-05Fix spec that broke due to fact that iid is needed, not id, for ↵Stan Hu
MilestonesController
2015-12-05Fix Error 500 when creating global milestones with Unicode charactersStan Hu
Two issues: 1. The constraints in the resources were incorrect. Here's what it was before: ``` group_milestone GET /groups/:group_id/milestones/:id(.:format) groups/milestones#show {:id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/, :group_id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/} ``` In this case, id is actually the title of the milestone, which can be anything at the moment. After: ``` group_milestone GET /groups/:group_id/milestones/:id(.:format) groups/milestones#show {:id=>/[^\/]+/, :group_id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/} ``` 2. `parameterize` would strip all Unicode characters, leaving a blank string. Rails would report something like: ActionView::Template::Error (No route matches {:action=>"show", :controller=>"groups/milestones", :group_id=>#<Group id: 48, name: "ops-dev", path: "ops-dev", owner_id: nil, created_at: "2015-11-15 08:55:30", updated_at: "2015-12-02 06:23:26", type: "Group", description: "", avatar: "sha1.c71e73d51af1865c1bbbf6208e10044d46c9bb93.png", public: false>, :id=>"", :title=>"肯定不是中文的问题"} missing required keys: [:id]): This change uses the babosa library to create a better slug, which surprisingly isn't actually used by the global milestone controllers. Instead, they use the title passed as a query string for some reason. Closes https://github.com/gitlabhq/gitlabhq/issues/9881 Fix constraints
2015-12-04Fix 500 error when creating a merge request that removes a submoduleDouglas Barbosa Alexandre
2015-12-02Prevent impersonation if blockedAndrew Tomaka
2015-12-01Merge pull request #9868 from yms9654/commit-without-whitespaceStan Hu
Add ignore whitespace change option to commit view
2015-12-01Add ignore whitespace change option to commit viewMinsik Yoon
2015-11-30Merge branch 'stanhu/gitlab-ce-fix-404-after-project-removal'Robert Speicher
See merge request !1916
2015-11-30Merge branch 'rails_update_to_4_2' into 'master' Valery Sizov
Rails update to 4.2.4 https://gitlab.com/gitlab-org/gitlab-ce/issues/2694 See merge request !1902
2015-11-30fix specsValery Sizov
2015-11-26Fix 404 in redirection after removing a projectStan Hu
Closes https://github.com/gitlabhq/gitlabhq/issues/9844 Closes #3559
2015-11-25Fix raw private snippets access workflowDouglas Barbosa Alexandre
2015-11-21Merge branch 'ee-flog' into 'master' Dmitriy Zaporozhets
Reduce method complexity in AutocompleteController Backport of gitlab-org/gitlab-ee!58 See merge request !1833
2015-11-20Reduce method complexity in AutocompleteControllerDouwe Maan
2015-11-19Merge branch 'dbalexandre/gitlab-ce-fix-personal-snippet-access-workflow' ↵Robert Speicher
into 'master' Improve personal snippet access workflow. Replaces !1709 Fixes #3258 See merge request !1817
2015-11-18Refactor UsersController to not kill the databaseYorick Peterse
Previously this controller would in multiple places load tons (read: around 65000) project and/or group IDs into memory. These changes in combination with the previous commits significantly cut down loading times of user profile pages and the Atom feeds of users.
2015-11-17Merge branch 'master' into ↵Douwe Maan
dbalexandre/gitlab-ce-fix-personal-snippet-access-workflow
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-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-10-29Improve personal snippet access workflow. Fixes #3258Douglas Barbosa Alexandre
2015-10-29refactor login as to be impersonation with better login/logoutJames Newton
Modifies the existing "login as" feature to be called impersonation, as well as keeping track of who is impersonating to revert back to that user without having to log out.
2015-10-22Merge branch 'project-path-case-sensitivity' into 'master' Robert Speicher
Prefer project with exact path to differently cased one when both exist. Fixes #3113. See merge request !1649
2015-10-22Only postgres does case sensitive comparesDouwe Maan
2015-10-21Don't load entire spec with MySQLDouwe Maan
2015-10-21Disable case sensitive spec for MySQL.Douwe Maan
2015-10-20Redirect to a default path if HTTP_REFERER is not setStan Hu
Safari 9.0 does not yet honor the HTML5 `origin-when-cross-origin` mode, and it's possible load balancers/proxies strip the HTTP_REFERER from the request header. In these cases, default to some default path. Closes #3122 Closes https://github.com/gitlabhq/gitlabhq/issues/9731
2015-10-20Prefer project with exact path to differently cased one when both exist.Douwe Maan
2015-10-19Fix duplicate repositories in GitHub import pageStan Hu
By default, all the current user's repositories are accessible via the /users endpoint. There's no need to traverse all the organization repositories as well. See: * http://www.rubydoc.info/github/pengwynn/octokit/Octokit/Client/Repositories#repositories-instance_method * https://developer.github.com/v3/repos/#list-your-repositories Closes #2523
2015-10-19Merge branch 'master' into jrochkind/gitlab-ce-fix_2839_send_abuse_report_notifyDouwe Maan
[ci skip]
2015-10-19Merge branch 'hanloong/gitlab-ce-remove-forks-from-projects-settings' into ↵Douwe Maan
'master' Add ability to remove the fork relationship from project settings ![Screen_Shot_2015-10-18_at_12.37.24](/uploads/676571642a4c90f7f286280d714599a3/Screen_Shot_2015-10-18_at_12.37.24.png) ![Screen_Shot_2015-10-18_at_12.37.28](/uploads/1a069ecfc4cd3b5438772a9c3f04b6fc/Screen_Shot_2015-10-18_at_12.37.28.png) Replaces !1579. Fixes #2578. See merge request !1636
2015-10-18Satisfy RubocopDouwe Maan
2015-10-18Tweak wording.Douwe Maan
2015-10-18Fix spec.Douwe Maan
2015-10-18Merge branch 'master' into jrochkind/gitlab-ce-fix_2839_send_abuse_report_notifyDouwe Maan
2015-10-17Make spec names more clearDouwe Maan
2015-10-17Merge branch 'master' into cristianbica/gitlab-ce-user-project-view-filesDouwe Maan
2015-10-17Merge branch 'master' into remove-forks-from-projects-settingsHan Loong Liauw
2015-10-15Merge branch 'master' into git-archive-golangDouwe Maan
2015-10-14Fix: Images cannot show when projects' path was changedValery Sizov
2015-10-14Remove archive file sending specJacob Vosmaer
This is done by gitlab-git-http-server now.
2015-10-14Made suggested content changes based on MR ReviewHan Loong Liauw
Changed the authentication method for removing fork through API Reflected changes to new auth method in API specs
2015-10-13Adds ability to remove the forked relationshipHan Loong Liauw
This was previously possible through the API but can now be done through the project#edit settings screen if the current user is the owner of the project. Update changelog
2015-10-09Send an email (to support) when a user is reported for spamJonathan Rochkind
2015-10-07Merge branch 'cleanup-ci-pages' into 'master' Dmitriy Zaporozhets
Cleanup CI pages - [x] Remove `ci/projects/:id` page - [x] Remove Continuous integration from project menu - [x] Remove unused css/js - [x] Remove Ci::Commit and Ci::Build controllers - [x] Move CI services to project settings area cc @ayufan Part of #2594 See merge request !1529