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-08-02Re-annotate modelsAtsushi Ishida
2015-07-31Merge branch 'admin-group-member' into 'master' Douwe Maan
Add specific ability for managing group members To be used for https://dev.gitlab.org/gitlab/gitlab-ee/issues/290 (Internal issue) See merge request !1059
2015-07-31Merge branch 'api-new-attributes' into 'master' Robert Speicher
Add project star and fork count, group avatar URL and user/group web URL attributes to API Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2521. See merge request !1058
2015-07-30Fix ProjectDouwe Maan
2015-07-30No more web urlDouwe Maan
2015-07-29Check that project was actually created rather than just validated in ↵Stan Hu
import:repos task Add gitlab-shell to error message to give user a clue that something may be wrong there. Ran into this in #2082. User was told that repositories were created when they were not due to hooks symlink being wrong.
2015-07-29Fix specsDouwe Maan
2015-07-29Use URL helpersDouwe Maan
2015-07-28Add specific ability for managing group membersDouwe Maan
2015-07-28Add project star and fork count, group avatar URL and user/group web URL ↵Douwe Maan
attributes to API
2015-07-24Add Issuable#to_ability_nameRobert Speicher
2015-07-24Add admin_merge_request ability to Developer level and upRobert Speicher
This was necessary because this permission is checked dynamically by `app/views/shared/issuable/_context` when on a Merge Request. Closes #2058
2015-07-24Merge branch 'rs-issue-2012' into 'master' Douwe Maan
Make username parameter for Users#show case-insensitive Closes #2012 See merge request !996
2015-07-24Add User.find_by_username!Robert Speicher
2015-07-22Fix Remove source-branch for MRs from same projectDouwe Maan
2015-07-20Merge branch 'fix-disabled-feature-access' into 'master'Stan Hu
Fix (i.e. prevent) access to disabled features for unauthenticated users Unauthenticated users had access to disabled features of public projects. The code has been slightly refactored so that feature checks are done in a separate method and can also be applied for public access. See merge request !1006
2015-07-20Fix access to disabled features for unauthenticated usersDaniel Gerhardt
Unauthenticated users had access to disabled features of public projects. The code has been slightly refactored so that feature checks are done in a separate method and can also be applied for public access.
2015-07-20Remove repository graph log to fix slow cache updates after push eventStan Hu
Recalculating graph_log took minutes on a large repository since each of the 6000 commits would need to calculate the diff. Since graph_log does not appear to be used, remove it from the list of things to update. For the Linux kernel repository, this reduced the ProjectCacheWorker time from 8+ minutes to 16 seconds. Closes #2016
2015-07-19Fix label read access for unauthenticated usersDaniel Gerhardt
The label page was added to navigation for unauthorized users because the previously used milestone read permission was still checked. This has been fixed and read access to labels is now granted (again) for public projects. This regression has been introduced in 07efb17e10fe26a01b60d8441868f9fbda0768f2 (7.12). See also 9bcd36396b9b71467f66dd4ed79ab709bb5d027a. Refs !836, !842.
2015-07-17Merge branch 'validate_token_and_url_format_for_gitlab_ci' into 'master' Dmitriy Zaporozhets
Validate format of project_url and token for GitLab CI service. If `project_url` and `token` for are invalid, [service_hook creation](https://gitlab.com/gitlab-org/gitlab-ce/blob/7-13-stable/app/models/project_services/gitlab_ci_service.rb#L30-34) will silently fail due to validation of URL in `WebHook`. Given that token is a sequence of numbers and letters for GitLab CI making sure that there are no unexpected characters should be enough to prevent service_hook being nil. Fixes #1997 See merge request !987
2015-07-17Merge branch 'even-faster-search' into 'master' Dmitriy Zaporozhets
Avoid copy of strings in memory for parsing git grep result Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !967
2015-07-17Validate format of project_url and token for GitLab CI service.Marin Jankovski
2015-07-17Store commit count in project tableDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-17Build missing cache items in background job after each pushDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-14Merge branch 'rs-issue-1773' into 'master'Dmitriy Zaporozhets
Fix mentions not being created upon issue/merge request update New cross-references weren't being added when they were made in an issue or merge request update. This happened because the relevant `UpdateService`s were making the `notice_added_references` call after the model had already been updated and saved, so the `changes` attribute was empty and no cross-references were made at all. This fixes the bug and adds a bit of testing and a bit of refactoring. Closes #1773 See merge request !974
2015-07-14Rename `notice_added_references` to `create_new_cross_references!`Robert Speicher
2015-07-14Refactor Mentionable#notice_added_referencesRobert Speicher
It now accounts for models that have changed but have already been persisted, such as when called from an UpdateService. Closes #1773
2015-07-13Allow user to specify content he wants to see on project pageDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-13Merge branch 'ssh-key-linebreaks' into 'master'Dmitriy Zaporozhets
Add error message for SSH key linebreaks Solves this [request](http://feedback.gitlab.com/forums/176466-general/suggestions/5653544-check-for-linebreaks-in-ssh-key). See merge request !672
2015-07-13Avoid copy of strings in memory for parsing git grep resultDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-13Merge branch 'rs-disable-2fa' into 'master'Dmitriy Zaporozhets
Add User#disable_two_factor! This method encapsulates all the logic for disabling 2FA on a specific User model. See merge request !961
2015-07-12Add tests for repository search filesDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-12Fix search blobs for wikiDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-11Add error message for SSH key linebreaksNikita Verkhovin
2015-07-10Add User#disable_two_factor!Robert Speicher
This method encapsulates all the logic for disabling 2FA on a specific User model.
2015-07-10Implement search of code via git grepDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-09Merge branch 'rs-dev-issue-2372' into 'master'Dmitriy Zaporozhets
Filter by issues/merge requests without a milestone Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2372 See merge request !886
2015-07-07Change "Irc Uri" -> "IRC URI"Stan Hu
2015-07-07Rename NoMilestone to Milestone::NoneRobert Speicher
Also refactors IssuableFinder to avoid redundant title check.
2015-07-07Allow user to filter by Issues/Merge Requests without a MilestoneRobert Speicher
2015-07-06Merge branch 'audit_log' into 'master'Dmitriy Zaporozhets
Audit log for user authentication https://dev.gitlab.org/gitlab/gitlabhq/issues/2318 See merge request !931
2015-07-06Audit log for user authenticationValery Sizov
2015-07-06Merge branch 'add-irker-options' into 'master'Dmitriy Zaporozhets
Add Irker service configuration options ### What does this MR do? This MR makes a number of hard-coded Irker parameters configurable in the service settings: Irker server host, port, and default IRC URI. It also removes the "max recipient" limit since the recipient list is configurable only by the project owner, and it makes no sense to update the limit when it is implied in the recipient list already. ### Why was this MR needed? The existing service assumed that gitlab.com was running an Irker daemon on `localhost` when it was not. Using Irker on gitlab.com thus did not work at all. This MR allows users to provide their own Irker daemons. ### Are there points in the code the reviewer needs to double check? My main concern is whether allowing a user to specify the server/port combination would have security implications for a host. Given that HipChat and Slack allow users to do this, I didn't think this was doing anything novel. ### What are the relevant issue numbers? * Closes #1713 * Closes #1714 * Closes gitlab-com/support-forum#139 ### Screenshots ### Before ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/2eb3eb815e249e9fb669fc97ecd4f3c8/image.png) ### After ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/cceaba951c05bd3df2c842cc68046b87/image.png) See merge request !930
2015-07-05Add Irker service configuration optionsStan Hu
Closes #1713 Closes #1714 Closes gitlab-com/support-forum#139
2015-07-02'created_at DESC' is performed twicecatatsuy
If you are already sorting in descending order in the created_at, it is run twice when you run the .recent. It has passed in the string 'created_at DESC'. Ruby on Rails is directly given to the SQL. It is a slow query in MySQL.
2015-07-01Refactor can_be_merged logic for merge requestDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-01Merge branch 'use-rugged-for-merge' into 'master'Dmitriy Zaporozhets
Merge branches inside one repository using rugged instead of satellites Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @rspeicher @DouweM See merge request !918
2015-07-01Merge branches inside one repository using rugged instead of satellitesDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-01fix of GitLab CI forkingValery Sizov
2015-07-01Merge branch 'fix-zero-sha-lookup' into 'master'Dmitriy Zaporozhets
Repository#blob_at should return nil for 00000000... sha Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !916