summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Collapse)AuthorAgeFilesLines
* Add support for `twitter:label` meta tagsrs-opengraphRobert Speicher2015-12-241-0/+18
|
* Add method that persist ensured token in `TokenAuthenticatable`Grzegorz Bizon2015-12-231-6/+13
|
* Fix method that ensures authentication tokenGrzegorz Bizon2015-12-231-0/+4
| | | | | | Until now, `ensure_#{token_filed_name}` method didn't persist new token in database. This closes #4235.
* Merge branch 'add_email_unlock' into 'master' Robert Speicher2015-12-211-0/+1
|\ | | | | | | | | | | | | | | | | | | | | Allow account unlock via email We see a lot of users get confused about what it means when your account gets locked. Many try to reset their password and are still faced with a lockout. With this change, users receive an email that allows them to unlock their account immediately. The previous behavior where the account is auto-unlocked after a time also still works. See merge request !2049
| * Allow account unlock via emailDrew Blessing2015-12-141-0/+1
| |
* | Merge branch 'issue_3452'Douwe Maan2015-12-211-0/+64
|\ \
| * | Fix broken spec. #3452Rubén Dávila2015-12-161-1/+1
| | |
| * | Add link to MR from Build detail page. #3452Rubén Dávila2015-12-161-0/+64
| | |
* | | Merge branch 'coverage-regex' into 'master' Douwe Maan2015-12-211-0/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix build coverage regex matching to allow captures. Fixes #2644 /cc @DouweM See merge request !2138
| * | | Fix build coverage regex.Jared Szechy2015-12-201-0/+6
| |/ / | | | | | | | | | | | | | | | Added a spec for regex captures as well. Fixes #2644
* | | Backport JIRA serviceDrew Blessing2015-12-184-5/+167
|/ /
* | Merge branch 'add-open-issues-count-to-api' of ↵Dmitriy Zaporozhets2015-12-161-1/+5
|\ \ | | | | | | | | | | | | | | | https://gitlab.com/stanhu/gitlab-ce Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Add open_issues_count to project APIStan Hu2015-12-111-1/+5
| | | | | | | | | | | | This is needed to support Huboard and a generally useful value.
* | | Fixed Rubocop offensesGabriel Mazetto2015-12-155-21/+19
| |/ |/|
* | Merge branch 'master' into ci/persist-registration-tokenGrzegorz Bizon2015-12-1419-908/+234
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (66 commits) Fix runners admin view Fix migrations Rename mention of gitlab-git-http-server to gitlab-workhorse Bump Redis requirement to 2.8 for Sidekiq 4 requirements Fix wording on runner setup page add details on how to change saml button label Fix tests Move awards back to gray panel and few improvements to sidebar Few UI improvements to new sidebar implementation Fix tests for new issuable sidebar Update changelog Implement new sidebar for merge request page Make edit link on issuable sidebar works Redesign issue page for new sidebar Move awards css to separate file Implement issuable sidebar partial Update CHANGELOG Clarify cache behavior Run builds from projects with enabled CI Use Gitlab::Git instead of Ci::Git ... Conflicts: db/schema.rb
| * \ Merge branch 'ci-project-migrate' into 'master' Kamil Trzciński2015-12-149-406/+130
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ci Project migrate - This doesn't migrate: allow_git_fetch, coverage_regex, timeout. Since this are project configuration settings I would propose to migrate them to `.gitlab-ci.yml`. - This requires offline migrations. - It simplifies database models making all CI objects to be attached to: Project. - It removes Ci::Project, but makes /ci/projects working by adding method: Project.find_by_ci_id for backward compatibility (badges, triggers). - We should add default `timeout` to Application Settings. - It misses specs. - It is based on ci-services-migrate for now. - It removes CI events. - It removes administrator CI projects overview. - It removes CI application settings. In 8.4 or 8.5 we can remove redundant tables and columns. See merge request !1987
| | * | Fix specsKamil Trzcinski2015-12-112-2/+3
| | | |
| | * | Fix after column renameKamil Trzcinski2015-12-112-5/+5
| | | |
| | * | Remove ci_ prefix from all ci related thingsKamil Trzcinski2015-12-113-15/+15
| | | |
| | * | Add runners tokenKamil Trzcinski2015-12-111-1/+1
| | | |
| | * | Migrate CI::Project to ProjectKamil Trzcinski2015-12-119-412/+135
| | | |
| * | | Merge branch 'ci-services-migrate' into 'master' Kamil Trzciński2015-12-1410-502/+95
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Ci Services migrate See merge request !1985
| | * | Fix specsKamil Trzcinski2015-12-101-1/+1
| | | |
| | * | Migrate CI::Services and CI::WebHooks to Services and WebHooksKamil Trzcinski2015-12-1010-502/+95
| | | |
| * | | emoji aliases problemValery Sizov2015-12-111-0/+9
| | | |
* | | | 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
View Lorry Controller Status