summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Fix after column renameKamil Trzcinski2015-12-115-16/+16
|
* Fix errorsKamil Trzcinski2015-12-113-4/+3
|
* Fix triggers testsKamil Trzcinski2015-12-112-19/+13
|
* Reimplement Trigger APIKamil Trzcinski2015-12-111-0/+80
|
* Remove ci_ prefix from all ci related thingsKamil Trzcinski2015-12-1111-200/+199
|
* Add runners tokenKamil Trzcinski2015-12-111-1/+1
|
* Migrate CI::Project to ProjectKamil Trzcinski2015-12-1138-961/+253
|
* Fix specsKamil Trzcinski2015-12-102-3/+3
|
* Migrate CI::Services and CI::WebHooks to Services and WebHooksKamil Trzcinski2015-12-1019-682/+189
|
* Merge branch 'master' into tmp-reference-pipeline-and-cachingtmp-reference-pipeline-and-cachingDouwe Maan2015-12-10209-285/+579
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # spec/lib/gitlab/markdown/autolink_filter_spec.rb # spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb # spec/lib/gitlab/markdown/commit_reference_filter_spec.rb # spec/lib/gitlab/markdown/cross_project_reference_spec.rb # spec/lib/gitlab/markdown/emoji_filter_spec.rb # spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb # spec/lib/gitlab/markdown/external_link_filter_spec.rb # spec/lib/gitlab/markdown/issue_reference_filter_spec.rb # spec/lib/gitlab/markdown/label_reference_filter_spec.rb # spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb # spec/lib/gitlab/markdown/redactor_filter_spec.rb # spec/lib/gitlab/markdown/reference_gatherer_filter_spec.rb # spec/lib/gitlab/markdown/relative_link_filter_spec.rb # spec/lib/gitlab/markdown/sanitization_filter_spec.rb # spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb # spec/lib/gitlab/markdown/syntax_highlight_filter_spec.rb # spec/lib/gitlab/markdown/table_of_contents_filter_spec.rb # spec/lib/gitlab/markdown/task_list_filter_spec.rb # spec/lib/gitlab/markdown/upload_link_filter_spec.rb # spec/lib/gitlab/markdown/user_reference_filter_spec.rb
| * Merge branch 'devise_paranoid_mode' into 'master' Robert Speicher2015-12-101-13/+13
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Devise paranoid mode and ensure the returned message is the same every time. This will prevent user enumeration (low impact). Prior to this change a user could type an email in the password reset field and if the email didn't exist it returned an error. If the email was valid it returned a message saying the forgot password link had been emailed. After this change the user will receive a message that if the email is in our database the reset link will be emailed. I also changed the throttle mechanism so it still works the same but now returns the exact same message as above. Previously it would say 'You've already sent a request. Wait a few minutes'. This also allows user enumeration, although it requires a double-check. Related to https://dev.gitlab.org/gitlab/gitlabhq/issues/2624 See merge request !2044
| | * Use devise paranoid mode and ensure the same message is returned every timeDrew Blessing2015-12-091-13/+13
| | | | | | | | | | | | Skipped CI because it has already passed. Had to rebase due to CHANGELOG.
| * | Merge remote-tracking branch 'origin/mr-broken'Dmitriy Zaporozhets2015-12-091-2/+2
| |\ \ | | |/ | |/| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * Fix specsmr-brokenDouwe Maan2015-12-081-2/+2
| | |
| * | Merge branch 'split-up-builds' into 'master' Dmitriy Zaporozhets2015-12-09194-195/+195
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Split up 20min+ `spec:other` and `spinach:project` builds to increase parallelization See merge request !2036
| | * \ Merge branch 'master' into split-up-buildsDouwe Maan2015-12-0910-20/+303
| | |\ \
| | * | | Tag service specsDouwe Maan2015-12-0941-41/+41
| | | | |
| | * | | Tag lib specsDouwe Maan2015-12-0985-86/+86
| | | | |
| | * | | Tag model specsDouwe Maan2015-12-0968-68/+68
| | | | |
| * | | | Fix specremove-redclothDouwe Maan2015-12-091-1/+1
| | |/ / | |/| |
| * | | Tweak specsmerge-if-greenDouwe Maan2015-12-091-8/+2
| | | |
| * | | Merge branch 'master' into merge-if-greenDouwe Maan2015-12-098-51/+62
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | # Conflicts: # app/controllers/projects/merge_requests_controller.rb # config/routes.rb
| | * | Update annotationsStan Hu2015-12-087-0/+28
| | | |
| | * | Improve text indication visibility on snippetsZeger-Jan van de Weg2015-12-081-51/+34
| | |/
| * | Merge branch 'master' into merge-if-greenDouwe Maan2015-12-084-10/+70
| |\ \ | | |/ | | | | | | | | | | | | # Conflicts: # app/views/projects/merge_requests/widget/_heading.html.haml # app/views/projects/merge_requests/widget/open/_accept.html.haml
| | * Make tab target selectors less naiveRobert Speicher2015-12-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Prior, any of the specified IDs could have been hijacked by a table of contents header, breaking the tab functionality. For example, a `## Notes` header would get the id `notes` and prevent the Discussion tab from being activated. Closes #3908
| * | Merge branch 'master' into zj/gitlab-ce-merge-if-greenDouwe Maan2015-12-082-0/+35
| |\ \
| * \ \ Merge branch 'master' into zj/gitlab-ce-merge-if-greenDouwe Maan2015-12-0819-21/+330
| |\ \ \
| * | | | Satisfy Douwe MaanZeger-Jan van de Weg2015-12-071-8/+6
| | | | |
| * | | | Fix specsZeger-Jan van de Weg2015-12-071-4/+4
| | | | |
| * | | | Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-12-0768-1095/+2381
| |\ \ \ \
| * | | | | Button fixZeger-Jan van de Weg2015-12-074-4/+4
| | | | | |
| * | | | | Incorporate feedbackZeger-Jan van de Weg2015-12-057-31/+84
| | | | | |
| * | | | | Specs for 'Merge When Build Succeeds'Zeger-Jan van de Weg2015-12-029-25/+234
| | | | | |
| * | | | | Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-11-1878-429/+2934
| |\ \ \ \ \
| * | | | | | API support, incorporated feedbackZeger-Jan van de Weg2015-11-182-1/+29
| | | | | | |
* | | | | | | Merge branch 'reference-pipeline-and-caching' into 'master' Robert Speicher2015-12-0840-2258/+2223
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement different Markdown rendering pipelines and cache Markdown Builds on !1090. Related to !1014. Fixes #2054. See merge request !1602
| * | | | | | Merge branch 'master' into reference-pipeline-and-cachingreference-pipeline-and-cachingDouwe Maan2015-12-0815-18/+148
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Store the demodulized reference filter name in data attributeRobert Speicher2015-12-072-14/+14
| | | | | | |
| * | | | | | Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-12-0723-218/+778
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-12-034-6/+39
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-12-0238-814/+1397
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Move Markdown filters and pipelines into folders.Douwe Maan2015-11-1939-1996/+1961
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-11-1987-509/+3280
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-10-277-23/+83
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix specsDouwe Maan2015-10-221-4/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-10-2136-370/+983
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into rs-redactor-filterDouwe Maan2015-10-1411-24/+226
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into rs-redactor-filterDouwe Maan2015-10-1447-258/+1289
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Use Gitlab::Markdown for Asciidoc and ReferenceExtractor pipelinesDouwe Maan2015-10-141-3/+3
| | | | | | | | | | | | | | |
View Lorry Controller Status