summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Make sure that token `ensure_*` method always returns a tokenGrzegorz Bizon2015-12-111-1/+8
| | | |
* | | | Add specs for `TokenAuthenticatable` concernGrzegorz Bizon2015-12-111-0/+50
|/ / /
* | | Merge branch 'zj/gitlab-ce-copying-file-seen-as-licence'Douwe Maan2015-12-111-1/+20
|\ \ \ | |_|/ |/| |
| * | Merge branch 'master' into copying-file-seen-as-licenceZeger-Jan van de Weg2015-12-1071-310/+801
| |\ \ | | |/
| * | Licence also accepted as license fileZeger-Jan van de Weg2015-12-101-1/+10
| | |
| * | Merge branch 'master' into copying-file-seen-as-licenceZeger-Jan van de Weg2015-11-1121-164/+741
| |\ \
| * | | Add specs on #licenseZeger-Jan van de Weg2015-10-151-0/+11
| | | |
* | | | Don't allow to edit award emoji commentsemoji_edit_disallowValery Sizov2015-12-101-0/+17
| |_|/ |/| |
* | | Merge branch 'master' into split-up-buildsDouwe Maan2015-12-091-1/+65
|\ \ \
| * \ \ Merge branch 'master' into merge-if-greenDouwe Maan2015-12-093-0/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/controllers/projects/merge_requests_controller.rb # config/routes.rb
| * \ \ \ Merge branch 'master' into zj/gitlab-ce-merge-if-greenDouwe Maan2015-12-086-1/+165
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-12-0711-205/+276
| |\ \ \ \ \
| * | | | | | Button fixZeger-Jan van de Weg2015-12-071-1/+1
| | | | | | |
| * | | | | | Incorporate feedbackZeger-Jan van de Weg2015-12-051-8/+36
| | | | | | |
| * | | | | | Specs for 'Merge When Build Succeeds'Zeger-Jan van de Weg2015-12-021-0/+24
| | | | | | |
| * | | | | | Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-11-1823-47/+303
| |\ \ \ \ \ \
| * | | | | | | API support, incorporated feedbackZeger-Jan van de Weg2015-11-181-1/+13
| | | | | | | |
* | | | | | | | Tag model specsDouwe Maan2015-12-0968-68/+68
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Update annotationsStan Hu2015-12-083-0/+3
| |_|_|/ / / |/| | | | |
* | | | | | Add custom NamespaceValidatorRobert Speicher2015-12-071-1/+17
| | | | | |
* | | | | | Add custom ColorValidatorRobert Speicher2015-12-071-0/+15
| | | | | |
* | | | | | Add custom UrlValidatorRobert Speicher2015-12-071-0/+16
| | | | | |
* | | | | | Merge branch 'report-ssl-errors' of https://gitlab.com/stanhu/gitlab-ceDmitriy Zaporozhets2015-12-071-0/+6
|\ \ \ \ \ \
| * | | | | | Handle and report SSL errors in Web hook test. Check for status 200 for success.Stan Hu2015-12-041-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a Web hook test fails due to an SSL error or some other error, report the result back to the user instead of an Error 500. Closes #3656 Handle response
* | | | | | | Merge branch 'webhook_payload_with_changes' into 'master' Valery Sizov2015-12-071-0/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add added, modified and removed properties to commit object in webhook https://gitlab.com/gitlab-org/gitlab-ee/issues/20 See merge request !1988
| * | | | | | | fixes after reviewwebhook_payload_with_changesValery Sizov2015-12-071-1/+1
| | | | | | | |
| * | | | | | | fox specsValery Sizov2015-12-071-1/+1
| | | | | | | |
| * | | | | | | Add added, modified and removed properties to commit object in webhookValery Sizov2015-12-041-0/+11
| |/ / / / / /
* | | | | | | Merge branch 'issue_1156'Douwe Maan2015-12-071-0/+100
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Call update hook from new GitHooksService class. #3069Rubén Dávila2015-12-031-1/+1
| | | | | | |
| * | | | | | Run custom Git hooks when creating or deleting branches through the UI. #1156Rubén Dávila2015-12-031-0/+100
| |/ / / / /
* | | | | | Merge branch 'master' into link-refsDouwe Maan2015-12-031-1/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix broken spec related to MySQL and fractional seconds support.Rubén Dávila2015-12-031-1/+3
| | | | | |
* | | | | | Merge branch 'master' into link-refsDouwe Maan2015-12-022-41/+27
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'rails_update_to_4_2' into 'master' Valery Sizov2015-11-302-41/+27
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails update to 4.2.4 https://gitlab.com/gitlab-org/gitlab-ce/issues/2694 See merge request !1902
| | * | | | | fix specsrails_update_to_4_2Valery Sizov2015-11-302-41/+27
| | | | | | |
* | | | | | | Render commit reference using short sha, but include full sha in comment.Douwe Maan2015-12-012-6/+33
| | | | | | |
* | | | | | | Fix specsDouwe Maan2015-11-301-10/+6
| | | | | | |
* | | | | | | Render commit range reference with short shas, link to full shas.Douwe Maan2015-11-301-66/+45
|/ / / / / /
* | | | | | Strip attributes for Milestone and Issuable. #3428Jose Corcuera2015-11-261-0/+20
|/ / / / /
* | | | | 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 'emoji_votes' into 'master' Dmitriy Zaporozhets2015-11-192-86/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Award Emoji This it first iteration of award emoji feature. We have plan to extend emoji picker by the next release. For now, you can add award by clicking to the emoji picker or posting a regular comment with emoji like ":+1:" and any other. You can post not only emoji that listed in the emoji picker. See merge request !1825
| * | | | | fox testsemoji_votesValery Sizov2015-11-191-3/+2
| | | | | |
| * | | | | added specsValery Sizov2015-11-191-0/+13
| | | | | |
| * | | | | added spinach testsValery Sizov2015-11-191-75/+0
| | | | | |
| * | | | | award emojiValery Sizov2015-11-191-11/+0
| | |/ / / | |/| | |
* | | | | Refactor User#authorized_groups/projectsYorick Peterse2015-11-181-22/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These methods no longer include public groups/projects (that don't belong to the actual user) as this is handled by the various finder classes now. This also removes the need for passing extra arguments. Note that memoizing was removed _explicitly_. For whatever reason doing so messes up the users controller to a point where it claims a certain user does _not_ have access to certain groups/projects when it does have access. Existing code shouldn't be affected as these methods are only called in ways that they'd run queries anyway (e.g. a combination of "any?" and "each" which would run 2 queries regardless of memoizing).
* | | | | Added Project.visible_to_userYorick Peterse2015-11-181-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | This method can be used to filter projects to those visible to a given user.
* | | | | Group methods for filtering public/visible groupsYorick Peterse2015-11-181-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | These methods will be used to get a list of groups, optionally restricted to only those visible to a given user.
* | | | | Added Event.limit_recentYorick Peterse2015-11-181-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | This will be used to move some querying logic from the users controller to the Event model (where it belongs).