summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'allow-@' into 'master' Douwe Maan2016-02-021-0/+8
|\ | | | | | | | | | | | | Allow "@" in file names and path Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4111 See merge request !2665
| * Allow "@" in file names and pathallow-@Jacob Vosmaer2016-02-011-0/+8
| |
* | Allow manual resize of js-autosize textareasrs-relax-autosizeRobert Speicher2016-02-011-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | First, the autosize library was being too controlling and removed the `resize` property from any elements to which it was attached, removing the drag handle. Second, we detect when the user manually resizes an autosize textarea, and then remove the autosize behavior from it and increase its max-height. This should allow for the best of both worlds. Closes #12832
* | Merge branch 'merge-request-closes-issues-performance' into 'master'Robert Speicher2016-02-011-15/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | Optimize fetching issues closed by a merge request Related issue: #12419 See merge request !2625
| * | Optimize fetching issues closed by a merge requestmerge-request-closes-issues-performanceYorick Peterse2016-02-011-15/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of running ClosingIssueExtractor for every commit in a merge request we can gather all the commit messages (and the merge request description), concatenate all this together and then run ClosingIssueExtractor only once. The result of this is that MergeRequest#closes_issues is now between 3.5x and 4x faster than the old setup. Using a merge request with 10 commits (each referencing a number of issues to close) this reduced the call duration from around 200 milliseconds to around 50 milliseconds. As a result of these changes the Jira related tests for MergeRequest#closes_issues have been removed. These tests stubbed Commit#closes_issues meaning that the only code that was really tested was the call to Array#uniq to filter out duplicate issues. As this code is no longer used (nor present) the corresponding tests were removed. Related: gitlab-org/gitlab-ce#12419
* | | Render sanitized SVG imagesStan Hu2016-02-011-0/+27
| |/ |/| | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9265
* | Merge branch 'rename-inline-diff' into 'master' Robert Speicher2016-01-315-31/+103
|\ \ | | | | | | | | | | | | Mark inline difference between old and new paths when a file is renamed See merge request !2652
| * | Fix specs and add a new oneDouwe Maan2016-01-302-28/+37
| | |
| * | Mark inline difference between old and new paths when a file is renamedDouwe Maan2016-01-294-28/+91
| | |
* | | Merge branch 'rs-issue-12706' into 'master' Douwe Maan2016-01-303-8/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase the minimum length for commit SHA matching to 7 This is the git default and will help to prevent false positive matches. Closes #12706 See merge request !2655
| * | | Increase the minimum length for commit SHA matching to 7rs-issue-12706Robert Speicher2016-01-293-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | This is the git default and will help to prevent false positive matches. Closes #12706
* | | | Merge remote-tracking branch 'origin/background-delete-process'Dmitriy Zaporozhets2016-01-301-3/+3
|\ \ \ \ | |/ / / |/| | |
| * | | First pass at deleting projects in the background.Josh Frye2016-01-291-3/+3
| | | |
* | | | Fix old version warning when viewing wiki latest version via version_idfix-viewing-wiki-page-lastest-version-via-version-idDouglas Barbosa Alexandre2016-01-291-0/+32
|/ / /
* | | Merge branch 'note-background-job' into 'master' Dmitriy Zaporozhets2016-01-292-3/+27
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Background process note logic for #3948 Quick and dirty way to get *most* of the note processing out of band and into the background. Seeing some pretty nice speed bumps. Keep in mind that doing this in process results in slower and slower responses as more notes are added and more participants exist. ``` without background processing Completed 200 OK in 627ms (Views: 0.5ms | ActiveRecord: 32.3ms) Completed 200 OK in 478ms (Views: 0.8ms | ActiveRecord: 28.3ms) Completed 200 OK in 1107ms (Views: 0.6ms | ActiveRecord: 36.6ms) with background processing Completed 200 OK in 108ms (Views: 0.6ms | ActiveRecord: 4.7ms) Completed 200 OK in 78ms (Views: 0.5ms | ActiveRecord: 4.5ms) Completed 200 OK in 164ms (Views: 0.5ms | ActiveRecord: 8.3ms) ``` As you can see, speeds are consistent when doing the harder work out of process. I'm not sure the number of sql queries we're saving, but based on the logs alone it's a pretty good amount. @dzaporozhets @yorickpeterse I would love some input on this. See merge request !2631
| * | Fix Rubocop errornote-background-jobJosh Frye2016-01-281-3/+3
| | |
| * | Update testsJosh Frye2016-01-282-3/+27
| | |
* | | Merge branch 'rs-remove-ip-blocking' into 'master' Dmitriy Zaporozhets2016-01-291-68/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partially revert "Add IP check against DNSBLs at account sign-up" This partially reverts 6a5cd3ca - we keep the migration and add a new migration that reverts it in order to keep migration history intact. See merge request !2643
| * | | Partially revert "Add IP check against DNSBLs at account sign-up"rs-remove-ip-blockingRobert Speicher2016-01-281-68/+0
| | | | | | | | | | | | | | | | | | | | This partially reverts 6a5cd3ca - we keep the migration and add a new migration that reverts it in order to keep migration history intact.
* | | | Merge branch 'rs-transient-capybara-timeout' into 'master' Dmitriy Zaporozhets2016-01-292-1/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent transient Capybara timeouts during feature tests The problem occurred because asset compilation takes a long time, so when the asset cache didn't exist and the first test ran, it would often (randomly) time out during the generation before the actual test even had a chance to run. Now we check if the cache exists before the suite runs, and if not, we manually fire a request to the root URL in order to generate it. This should allow subsequent tests to use the cached assets. See merge request !2646
| * | | | Prevent transient Capybara timeouts during feature testsrs-transient-capybara-timeoutRobert Speicher2016-01-282-1/+22
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem occurred because asset compilation takes a long time, so when the asset cache didn't exist and the first test ran, it would often (randomly) time out during the generation before the actual test even had a chance to run. Now we check if the cache exists before the suite runs, and if not, we manually fire a request to the root URL in order to generate it. This should allow subsequent tests to use the cached assets.
* | | | Merge branch 'hotfix/ruby-21-broken-update' into 'master' Marin Jankovski2016-01-291-6/+6
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix syntax error on 2.1 and rubocop on 2.2 Background: Hashes `{:'key': 'value'}` are not valid in 2.1 but are recommended by Rubocop on 2.2. We only use those when we have a key such as `weird-key`, `weird.key`, etc... We could disable Rubocop but it wouldn't warn us about the recommended syntax since `Ruby 1.9`: `{key: 'value'}`, which is valid for `Ruby 1.9+`. Workaround 1 could be disabling `Style/HashSyntax:` in `rubocop.yml`. Workaround 2 (tried in this MR) is to trick Rubocop using `.to_sym` which is effectively the same as adding the `:`. This would allow to keep the warning in place. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12801 See merge request !2637
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-01-282-33/+33
| |\ \ \ | | |/ / | | | | | | | | hotfix/ruby-21-broken-update
| * | | trick rubocop and temporarily add ruby 2.1 images for any branchJames Lopez2016-01-281-6/+6
| | |/ | |/|
* | | Merge branch 'mr-merge-base' into 'master' Robert Speicher2016-01-281-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Correctly determine MR diff base when MR has merge conflicts Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12779 See merge request !2632
| * \ \ Merge branch 'master' into mr-merge-basemr-merge-baseDouwe Maan2016-01-285-32/+40
| |\ \ \ | | |/ /
| * | | Fix specsDouwe Maan2016-01-281-1/+1
| | | |
* | | | Merge branch 'highlight-blame' into 'master' Robert Speicher2016-01-282-14/+24
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Fix highlighting in blame view. See merge request !2630
| * | | Merge branch 'master' into highlight-blameDouwe Maan2016-01-285-32/+40
| |\ \ \ | | | |/ | | |/|
| * | | Move blame group logic to dedicated classDouwe Maan2016-01-282-14/+24
| | |/ | |/|
* | | Merge branch 'issue_2406' into 'master' Dmitriy Zaporozhets2016-01-281-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Show list of forks for a given Project Closes #2406 See merge request !2376
| * | | Fix broken specs. #2406Rubén Dávila2016-01-201-2/+2
| | | |
* | | | Improve consistency and duplication for Merge Request APIimprove-mr-apiDmitriy Zaporozhets2016-01-281-31/+31
| |_|/ |/| | | | | | | | | | | | | | | | | * Follow REST for merge request API route * Remove repeating comments API for MR Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'update-ruby-2.2.4' into 'master' Douwe Maan2016-01-271-6/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Ruby version to 2.2.4 (latest previous stable) and update docs Tests and issues added to https://github.com/gitlabhq/gitlabhq/issues/8696 were all fine after the upgrade. Main issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/3340 See merge request !2534
| * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into update-ruby-2.2.4James Lopez2016-01-2712-55/+449
| |\ \ \ | | | |/ | | |/|
| * | | fix rubocop new 2.2 syntax issuesJames Lopez2016-01-251-6/+6
| | | |
* | | | Merge branch 'events-performance' into 'master' Robert Speicher2016-01-271-21/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve performance of retrieving last update times for events See 75195eefcca4cb3961986c90c8e837da02f30134 and https://gitlab.com/gitlab-org/gitlab-ce/issues/12415#note_3387317 for the juicy details. Related issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12415 See merge request !2613
| * | | | Use Atom update times of the first eventevents-performanceYorick Peterse2016-01-271-21/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By simply loading the first event from the already sorted set we save ourselves extra (slow) queries just to get the latest update timestamp. This removes the need for Event.latest_update_time and significantly reduces the time needed to build an Atom feed. Fixes gitlab-org/gitlab-ce#12415
* | | | | Merge branch 'fix-ci-runners-version-update' into 'master' Robert Speicher2016-01-272-0/+29
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix CI runner version not being properly updated when asked for a build Due to broken implementation of attribute_for_keys the runner information was not updated correctly. This MR adds test to check that such scenario will never happen again. See merge request !2618
| * | | | | Fix CI runner version not being properly updated when asking for a buildfix-ci-runners-version-updateKamil Trzcinski2016-01-272-0/+29
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Due to broken implementation of attribute_for_keys the runner information was not updated correctly. This MR adds test to check that such scenario will never happen again.
* | | | | Merge branch 'rs-2fa-requirement-wording' into 'master' Dmitriy Zaporozhets2016-01-271-5/+5
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Update wording for 2FA requirement notice See merge request !2582
| * | | | Update wording for 2FA requirement noticers-2fa-requirement-wordingRobert Speicher2016-01-231-5/+5
| | |/ / | |/| |
* | | | Merge branch 'fix/commit-status-artifacts' into 'master' Kamil Trzciński2016-01-272-55/+80
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use generic method to checks if artifacts are available Closes #12626 See merge request !2576
| * | | | Update commit status factory to reflect recent changesfix/commit-status-artifactsGrzegorz Bizon2016-01-261-2/+1
| | | | |
| * | | | Add specs for build created using generic commit statusGrzegorz Bizon2016-01-262-55/+81
| | |/ / | |/| |
* | | | Update ExternalIssue regex for JIRA integrationBlake Hitchcock2016-01-262-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pattern in the `::reference_pattern` class method in the ExternalIssue model does not match all valid forms of JIRA project names. I have updated the regex to match JIRA project names with numbers and underscores. More information on valid JIRA project names can be found here: https://confluence.atlassian.com/jira/changing-the-project-key-format-192534.html * The first character must be a letter, * All letters used in the project key must be from the Modern Roman Alphabet and upper case, and * Only letters, numbers or the underscore character can be used.
* | | | Merge branch 'track-project-import-failure' into 'master' Douwe Maan2016-01-261-0/+106
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Track project import failure Fixes #12512 This also help us on identify why the import process is returning the wrong status when the project was successfully imported. Like mentioned in the issue #12450 See merge request !2538
| * | | | Extract Projects::ImportService service from RepositoryImportWorkerDouglas Barbosa Alexandre2016-01-251-0/+106
| | | | |
* | | | | Merge branch 'rs-issue-12677' into 'master' Douwe Maan2016-01-261-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update text_color_for_bg helper to support RGB triplet color codes Closes #12677 See merge request !2587
| * | | | | Update text_color_for_bg helper to support RGB triplet color codesrs-issue-12677Robert Speicher2016-01-241-0/+5
| | |_|/ / | |/| | | | | | | | | | | | | Closes #12677