summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | Merge branch 'extend-events-api'Dmitriy Zaporozhets2015-12-041-7/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Extent Event and Note APIextend-events-apiDmitriy Zaporozhets2015-12-041-7/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add note to Events API * add author section to Events API * add noteable_id and noteable_type to Notes API Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | | | | | Add API endpoint to fetch merge request commits listDmitriy Zaporozhets2015-12-041-0/+17
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | | | | Merge branch 'master' into ui/form-consistencyDouwe Maan2015-12-034-6/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'deprecated_warnings' into 'master' Dmitriy Zaporozhets2015-12-031-5/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git rid of deprecated warnings after rails update https://gitlab.com/gitlab-org/gitlab-ce/issues/3798 https://gitlab.com/gitlab-org/gitlab-ce/issues/3797 See merge request !1946
| | * | | | | | | | | | | | | fix deprecation messages in testsValery Sizov2015-12-031-5/+7
| | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Fix broken spec related to MySQL and fractional seconds support.Rubén Dávila2015-12-031-1/+3
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Prevent impersonation if blockedAndrew Tomaka2015-12-022-0/+29
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Use consistent casing for form field labelsDouwe Maan2015-12-021-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #9868 from yms9654/commit-without-whitespaceStan Hu2015-12-011-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Add ignore whitespace change option to commit view
| * | | | | | | | | | | | Add ignore whitespace change option to commit viewMinsik Yoon2015-12-011-0/+15
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'stanhu/gitlab-ce-fix-404-after-project-removal'Robert Speicher2015-11-301-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See merge request !1916
| * | | | | | | | | | | | Fix 404 in redirection after removing a projectStan Hu2015-11-251-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9844 Closes #3559
* | | | | | | | | | | | | Merge branch 'rails_update_to_4_2' into 'master' Valery Sizov2015-11-3015-283/+224
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails update to 4.2.4 https://gitlab.com/gitlab-org/gitlab-ce/issues/2694 See merge request !1902
| * | | | | | | | | | | | test fixValery Sizov2015-11-307-9/+24
| | | | | | | | | | | | |
| * | | | | | | | | | | | fix specsrails_update_to_4_2Valery Sizov2015-11-307-68/+60
| | | | | | | | | | | | |
| * | | | | | | | | | | | fix notification_service specsValery Sizov2015-11-302-206/+140
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'gmail_actions_links_on_set_of_emails' into 'master' Dmitriy Zaporozhets2015-11-301-1/+64
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show Gmail actions links only on expected set of emails See merge request !1901
| * | | | | | | | | | | | Remove some repetition in notify spec.gmail_actions_links_on_set_of_emailsMarin Jankovski2015-11-251-61/+32
| | | | | | | | | | | | |
| * | | | | | | | | | | | Specs for links in email notifications for Gmail Actions.Marin Jankovski2015-11-251-1/+93
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'jcorcuera/gitlab-ce-issue_3428'Douwe Maan2015-11-271-0/+20
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Strip attributes for Milestone and Issuable. #3428Jose Corcuera2015-11-261-0/+20
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'master' of https://github.com/gitlabhq/gitlabhqStan Hu2015-11-261-6/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #9670 from janten/gravatar-retinaStan Hu2015-11-261-6/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | Add support for HiDPI displays in gravatar service
| | * | | | | | | | | | | Fix merge errorJan-Gerd Tenberge2015-10-22156-1599/+3825
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into gravatar-retinaJan-Gerd Tenberge2015-10-221-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Update specJan-Gerd Tenberge2015-10-191-2/+2
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Update specJan-Gerd Tenberge2015-10-191-1/+1
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Add support for HiDPI displays in gravatar serviceJan-Gerd Tenberge2015-09-261-4/+8
| | |/ / / / / / / / / / / /
* | | | | | | | | | | | | | Fix raw private snippets access workflowDouglas Barbosa Alexandre2015-11-251-0/+115
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'sherlock-total-query-time' into 'master' Yorick Peterse2015-11-251-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added total query time to Sherlock This makes it easier to see if a problem is caused by slow queries or slow Ruby code (unrelated to any SQL queries that might be used). See merge request !1887
| * | | | | | | | | | | | | Added total query time to Sherlocksherlock-total-query-timeYorick Peterse2015-11-241-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it easier to see if a problem is caused by slow queries or slow Ruby code (unrelated to any SQL queries that might be used).
* | | | | | | | | | | | | | Merge branch 'service-tests' into 'master' Dmitriy Zaporozhets2015-11-242-0/+68
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tests for (Create|Update)ReleaseService As promised See merge request !1875
| * | | | | | | | | | | | | Add tests for (Create|Update)ReleaseServiceservice-testsRobert Schilling2015-11-232-0/+68
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'required_version_and_docs_update' into 'master' Dmitriy Zaporozhets2015-11-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update required version of lfs client and separate the docs for users and admins. See merge request !1855
| * | | | | | | | | | | | | Update required version of lfs client and separate the docs for users and ↵required_version_and_docs_updateMarin Jankovski2015-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | admins.
* | | | | | | | | | | | | | Merge branch 'issue_2296' into 'master' Douwe Maan2015-11-232-12/+122
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate system note after Task item has been updated on Issue or Merge Request. Reference: #2296 Everytime the User check or uncheck a Task Item from the Issue or Merge Request description, a new update is going to be added to the activity logs of the Issue or Merge Request. Note that when using the edit form, you can only update the Task item status or add/delete/modify existing ones. Doing both actions is not fully supported. See merge request !1848
| * | | | | | | | | | | | | | Little fix for Rubocop's complaints. #2296issue_2296Rubén Dávila2015-11-201-2/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix bug that happened when replacing the Task list. #2296Rubén Dávila2015-11-201-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | REF: https://gitlab.com/gitlab-org/gitlab-ce/issues/2296#note_2724697
| * | | | | | | | | | | | | | Generate system note after Task item has been updated on Issue or Merge ↵Ruben Davila2015-11-192-12/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Request. #2296 Everytime the User check or uncheck a Task Item from the Issue or Merge Request description, a new update is going to be added to the activity logs of the Issue or Merge Request. Note that when using the edit form, you can only update the Task item status or add/delete/modify existing ones. Doing both actions is not fully supported.
* | | | | | | | | | | | | | | Allow editing a release in API via PUT methodRobert Schilling2015-11-211-0/+38
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Only allow to create a release if it does not exist yetRobert Schilling2015-11-211-1/+16
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Use POST to create a new release instead of PUTRobert Schilling2015-11-211-4/+4
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | API: Return 404 if the tag for a release does not existRobert Schilling2015-11-211-0/+8
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Make tag API consistent for release featureRobert Schilling2015-11-211-3/+3
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'fix-merge-requests-without-source-projects' into 'master' Dmitriy Zaporozhets2015-11-211-0/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle removed source projects in MR CI commits Fixes #3599 @dzaporozhets assigning this to you since you wrote the original code. Perhaps checking for the source project isn't the right way, but I'm not sure if there's a better way (e.g. somewhere earlier in the process) that we can detect this. See merge request !1859
| * | | | | | | | | | | | | | | Handle removed source projects in MR CI commitsfix-merge-requests-without-source-projectsYorick Peterse2015-11-201-0/+25
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling MergeRequest#ci_commit the code would previously raise an error if the source project no longer existed (e.g. because the user removed their fork). See #3599 for more information.
* | | | | | | | | | | | | | | Merge branch 'gitlab-ee-d39de0ea-backport' into 'master' Dmitriy Zaporozhets2015-11-211-5/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port GitLab EE ProjectsFinder changes These changes were added in GitLab EE commit d39de0ea91b26b8840195e5674b92c353cc16661. The tests were a bit bugged (they used a non existing group, thus not testing a crucial part) which I only noticed when porting CE changes to EE. See merge request !1854
| * | | | | | | | | | | | | | | Port GitLab EE ProjectsFinder changesgitlab-ee-d39de0ea-backportYorick Peterse2015-11-201-5/+12
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These changes were added in GitLab EE commit d39de0ea91b26b8840195e5674b92c353cc16661. The tests were a bit bugged (they used a non existing group, thus not testing a crucial part) which I only noticed when porting CE changes to EE.
* | | | | | | | | | | | | | | Merge branch 'ee-flog' into 'master' Dmitriy Zaporozhets2015-11-211-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce method complexity in AutocompleteController Backport of gitlab-org/gitlab-ee!58 See merge request !1833