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-04-02Merge branch 'import-current-user' into 'master'Dmitriy Zaporozhets
Import GitHub, Bitbucket or GitLab.com projects owned by authenticated user into current namespace. Addresses #1347. Untested since I'm in a bit of a hurry. Will definitely have time to test and add unit tests before the 7.10 release :) See merge request !481
2015-04-02Merge branch 'repository-archive-worker' into 'master'Dmitriy Zaporozhets
Archive repositories in background worker. Depends on https://gitlab.com/gitlab-org/gitlab_git/merge_requests/17 being merged, a new `gitlab_git` being released and this MR's `Gemfile.lock` being updated.. See private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2173. To do after this is merged: Update https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/sv-sidekiq-run.erb in omnibus. See merge request !436
2015-04-02Support configurable attachment size via Application SettingsStan Hu
Fix bug where error messages from Dropzone would not be displayed on the issues page Closes #1258
2015-04-01Merge branch 'group-information-leak' into 'master'Dmitriy Zaporozhets
Don't leak private group existence by redirecting from namespace controller to group controller. See merge request !440
2015-03-31Import GitHub, Bitbucket or GitLab.com projects owned by authenticated user ↵Douwe Maan
into current namespace.
2015-03-31Add tests.Douwe Maan
2015-03-31Archive repositories in background worker.Douwe Maan
2015-03-27Add autocomplete controllerDmitriy Zaporozhets
2015-03-25Set Application controller default URL options to ensure all url_for calls ↵Stan Hu
are consistent Closes #1249
2015-03-24Don't leak private group existence by redirecting from namespace controller ↵Douwe Maan
to group controller.
2015-03-24Refactor GitAccess to use instance variables.Douwe Maan
2015-03-23Merge branch 'userpage-activity-scroll'Dmitriy Zaporozhets
Conflicts: app/controllers/users_controller.rb
2015-03-23Merge branch 'improve-contributions-calendar' into 'master'Dmitriy Zaporozhets
Replace commits calendar with contributions calendar * count opening of issues and merge requests * dont trigger git repository - use events from database * count pushes instead of commits for faster and easier counting * much-much faster since does not affected by repository size See merge request !420
2015-03-23Include missing events and fix save functionality in admin service template ↵Stan Hu
settings form Closes #1275
2015-03-23Fix atom feed for user pageDmitriy Zaporozhets
2015-03-23Add inifinite scroll to user activity on user pageDmitriy Zaporozhets
2015-03-22Refactor contributions events and write tests for calendarDmitriy Zaporozhets
2015-03-22Replace commits calendar with contributions calendarDmitriy Zaporozhets
* count opening of issues and merge requests * dont trigger git repository - use events from database * much-much faster since does not affected by repository size
2015-03-22Restyle oauth accounts at profile page and add ability to unlink accountDmitriy Zaporozhets
2015-03-21Merge branch 'user-location' into 'master'Dmitriy Zaporozhets
Location field in user profile Twitter allows you to set string with location information. I find it very useful in work to know where user from. It allows to communicate with knowing time difference and cultural things. See merge request !411
2015-03-21Add location to user profileDmitriy Zaporozhets
2015-03-20Link to CI with refValery Sizov
2015-03-20Add error message when have error on profile screenCarlos Ribeiro
2015-03-19Only trigger actual search if a search string is presentHannes Rosenögger
2015-03-18Extend the commit calendar to show the actual commits for a dateHannes Rosenögger
2015-03-18Merge branch 'external_wiki' into 'master'Dmitriy Zaporozhets
Add support for external wikis ## What does this MR do? This MR adds the possibility to replace the link to the internal wiki of gitlab with a custom link. Currently this is realised as a service. ## What Use Case does this MR solve? In my Company we already have a wiki System (Confluence). We have a policy to use the existing wiki, so we can't switch to the internal wiki Gitlab provides. This currently only leaves us two choices: 1. Disable the gitlab wiki. That means we completly loose the connection between wiki and code from the gitlab ui. 2. Create a simple wiki page with a link to our external wiki and hope that no one uses the internal one. Both solutions are not really good. So what can be done to improve the situation while making it as easy as possible for new developers to access both, wiki and gitlab? Replacing the wiki link kinda like the JIRA integration replaces the issues link looks like a good first step to me. :) This can probably be extended later to completly prevent access to the internal wiki (currently that's still possible if you know the link) or maybe to check if the link really points to a wiki. ## Screenshot: ![external_wiki_service](https://gitlab.com/uploads/gitlab-org/gitlab-ce/89b27cf068/external_wiki_service.png) See merge request !291
2015-03-17Merge branch 'last-deploy-key' into 'master'Dmitriy Zaporozhets
Delete deploy key when last connection to a project is destroyed. Addresses #1959. See merge request !1710
2015-03-17Merge branch 'issue_subscription' into 'master'Dmitriy Zaporozhets
Subscription to issue/mr Fixes #1911 and #1909 ![joxi_screenshot_1426601822159](https://dev.gitlab.org/gitlab/gitlabhq/uploads/53021bc5783271322ab2dfba7598eaa3/joxi_screenshot_1426601822159.png) ![joxi_screenshot_1426601836423](https://dev.gitlab.org/gitlab/gitlabhq/uploads/244ff360fbd6f30980f8dad699400814/joxi_screenshot_1426601836423.png) See merge request !1702
2015-03-17Satisfy Rubocop.Douwe Maan
2015-03-17Delete deploy key when last connection to a project is destroyed.Douwe Maan
2015-03-16Fix restricted visibility bugsVinnie Okada
Check for nil values in the restricted_visibility_level validation method, and set the restricted visibility request parameter to `[]` when it's missing from the request.
2015-03-16testsValery Sizov
2015-03-16Merge branch 'fix-restricted-visibility' into 'master'Dmitriy Zaporozhets
Restricted visibility levels - bug fix and new feature This allows admin users to override restricted visibility settings when creating and updating projects and snippets, and moves the restricted visibility configuration from gitlab.yml to the web UI. See #1903. ## Move configuration location I added a new section to the application settings page for restricted visibility levels. Each level has a checkbox, styled with Bootstrap to look like a toggle button. A checked box means that the level is restricted. I added a glowing text shadow and changed the background color for checked buttons because the default styles made it hard to distinguish between checked and unchecked. This image shows the new section with the "Public" box checked: ![restricted_visibility_settings](https://dev.gitlab.org/Okada/gitlabhq/uploads/629562e4313f89b795e81c3bb0f95893/restricted_visibility_settings.png) ## Allow admins to override To allow admin users to override the restricted visibility levels, I had to remove the `visibility_level` validation from the `Project` class. The model doesn't know about the `current_user`, which should determine whether the restrictions can be overridden. We could use the creator in the validation, but that wouldn't work correctly for projects where a non-admin user is the creator and an admin tries to change the project to a restricted visibility level. The `Project::UpdateService` and `Project::CreateService` classes already had code to determine whether the current user is allowed to use a given visibility level; now all visibility level validation is done in those classes. Currently, when a non-admin tries to create or update a project using a restricted level, these classes silently set the visibility level to the global default (create) or the project's existing value (update). I changed this behavior to be more like an Active Model validation, where using a restricted level causes the entire request to be rejected. Project and personal snippets didn't have service classes, and restricted visibility levels weren't being enforced in the model or the controllers. The UI disabled radio buttons for restricted levels, but that wouldn't be difficult to circumvent. I created the `CreateSnippetService` and `UpdateSnippetService` classes to do the same restricted visibility check that the project classes do. And since I was dealing with snippet visibility levels, I updated the API endpoints for project snippets to allow users to set and update the visibility level. ## TODO * [x] Add more tests for restricted visibility functionality cc @sytse @dzaporozhets See merge request !1655
2015-03-16rename table subscribe; make it polymorficValery Sizov
2015-03-15SubscriptionValery Sizov
2015-03-15Move group leave action from dashboard/groups to groups/group_members.Douwe Maan
2015-03-15Move group members index from `/members` to `/group_members`.Douwe Maan
2015-03-15Use `project_member` instead of `team_member`.Douwe Maan
2015-03-15Use `group_member` instead of `users_group` or `membership`.Douwe Maan
2015-03-14Merge branch 'master' into fix-restricted-visibilityVinnie Okada
Conflicts: db/schema.rb
2015-03-13Merge branch 'fix-encoding' into 'master'Dmitriy Zaporozhets
Minor cleanup around UTF-8 encoding. Minor cleanup to be merged after https://dev.gitlab.org/gitlab/gitlab_git/merge_requests/24 is merged in. See merge request !1642
2015-03-13Move tag deletion to service and execute hooks and services.Douwe Maan
2015-03-13Reuse blob object fetched by Gitlab::Git::Blame.Douwe Maan
2015-03-13Everything from gitlab_git is already UTF-8.Douwe Maan
2015-03-13Merge branch 'master' into mr-filter-by-titleDmitriy Zaporozhets
Conflicts: app/controllers/projects/merge_requests_controller.rb
2015-03-13Implement merge requests searchDmitriy Zaporozhets
It is same search like we have at issues page. It allows to quickly filter merge requests based on title or desription. I copy-pasted some js code from Issues.js. In future search (filtering) logic should be refactoed into one class for merge requests and issues
2015-03-13Use same constant for amount of items per pageDmitriy Zaporozhets
2015-03-12Add a service to support external wikisHannes Rosenögger
2015-03-12Merge branch 'github-org-repos' into 'master'Dmitriy Zaporozhets
Fix missing GitHub organisation repositories on import page. Private repositories belonging to organizations rather than users can't be imported because `client.repos(org.login)` was requesting `/users/:org_login/repos` (which only returns public org repo's), while we need `/orgs/:org_login/repos` (which includes both public and private). The `client.org_repos` method does this. cc @marin This is a bug in 7.8.x, but I'm not sure if it needs a minor release now or if it can go in 7.9. See merge request !1683
2015-03-12group controller refactoringValery Sizov