summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Give 409 Conflict whenever the runner was already enabledprefer-assign_toLin Jen-Shin2016-06-141-2/+5
|
* Prefer Runner#assign_to instead of creating directlyLin Jen-Shin2016-06-141-1/+1
|
* Merge branch 'gitlab-auth-method-names' into 'master' Douwe Maan2016-06-133-5/+5
|\ | | | | | | | | | | | | | | | | | | Improve Gitlab::Auth method names Auth.find was a very generic name for a very specific method. Auth.find_in_gitlab_or_ldap was inaccurate in GitLab EE where it also looks in Kerberos. See merge request !4589
| * Improve Gitlab::Auth method namesJacob Vosmaer2016-06-103-5/+5
| | | | | | | | | | | | Auth.find was a very generic name for a very specific method. Auth.find_in_gitlab_or_ldap was inaccurate in GitLab EE where it also looks in Kerberos.
* | Merge remote-tracking branch 'origin/master' into artifacts-whenKamil Trzcinski2016-06-1320-137/+211
|\ \
| * | Removed old comment from update_column_in_batchesfix-migration-helper-race-conditionsYorick Peterse2016-06-131-2/+0
| | |
| * | Update columns in batches until no rows are leftYorick Peterse2016-06-131-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of updating a fixed number of rows (based on the amount of rows available at the start of the update) the method "update_column_in_batches" will now continue updating rows until it runs out of rows to process. For a table with a high rate of inserts this may result in the migration taking quite some time. However, the alternative is not all rows being updated or the "change_column_null" method raising an error due to there being NULL values.
| * | Handle NULL migration errors in migration helpersYorick Peterse2016-06-131-2/+2
| | | | | | | | | | | | | | | This ensures that whenever changing the NULL constraint of a column fails we still drop the column.
| * | Refactored SVG sanitizerGabriel Mazetto2016-06-121-24/+23
| | |
| * | Refactor SVG sanitizer and prevent `xlink:href` to refer to external resourcesGabriel Mazetto2016-06-121-5/+15
| | |
| * | Fix SVG whitelisting to allow namespaced attributesGabriel Mazetto2016-06-121-5/+18
| | |
| * | Fix Error 500 when using closes_issues API with an external issue trackerStan Hu2016-06-113-1/+14
| | | | | | | | | | | | Closes #18484
| * | Only create the backup directory if it is localStan Hu2016-06-101-3/+18
| | | | | | | | | | | | Closes #12710
| * | Merge branch 'workhorse-helpers' into 'master' Robert Speicher2016-06-103-15/+23
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Add workhorse controller and API helpers Adds `send_git_blob` and `send_git_archive` controller and API helpers to reduce duplication and make Workhorse easier for a developer to work with. See merge request !4486
| | * | Satisfy Rubocopworkhorse-helpersDouwe Maan2016-06-101-2/+2
| | | |
| | * | Merge branch 'master' into workhorse-helpersDouwe Maan2016-06-1017-106/+206
| | |\ \
| | * \ \ Add send_git_diff helperDouwe Maan2016-06-0820-63/+235
| | |\ \ \
| | * | | | Add workhorse controller and API helpersDouwe Maan2016-06-063-11/+17
| | | | | |
| * | | | | Merge branch 'rename-ci-commit-phase-4' into 'master' Rémy Coutable2016-06-101-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename Commit to Pipeline in TriggerRequest Changes in TriggerRequest a `commit` to `pipeline`. See merge request !4505
| | * \ \ \ \ Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-4Kamil Trzcinski2016-06-104-58/+42
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Fix expose of TriggerRequestKamil Trzcinski2016-06-101-1/+1
| | | | | | |
| | * | | | | Fix CI TriggerRequest entityrename-ci-commit-phase-4Kamil Trzcinski2016-06-091-1/+1
| | | | | | |
| * | | | | | Improve initial implementation of the ↵Rémy Coutable2016-06-101-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'only_allow_merge_if_build_succeeds.rb' feature Based on the feedback from reviewers. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Allow or not merge MR with failed buildRui Anderson2016-06-101-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Merge branch 'gh-rate-limit' into 'master' Douwe Maan2016-06-102-57/+40
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrap all rate limiting logic inside GitHub API client ## What does this MR do? Move the actual rate limiting logic to GitHub API to clean the code inside the GitHub importer, and avoid code duplication. ## Are there points in the code the reviewer needs to double check? No there aren't. ## Why was this MR needed? Avoid code duplication to handle API rate limit in every call to the GitHub API. ## What are the relevant issue numbers? There are none. ## Screenshots (if relevant) Not relevant. See merge request !4552
| | * | | | Wrap all rate limiting logic inside GitHub API clientgh-rate-limitDouglas Barbosa Alexandre2016-06-092-57/+40
| | |/ / /
| * | | | Merge branch 'award-emoji-fixes' into 'master' Jacob Schatz2016-06-091-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Award emoji fixes Fixes #18357 #18325 and #18424 See merge request !4550
| | * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into award-emoji-fixesFatih Acet2016-06-094-33/+60
| | |\ \ \ \ | | | |/ / /
| | * | | | Move award_menu_url variable into gon object.Fatih Acet2016-06-091-0/+1
| | | | | |
| * | | | | Properly quote table name in Rake task for MySQL and PostgreSQL compatibilityfix-issue-15259-postgresqlStan Hu2016-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | !4318 broke the gitlab:db:drop_tables functionality for PostgreSQL. Closes #15259
| * | | | | Merge branch 'fix_issue_15259' into 'master' Stan Hu2016-06-091-1/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug with SQL syntax error during backup restoration ## What does this MR do? It properly escapes the table name in the `DROP TABLE IF EXISTS ...` statement used during restore of a backup. ## Are there points in the code the reviewer needs to double check? Please check compatibility with PostgreSQL ## Why was this MR needed? Fix an issue with backups can not be restored if MySQL is used as database for GitLab. ## What are the relevant issue numbers? #15259 ## Screenshots (if relevant) - See merge request !4318
| | * | | | Fix bug with SQL syntax error during backup restorationDaniel Beyer2016-05-271-1/+1
| | | | | | | | | | | | | | | | | | closes #15259
| * | | | | Merge branch 'saml-ldap-link-flow' into 'master' Douwe Maan2016-06-092-7/+14
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust the SAML control flow to allow LDAP identities to be added to an existing SAML user. ## What does this MR do? It correctly lets an existing SAML user to add their LDAP identity automatically at login. ## Why was this MR needed? A customer had issues with the `auto_link_ldap_user` feature. The flow was not working if there was an account with a SAML identity, but no LDAP identity. GitLab would pick up the correct LDAP person, but due to the order of the flow, that LDAP person was never associated with the user. ## What are the relevant issue numbers? Fixes #17346 /cc @dblessing @balameb @stanhu See merge request !4498
| | * | | | | Syntax fixes and better logging around the `ldap_person` method.saml-ldap-link-flowPatricio Cano2016-06-081-4/+5
| | | | | | |
| | * | | | | Moved `find_or_create_ldap_user` method to parent class and added logging.Patricio Cano2016-06-072-30/+12
| | | | | | |
| | * | | | | Adjust the SAML control flow to allow LDAP identities to be added to an ↵Patricio Cano2016-06-062-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | existing SAML user.
| * | | | | | Merge branch '18019-fix-wiki-linking' into 'master' Rémy Coutable2016-06-092-26/+46
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix wiki linking behavior for markdown wiki pages Related to #18019 - As per the documentation in !4372 ## TODO - [ ] !4432 Have wiki linking behave as per the documentation - [x] Move `WikiLinkFilter` specs to the pipeline level - [x] Verify current behavior on wiki `show` page - [x] Fix current behavior on wiki `show` page - [x] Verify current behaviour on wiki preview - [x] Fix current behaviour on wiki preview - [x] Rewrite all links and get preview links working - [x] Make sure all links are on-par with the wiki `show` page - [x] TDD `WikiLinkFilter` and get it working - [x] Hook `WikiLinkFilter` up - [x] Fix tests - [x] Fix `markdown_spec` - [x] Fix `wiki` spinach feature - [x] Wait for [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/4f50dd2/builds) to pass - [x] Make sure all wiki-related pages are working as expected (history, all pages, etc.) - [x] Test in different ruby versions - [x] GitLab instances hosted on a relative URL - [x] Non-markdown rendering formats? - [x] RDoc - [x] ASCIIDoc - [x] Create issues to fix things for RDoc and ASCIIDoc - [x] Gauge performance impact - [x] Refactor - [x] Re-organize commits - [x] Make sure [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/f860e9a8dcabe7d5f160c32fc549807c98baa4a1/builds) passes - [x] Respond to @rymai's comments - [x] `class WikiLinkFilter < HTML::Pipeline::Filter` - [x] blank line after guard clause - [x] keyword arguments for `wiki` and `slug` - [x] invert the condition - [x] inline `user` in spec - [x] Make sure spec names are not out of date - [x] Comment for each rewrite rule - [x] Add CHANGELOG entry - [x] Reorganize commits - [x] Make sure [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/19b91e749a6320d12fb299d33f1f6440777e0e26/builds) passes - [ ] Wait for merge See merge request !4432
| | * | | | | Implement the correct linking behaviour in `WikiLinkFilter`.Timothy Andrew2016-06-092-26/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original Comments ================= - Linking behaves as per rules documented here: https://gitlab.com/gitlab-org/gitlab-ce/blob/16568-document-wiki-linking-behavior/doc/markdown/wiki.md - All links (to other wiki pages) are rewritten to be at the level of the app root. We can't use links relative to the current page ('./foo', 'foo', '../foo'), because they won't work in the markdown preview, where the current page is suffixed with `/edit` - Move existing `WikiLinkFilter` specs to `WikiPipeline` spec. It makes sense to run these tests on the combined output of the pipeline, rather than a single filter, since we can catch issues with conflicting filters. - Add more tests to cover the new linking @rymai's Review =============== - Classes nested under `WikiLinkFilter` should declare `WikiLinkFilter`'s inherit, so nothing changes if the nested class is loaded first. - Add a blank line after a guard clause - Use keyword arguments for the `Rewriter` constructor - Invert a condition - use `if` instead of `unless` - Inline a `let` in `WikiPipeline` spec - it was only used in a single place - Change out of date spec names - Add a comment for every rewrite rule in `Rewriter`
| * | | | | | Merge branch '14098-customize-after-sign-up-path' into 'master' Robert Speicher2016-06-082-1/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow custom text on 'almost there' page Add a new application setting, after_sign_up_text. This is text to be rendered as Markdown and shown on the 'almost there' page after a user signs up, but before they've confirmed their account. Closes #14098. See merge request !4098
| | * | | | | | Allow custom text on 'almost there' pageSean McGivern2016-06-082-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new application setting, after_sign_up_text. This is text to be rendered as Markdown and shown on the 'almost there' page after a user signs up, but before they've confirmed their account. Tweak the styles for that page so that centered lists look reasonable.
| * | | | | | | Remove obvious comment and extra lineAlfredo Sumaran2016-06-081-2/+0
| | | | | | | |
| * | | | | | | Set target="_blank" for external linksAlfredo Sumaran2016-06-081-0/+3
| |/ / / / / /
| * | | | | | Fix pseudo n+1 queries with Note and Note Authors in issuables APIsAlejandro Rodríguez2016-06-082-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was not a clear cut n+1 query, given that if you're directly subscribed to all issues that the API is returning you never really need to check for the notes. However, if you're subscribed to _all_ of them, then for each issuable you need to go once to `notes`, and once to `users` (for the authors). By preemtively loading notes and authors, at worst you have 1 extra query, and at best you saved 2n extra queries. We also took advantage of this preloading of notes when counting user notes.
* | | | | | | Improve after reviewKamil Trzcinski2016-06-101-2/+2
| | | | | | |
* | | | | | | Added when to artifactsKamil Trzcinski2016-06-081-0/+24
|/ / / / / /
* | | | | | Merge branch 'git-http-controller' into 'master' Rémy Coutable2016-06-085-68/+134
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dismantling Grack::Auth part 1: Git HTTP clients Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/14501 This does not completely get rid of Grack::Auth yet because Git LFS support is 'behind' it and I would like to not make this MR bigger than needed. - changed tests to make HTTP requests instead of calling Rack apps - added missing test cases for Git HTTP authentication - moved Git HTTP requests into a 'normal' Rails controller See merge request !3361
| * \ \ \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Jacob Vosmaer2016-06-0848-382/+596
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-http-controller Conflicts: lib/gitlab/workhorse.rb
| * | | | | | Fix testsJacob Vosmaer2016-06-062-21/+21
| | | | | | |
| * | | | | | Use public_sendJacob Vosmaer2016-06-031-2/+1
| | | | | | |
| * | | | | | Argh mixed up all the negativesJacob Vosmaer2016-06-031-2/+2
| | | | | | |