summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Remove CI migration taskremove-ci-migrationKamil Trzcinski2015-10-215-297/+0
|
* Speed up searching for text references a bitYorick Peterse2015-10-201-4/+4
| | | | | | | | | | If a node is ignored there's no need for searching for a given pattern. In turn, when searching for the pattern there's no need to construct a MatchData object as we only care about presence (or lack thereof), not the resulting matches. In terms of performance this cuts down about 200 ms when loading issue #2164 locally, though this varies a bit depending on system load.
* Fix regex in redis version checkBenny Schimmer2015-10-191-1/+1
|
* Merge branch 'hanloong/gitlab-ce-remove-forks-from-projects-settings' into ↵Douwe Maan2015-10-191-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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
| * Merge branch 'master' into remove-forks-from-projects-settingsHan Loong Liauw2015-10-1720-57/+284
| |\
| * | Made suggested content changes based on MR ReviewHan Loong Liauw2015-10-141-1/+1
| | | | | | | | | | | | | | | Changed the authentication method for removing fork through API Reflected changes to new auth method in API specs
| * | Adds ability to remove the forked relationshipHan Loong Liauw2015-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | 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
* | | Fix bug where a push would only create cross references from the first commit.hash-block-returnDouwe Maan2015-10-181-1/+1
| | |
* | | Merge branch 'master' into rs-redactor-filterrs-redactor-filterDouwe Maan2015-10-1610-52/+93
|\ \ \ | | |/ | |/|
| * | Shut up, RubocopRobert Speicher2015-10-151-1/+1
| | |
| * | Fix specsKamil Trzcinski2015-10-151-1/+1
| | |
| * | Implement when syntax in .gitlab-ci.ymlKamil Trzcinski2015-10-152-1/+27
| | |
| * | Merge branch 'stanhu/gitlab-ce-fix-api-mr-comment-notifications'Dmitriy Zaporozhets2015-10-151-2/+10
| |\ \
| | * | Fix bug where merge request comments created by API would not trigger ↵Stan Hu2015-10-101-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | notifications Closes https://github.com/gitlabhq/gitlabhq/issues/9715
| * | | Merge branch 'user-by-login-performance' into 'master' Yorick Peterse2015-10-151-0/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve User.by_login performance This greatly speeds up the performance of `User.by_login`. I adopted some changes from @haynes in this patch, the credits go to him for coming up with those originally. Fixes #2341 See merge request !1545
| | * | | Improve performance of User.by_loginuser-by-login-performanceYorick Peterse2015-10-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Performance is improved in two steps: 1. On PostgreSQL an expression index is used for checking lower(email) and lower(username). 2. The check to determine if we're searching for a username or Email is moved to Ruby. Thanks to @haynes for suggesting and writing the initial implementation of this. Moving the check to Ruby makes this method an additional 1.5 times faster compared to doing the check in the SQL query. With performance being improved I've now also tweaked the amount of iterations required by the User.by_login benchmark. This method now runs between 900 and 1000 iterations per second.
| * | | | Merge branch 'git-archive-golang' into 'master' Douwe Maan2015-10-154-15/+47
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let gitlab-git-http-server handle archive downloads This change relies on changes in gitlab_git and gitlab-git-http-server. fixes #2429 See merge request !1548
| | * | | Merge branch 'master' into git-archive-golanggit-archive-golangDouwe Maan2015-10-1517-7/+235
| | |\ \ \
| | * | | | Fix NGINX API download regexJacob Vosmaer2015-10-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Users are allowed to supply namespace%2Fproject instead of a numeric ID
| | * | | | Let gitlab-git-http-server handle archive downloadsJacob Vosmaer2015-10-084-15/+47
| | | | | | | | | | | | | | | | | | | | | | | | This change relies on changes in gitlab_git and gitlab-git-http-server.
| * | | | | Merge branch 'incoming-email-config' into 'master' Robert Speicher2015-10-142-34/+7
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Reply by email easier to configure Builds on !1566. Omnibus companion MR: gitlab-org/omnibus-gitlab!510 (cc @marin) See merge request !1580
| | * | | | Make Reply by email easier to configureDouwe Maan2015-10-132-34/+7
| | | |/ / | | |/| |
* | | | | Merge branch 'master' into rs-redactor-filterDouwe Maan2015-10-1517-7/+235
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'simplify-cross-references' into 'master' Robert Speicher2015-10-141-0/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Simplify code around (cross)-references See merge request !1568
| | * | | | Simplify code around (cross)-referencesDouwe Maan2015-10-121-0/+2
| | |/ / /
| * | | | Fix: Images cannot show when projects' path was changeduploads_path_fixValery Sizov2015-10-143-0/+84
| | | | |
| * | | | Merge remote-tracking branch 'origin/cernvcs_hide_passwrd'Valery Sizov2015-10-142-1/+13
| |\ \ \ \
| | * \ \ \ Merge branch 'feature/api_hide_service_password' of gitlab.com:cernvcs/gitlab-cecernvcs_hide_passwrdValery Sizov2015-10-142-1/+13
| | |\ \ \ \
| | | * | | | Hide passwords to non-admin users in the services APIAlex Lossent2015-10-122-1/+13
| | | | |_|/ | | | |/| | | | | | | | | | | | | | In order to be consistent with !1490 doing it for the web interface
| * | | | | Merge remote-tracking branch 'origin/inified_404_error'Valery Sizov2015-10-141-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Only render 404 page from /publicinified_404_errorValery Sizov2015-10-131-1/+1
| | |/ / /
| * | | | [ci skip] Fix wrong commentsue4452015-10-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | According to `attributes_for_keys` and API doc, `POST /projects/:id/merge_requests` is received `target_project_id` (NOT `target_project`)
| * | | | Fix broken testsKamil Trzcinski2015-10-121-1/+1
| | | | |
| * | | | Fix some changesKamil Trzcinski2015-10-121-1/+1
| | | | |
| * | | | Update renderingKamil Trzcinski2015-10-121-1/+1
| | | | |
| * | | | Small bug fixesKamil Trzcinski2015-10-121-2/+3
| | | | |
| * | | | Add Commit Status documentationKamil Trzcinski2015-10-121-10/+10
| | | | |
| * | | | Add author to statusesKamil Trzcinski2015-10-122-1/+2
| | | | |
| * | | | Fix commit status POST URLKamil Trzcinski2015-10-121-1/+1
| | | | |
| * | | | Implement Commit Status APIKamil Trzcinski2015-10-124-3/+89
| |/ / /
| * | | Merge branch 'fix_email_downcasing' into 'master' Robert Speicher2015-10-111-1/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LDAP email address downcasing Fixes #2960 In the event we cannot match an LDAP user by DN we attempt to find an identity by email address and then update the DN. In this case the identity is matched by email address. If the user's email address in LDAP has an upper case character we cannot find a match in the GitLab database. GitLab downcases emails before the user object is saved. This merge request downcases the email from LDAP before we lookup by email. I also added a test to prevent a regression. See merge request !1550
| | * | Fix ldap email downcasing bugDrew Blessing2015-10-081-1/+1
| | | |
| * | | Merge branch 'rs-issue-2970' into 'master' Douwe Maan2015-10-091-1/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Normalize space-like characters in keys before output to gitlab-shell gitlab-shell expects only one tab separator per key, and an SSH key with a tab character in the comment, for example, would break things. Closes #2970 See merge request !1552
| | * | | Normalize space-like characters in keys before output to gitlab-shellrs-issue-2970Robert Speicher2015-10-081-1/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | gitlab-shell expects only one tab separator per key, and an SSH key with a tab character in the comment, for example, would break things. Closes #2970
| * | | Merge branch 'rs-2fa-task' into 'master' Jacob Vosmaer2015-10-091-0/+23
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Add task to disable 2FA for all users Addresses #2971 See merge request !1532
| | * | Add output and confirmation to gitlab:two_factor:disable_for_all_usersrs-2fa-taskRobert Speicher2015-10-081-2/+15
| | | |
| | * | Add gitlab:two_factor:disable_for_all_users taskRobert Speicher2015-10-071-0/+10
| | |/
| * | Added dedicated Rake task for setting up PostgresYorick Peterse2015-10-082-0/+7
| | | | | | | | | | | | | | | This ensures any PostgreSQL specific schema changes (e.g. expression indexes) are created when setting up the database.
| * | Added methods for detecting MySQL/PostgreSQLYorick Peterse2015-10-071-0/+11
| |/ | | | | | | | | These two methods remove the need for manually going into ActiveRecord::Base.connection all over the place.
* | Explicitly only parse references by specified filterDouwe Maan2015-10-142-2/+8
| |
View Lorry Controller Status