summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Fixed typos in migration templatesmigration-helpersYorick Peterse2016-05-192-2/+2
|
* Remove left-over use of strip_heredocYorick Peterse2016-05-191-1/+1
|
* Removed stray strip_heredoc from migration helpersYorick Peterse2016-05-131-1/+1
|
* Fixed styling per Rubocop pedanticsYorick Peterse2016-05-121-1/+3
|
* Link to migration guide in migration templatesYorick Peterse2016-05-122-0/+6
|
* Added custom migration generator templatesYorick Peterse2016-05-122-0/+84
| | | | | This allows us to automatically include Gitlab::Database::MigrationHelpers into newly generated migrations.
* Added helper methods for database migrationsYorick Peterse2016-05-121-0/+132
| | | | | | | | These helpers can be used to perform migrations without taking down the entire application. For example, the method "add_column_with_default" can be used to add a new column with a default value without locking the entire table.
* Links for redmine issue references are generated correctly againBenedikt Huss2016-05-101-0/+3
|
* Merge branch 'cascade_drop' into 'master' Robert Speicher2016-05-091-1/+3
|\ | | | | | | | | | | | | Add if exists to drop command Add `IF EXISTS` as a precaution. Related to gitlab-org/gitlab-ce!4020 See merge request !4100
| * Add if exists to drop commandDrew Blessing2016-05-091-1/+3
| |
* | Expose MergeRequest#user_notes_count in the API and use the method in issues ↵Rémy Coutable2016-05-091-1/+1
| | | | | | | | | | | | list Signed-off-by: Rémy Coutable <remy@rymai.me>
* | API: Expose Issue#user_notes_countcnam-dep2016-05-091-1/+1
| |
* | Use the proper GitLab URL for links in WikiArtem Sidorenko2016-05-091-1/+1
| |
* | Improve multiple branch push performance by memoizing permission checkingStan Hu2016-05-091-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If you attempt to push thousands of branches at once, the 60-second timeout will occur because GitAccess checking does a lot of work to check if the user has permission to push to a branch. This changes does two things: 1. Instead of making 1 DB query per branch push, use a memoized list of protected branches to check 2. Memoize what permissions the user has to perform on this project On a test of 10,000 branch pushes, this prevents gitlab-shell from hitting the 60-second timeout. Closes #17225
* | Update SVG sanitizer to conform to SVG 1.1Stan Hu2016-05-062-0/+144
| | | | | | | | | | | | | | | | | | | | | | Use a custom Loofah scrubber since sanitize 2.x transformers are inadequate to handle case-sensitive SVG attributes. sanitize parses documents as HTML instead of XML, which causes all SVG attribute names (e.g. viewBox) to be downcased. * SVG element list: https://www.w3.org/TR/SVG/eltindex.html * SVG attribute list: https://www.w3.org/TR/SVG/attindex.html Closes #14555
* | Merge branch 'annotate-models' into 'master' Douwe Maan2016-05-061-0/+44
|\ \ | | | | | | | | | | | | | | | | | | Update annotations on models See merge request !3962
| * | Auto annotate models on migrationannotate-modelsZeger-Jan van de Weg2016-05-061-0/+44
| | | | | | | | | | | | [ci skip]
* | | Merge branch 'cascade_drop' into 'master' Robert Speicher2016-05-061-1/+4
|\ \ \ | | |/ | |/| | | | | | | Rake drop tables with cascade See merge request !4020
| * | Rake drop tables with cascadeDrew Blessing2016-05-031-1/+4
| | |
* | | Merge branch 'fix/import-url-issues' into 'master' Robert Speicher2016-05-051-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix importer bug when throwing exceptions Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15681 See merge request !3941
| * | | fix var errorJames Lopez2016-04-271-1/+1
| | | |
* | | | Fix passing nil to protected_tag?tag-existsYorick Peterse2016-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously this method would directly receive the output of tag_name(). This method could either return a String or nil. In the previous setup this would somehow magically work but because Rugged::TagCollection#[] doesn't accept nil values it started to fail. To work around this the elsif in change_access_check() assigns the result of tag_name() to a local and then _only_ calls protected_tag?() if the tag name is not nil. The extra parenthesis are put in place to ensure that things are parsed correctly, without these the code would be parsed as follows: elsif tag_ref = (tag_name(ref) && protected_tag(tag_ref)) During runtime this would basically resolve to: elsif tag_ref = (tag_name(ref) && protected_tag(nil)) This is because when you refer to the variable you're assigning _in_ the assignment Ruby returns nil instead of raising an error.
* | | | Use tag_exists? in GitAccess#protected_tag?Yorick Peterse2016-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | This removes the need for retrieving the entire list of tags just to check if a specific one exists.
* | | | Fix the line code when importing PR review comments from GitHubDouglas Barbosa Alexandre2016-05-051-4/+17
| |_|/ |/| | | | | | | | | | | Pull Request Review Comments are comments on a portion of the unified diff.
* | | Merge branch 'use-rugged-to-create-tag' into 'master' Rémy Coutable2016-05-041-18/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Rugged's TagCollection#create instead of gitlab-shell's Repository#add_tag for better performance This was originally opened at !1757 by @pcarranza but I changed it to use Rugged instead of gitlab_git, following @DouweM's request. Once this is merged, https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/26 will be mergeable too. See merge request !3745
| * | | Use Rugged's TagCollection#create instead of gitlab-shell's ↵Rémy Coutable2016-05-041-18/+0
| | |/ | |/| | | | | | | | | | | | | Repository#add_tag for better performance Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'pacoguzman/gitlab-ce-15001-since-and-until-operators-api-commits'Douwe Maan2016-05-043-2/+24
|\ \ \ | |/ / |/| | | | | | | | # Conflicts: # Gemfile.lock
| * | API support for the 'since' and 'until' operators on commit requestsPaco Guzman2016-04-293-2/+24
| |/ | | | | - Parameter validation as ISO8601 format
* | Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher2016-05-022-6/+19
|\ \
| * \ Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqMarin Jankovski2016-04-262-6/+19
| |\ \ | | |/ | |/|
| | * Merge branch '15579-filter-milestone-confidential-issues-api' into 'master' Robert Speicher2016-04-261-1/+9
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Prevent information disclosure via milestone API Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15579 See merge request !1961
| | | * Filter confidential issues from milestones API if user does not have accessStan Hu2016-04-251-1/+9
| | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15579
| | * | Merge branch 'fix-private-snippet-api' into 'master' Robert Speicher2016-04-251-5/+10
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent information disclosure via snippet API Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15580 See merge request !1958
| | | * | Prevent private snippets in public/internal projects from being leaked via APIStan Hu2016-04-251-5/+10
| | | |/ | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15580
* | | | Properly handle bigger filesZeger-Jan van de Weg2016-04-281-4/+9
| | | |
* | | | Replace gitlab-workhorse with GitLab Workhorse where appropriateinitd_gitlab_workhorse_renameAchilleas Pipinellis2016-04-281-6/+6
| | | |
* | | | Merge branch 'use-remote-ip-for-akismet' into 'master' Rémy Coutable2016-04-282-4/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use ActionDispatch Remote IP for Akismet checking Previously all remote IPs appeared at 127.0.0.1, which made Akismet not very useful. Using the ActionDispatch Remote IP (http://api.rubyonrails.org/classes/ActionDispatch/RemoteIp.html) should provide more reliable results. Closes #16629 See merge request !3961
| * | | | Use ActionDispatch Remote IP for Akismet checkingStan Hu2016-04-272-4/+12
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously all remote IPs appeared at 127.0.0.1, which made Akismet not very useful. Using the ActionDispatch Remote IP (http://api.rubyonrails.org/classes/ActionDispatch/RemoteIp.html) should provide more reliable results. Closes #16629
* | | | Backport GitHub Enterprise import support from EEStan Hu2016-04-261-4/+11
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | These changes were pulled from GitLab EE to support configuring an alternative API URL than the default https://api.github.com. In addition, the `verify_ssl` flag allows users to disable SSL cert checking. One modification: add a default `args` option if it does not exist to avoid breaking existing configurations.
* | | Merge branch 'emoji-unicode-fix' into 'master' Jacob Schatz2016-04-251-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes issue with emoji comments not showing correct emoji image Previously it would look for the unicode character inside the award menu. But this menu might not always be there. Now, the unicode characters are loaded onto the page in an array which the award emoji that looks in to get the correct emoji unicode character Fixes #15512 See merge request !3885
| * | | Removed usage of normilizeEmojiName methodemoji-unicode-fixPhil Hughes2016-04-221-2/+1
| | | | | | | | | | | | | | | | Fixed some Ruby based on feedback
| * | | Fixes issue with emoji comments not showing correct emoji imagePhil Hughes2016-04-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it would look for the unicode character inside the award menu. But this menu might not always be there. Now, the unicode characters are loaded onto the page in an array which the award emoji that looks in to get the correct emoji unicode character Fixes #15512
* | | | Merge branch 'issue_14904' into 'master' Jacob Schatz2016-04-251-0/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new shortcuts Closes #14904 - On a project: `i` To navigate to New Issue page. - On a issuable: `l` To open Label dropdown on a issuable. - Global: Typing `?` multiple times now toggles the modal. See merge request !3686
| * | | Merge remote-tracking branch 'origin/master' into issue_14904Alfredo Sumaran2016-04-215-41/+40
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/master' into issue_14904Alfredo Sumaran2016-04-203-1/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/shared/issuable/_sidebar.html.haml
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into issue_14904Alfredo Sumaran2016-04-2016-40/+289
| |\ \ \ \ \
| * | | | | | Add shortcut_path to GonHelper moduleAlfredo Sumaran2016-04-181-0/+1
| | | | | | |
* | | | | | | Merge branch 'rs-503-page' into 'master' Dmitriy Zaporozhets2016-04-252-2/+4
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a branded 503 static error page [ci skip] Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15398 See merge request !3894
| * | | | | | Add a branded 503 static error pagers-503-pageRobert Speicher2016-04-222-2/+4
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15398
* | | | | | Merge branch 'fix-project-hook-delete-permissions' into 'master' Rémy Coutable2016-04-251-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent users from deleting Webhooks via API they do not own Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15576 See merge request !1959