summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Fix tests.Douwe Maan2015-04-032-4/+2
| | |
| * | Allow projects to be imported from Google Code.Douwe Maan2015-04-034-0/+127
| | |
* | | Merge branch 'ldap_migration'Dmitriy Zaporozhets2015-04-131-14/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: db/schema.rb
| * | | Remove test for 'ldap' provider special caseJacob Vosmaer2015-04-131-14/+0
| | | |
* | | | Merge branch 'reference-access-control' into 'master'Dmitriy Zaporozhets2015-04-132-112/+113
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Only allow users to reference groups, projects, issues, MRs, commits they have access to. Addresses https://dev.gitlab.org/gitlab/gitlabhq/issues/2183. See merge request !1742
| * | | Update tests.Douwe Maan2015-04-032-48/+54
| | | |
| * | | Fix errors.Douwe Maan2015-04-021-79/+74
| | | |
* | | | Move lib/gitlab/oauth to lib/gitlab/o_authRobert Speicher2015-04-092-0/+0
| |/ / |/| | | | | | | | Lets Rails autoload these files by name
* | | Merge branch 'configurable-attachment-size' into 'master'Douwe Maan2015-04-031-0/+43
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support configurable attachment size in Application Settings page ### What does this MR do? This MR provides the ability to configure the maximum size of an attachment inside a note. A parameter has been added to the Application Settings page. ### Are there points in the code the reviewer needs to double check? What should be done with the legacy note attachment validation? I added code to make the validation work with the configurable setting. I could see an issue where an admin lowers the limit from 10 megabytes to 5 megabytes, which could cause an existing model to be invalid. ### Why was this MR needed? We often have attachments that exceed 10 MB, and it would be nice to be able to override the defaults. ### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)? See Issue #1258 ### Screenshots Before: ![Screen_Shot_2015-03-29_at_3.06.53_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6013a1dbc8cf61a63e93744149937fa0/Screen_Shot_2015-03-29_at_3.06.53_PM.png) After: ![Screen_Shot_2015-03-29_at_3.12.34_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/f3518af7e8653ba40f0a3579456da6ad/Screen_Shot_2015-03-29_at_3.12.34_PM.png) See merge request !407
| * | | Support configurable attachment size via Application SettingsStan Hu2015-04-021-0/+43
| |/ / | | | | | | | | | | | | | | | Fix bug where error messages from Dropzone would not be displayed on the issues page Closes #1258
* | | Fix tests.Douwe Maan2015-03-271-8/+8
|/ /
* | Merge branch 'api-internal-errors' into 'master'Dmitriy Zaporozhets2015-03-252-20/+22
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Respond with full GitAccess error if user has project read access. Should help with debugging #1236. cc @marin See merge request !437
| * | Refactor GitAccess to use instance variables.Douwe Maan2015-03-242-20/+22
| |/
* | Reduce Rack Attack false positives by clearing out auth failure count uponStan Hu2015-03-242-1/+86
|/ | | | | | | | successful Git over HTTP authentication. Add logging when a ban goes into effect for debugging. Issue #1171
* Fix OAuth2 issue importing a new project from GitHub and GitLabStan Hu2015-03-223-0/+49
| | | | Closes #1268
* Merge branch 'disable-ref-generation-in-code-blocks' into 'master'Dmitriy Zaporozhets2015-03-221-0/+20
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable reference generation in preformatted/code blocks ### Summary If a user adds text in code or preformatted text via Markdown or HTML that contains `#XXX`, the system adds a note that issue `XXX` was mentioned. This is particularly annoying because we often list gdb backtrace dumps into our issues, and many issues get mentioned as a result. For example: ``` (gdb) bt #0 0x00000000004004c4 in second () at main.cc:6 #1 0x00000000004004d2 in first () at main.cc:11 #2 0x00000000004004dd in main () at main.cc:17 (gdb) ``` ### Steps to reproduce 1. In an issue, write the above text using Markdown or HTML tags (e.g. `<code>`, `<pre>`). 2. Observe that [issue 1](https://gitlab.com/gitlab-org/gitlab-ce/issues/1) and [issue 2](https://gitlab.com/gitlab-org/gitlab-ce/issues/2) have a note that says they were mentioned. ### Expected behavior Everything enclosed in the code blocks should be ignored as references. ### Observed behavior Issues get referenced unnecessarily. ### Fix I've made `reference_extractor.rb` strip out HTML and Markdown blocks before processing. I considered running the raw text through the entire Markdown processor, but this seems overkill and perhaps could lead to some unintended side effects. See merge request !365
| * Disable reference creation for comments surrounded by code/preformatted blocksStan Hu2015-03-191-0/+20
| |
* | Fix cross references when usernames, milestones, or project names contain ↵Stan Hu2015-03-191-0/+14
|/ | | | | | underscores. Remove emphasis from system notes to avoid Markdown conflicts in names.
* Unblock user if they were unblocked in AD.Douwe Maan2015-03-131-1/+10
|
* Block user if he/she was blocked in Active DirectoryDmitriy Zaporozhets2015-03-121-1/+6
|
* Automatically link commit ranges to compare page.Douwe Maan2015-03-071-0/+19
|
* Added comment notification events to HipChat and Slack services.Stan Hu2015-03-062-0/+131
| | | | | | | | | Supports four different event types all bundled under the "note" event type: - comments on a commit - comments on an issue - comments on a merge request - comments on a code snippet
* Merge branch 'fix-namespace-merge-request-url' into 'master'Marin Jankovski2015-03-041-1/+1
|\ | | | | | | | | | | | | | | | | | | Fix namespace in merge request url building Changes in 42387b733b76dfc1f72585015910a50f094e264f now require namespace specification and broke abc69c890513fb58c1ceae7548f4fbcc221b7c34. There are additional helper functions in c530ca00b0f40ec0e0df4d1885ce55e47a59b70d, but this seemed easier not to rely on them. See merge request !363
| * Fix URL builder to use GitlabRoutingHelperStan Hu2015-03-031-1/+1
| |
* | Merge branch 'project-existence-leak' into 'master'Dmitriy Zaporozhets2015-03-031-0/+146
|\ \ | |/ |/| | | | | | | | | | | | | | | Don't leak information about private project existence via Git-over-SSH/HTTP. Fixes #2040 and https://gitlab.com/gitlab-org/gitlab-ce/issues/343. Both `Grack::Auth` (used by Git-over-HTTP) and `Api::Internal /allowed` (used by gitlab-shell/Git-over-SSH) now return a generic "Not Found" error when the project exists but the user doesn't have access to it. See merge request !1578
| * Add tests for GrackAuth.Douwe Maan2015-03-031-0/+146
| |
* | Merge branch 'fix-merge-request-url-builder' into 'master'Jeroen van Baarsen2015-03-031-0/+8
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | Fix merge request URL passed to Webhooks If you look at the data structure passed to Webhooks, you will see: `"url"=>nil` I don't think any of the Webhooks or services are using this yet, so right now nothing so far depends upon this value being correct. See merge request !352
| * Fix merge request URL passed to Webhooks.Stan Hu2015-02-241-0/+8
| | | | | | | | Previously the symbol "url" in the object_attributes hash would always be nil.
* | Add Bitbucket importer.Douwe Maan2015-02-243-7/+27
|/
* Merge branch 'master' into rails-4.1.9Vinnie Okada2015-02-212-0/+26
|\ | | | | | | | | | | | | | | | | Conflicts: app/views/projects/commits/_commit.html.haml app/views/projects/issues/_issue.html.haml app/views/projects/issues/_issue_context.html.haml app/views/projects/merge_requests/_merge_request.html.haml app/views/projects/merge_requests/show/_context.html.haml
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-02-201-0/+23
| |\
| | * Add gitorious.org importerMarcin Kulik2015-02-201-0/+23
| | |
| * | Extend project web hooks with more dataDmitriy Zaporozhets2015-02-201-0/+3
| |/ | | | | | | | | | | * add git_http_url and git_ssh_url to project web hook * add visibility_level to project web hook * add documentation about project visibility_level in API
* | Upgrade to Rails 4.1.9Vinnie Okada2015-02-141-1/+1
|/ | | | | | Make the following changes to deal with new behavior in Rails 4.1.2: * Use nested resources to avoid slashes in arguments to path helpers.
* Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-02-1227-290/+292
|\
| * Updated rspec to rspec 3.x syntaxJeroen van Baarsen2015-02-1227-290/+292
| | | | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | Clean username acquired from OAuth/LDAP.Douwe Maan2015-02-121-1/+1
|/ | | | Fixes #1967.
* Extend issue closing pattern.Douwe Maan2015-02-081-1/+91
|
* Gitlab integration: added testsValery Sizov2015-02-051-0/+25
|
* Merge pull request #8688 from tsigo/rs-clean-spec-outputDmitriy Zaporozhets2015-01-291-4/+4
|\ | | | | Minor spec output cleanup
| * Remove errant print statements from votes specRobert Speicher2015-01-291-4/+4
| | | | | | | | This caused those random "true" outputs in the rspec output.
* | Merge pull request #8676 from tsigo/rs-repository-cacheDmitriy Zaporozhets2015-01-291-0/+34
|\ \ | | | | | | Refactor Repository to use new RepositoryCache class
| * | Refactor Repository to use new RepositoryCache classRobert Speicher2015-01-291-0/+34
| |/ | | | | | | | | Abstracts away the lower-level implementation details from the Repository model.
* | Improvements to LDAP::User modelDmitriy Zaporozhets2015-01-291-0/+17
|/ | | | | * method #changed? also tracks changes of identites (fixes issue with email mapping) * find ldap identity before initialize one
* Remove unused feature steps.Marin Jankovski2015-01-261-1/+0
|
* Fix vote specs for mysqlDmitriy Zaporozhets2015-01-221-1/+2
|
* Merge branch 'vote-count' of https://github.com/mc1arke/gitlabhq into ↵Dmitriy Zaporozhets2015-01-211-26/+74
|\ | | | | | | | | | | | | mc1arke-vote-count Conflicts: CHANGELOG
| * Only count the user's last voteMichael Clarke2015-01-191-26/+74
| |
* | Merge pull request #7762 from jubianchi/commit-closing-issuesDmitriy Zaporozhets2015-01-211-0/+84
|\ \ | | | | | | Allow commit messages to close several issues at once
| * | Allow commit messages to close several issues at once (thanks @123Haynesjubianchi2015-01-201-0/+84
| |/ | | | | | | for his work and help)