Commit Graph
23458 Commits
Author SHA1 Message Date
James Lopez c663ca434f remove unnecessary lower function on SQL 2016-02-04 18:38:11 +01:00
James Lopez 5dc77d7577 refactored migration based on feedback 2016-02-04 15:35:03 +01:00
James Lopez 7b868c61ab refactored migration and spec based on feedback 2016-02-04 13:20:55 +01:00
James Lopez ecb174bfea fixed move project method in migration 2016-02-02 17:28:14 +01:00
James Lopez ae73e73bee Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issue 2016-02-02 15:15:59 +01:00
Douwe Maan 6cffcb0588 Merge branch 'allow-@' into 'master'
Allow "@" in file names and path

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4111

See merge request !2665
2016-02-02 12:30:57 +00:00
Douwe Maan 680d66db9e Merge branch 'generate-valid-message-id-for-email-rejections' into 'master'
Generate valid (RFC 2111) Message-ID in email rejection mailer

Use a Message-ID that is RFC 2111 compliant. This fix is consistent with
how the Message-ID is generated in the 'notify' mailer.

See merge request !2656
2016-02-02 12:25:18 +00:00
Achilleas Pipinellis ded170eb2e Merge branch 'patch-1' into 'master'
Fix typo indentation in CI projects' API



See merge request !2561
2016-02-02 12:16:35 +00:00
Dmitriy Zaporozhets b828e5faa4 Merge branch 'rs-regression-issue-guidelines' into 'master'
Add notes about the regression issues to CONTRIBUTING.md

[ci skip]

See merge request !2661
2016-02-02 11:08:50 +00:00
Yorick Peterse 494028445b Merge branch 'expand-git-instrumentation' into 'master'
Expand Git instrumentation

This instruments some extra `Gitlab::Git` code as well as a collection of `Rugged` constants.

See merge request !2664
2016-02-02 10:07:59 +00:00
Robert Speicher 7df149bb63 Merge branch 'rs-relax-autosize' into 'master'
Allow manual resize of js-autosize textareas

First, the autosize library was being too controlling and removed the
`resize` property from any elements to which it was attached, removing
the drag handle. We've disabled this behavior in the vendored library
and added a spec to prevent a regression during an upgrade.

Second, we detect (as best we can) when the user manually resizes an
autosize textarea, and then remove the autosize behavior from it and
increase its max-height.

This should allow for the best of both worlds.

Closes #12832

See merge request !2653
2016-02-01 23:46:10 +00:00
Robert Speicher 933834c4a6 Allow manual resize of js-autosize textareas
First, the autosize library was being too controlling and removed the
`resize` property from any elements to which it was attached, removing
the drag handle.

Second, we detect when the user manually resizes an autosize textarea,
and then remove the autosize behavior from it and increase its
max-height.

This should allow for the best of both worlds.

Closes #12832
2016-02-01 17:00:03 -05:00
Robert Speicher ea11f0218a Update CHANGELOG
[ci skip]
2016-02-01 15:48:59 -05:00
Robert Speicher f8052310ad Merge branch 'merge-request-closes-issues-performance' into 'master'
Optimize fetching issues closed by a merge request

Related issue: #12419

See merge request !2625
2016-02-01 15:32:58 -05:00
Dmitriy Zaporozhets c3df208708 Merge branch 'stanhu/gitlab-ce-add-svg-support' into 'master'
Render sanitized SVG images

Originally opened at !637 by @stanhu.

Closes https://github.com/gitlabhq/gitlabhq/issues/9265

![Screen_Shot_2016-02-01_at_17.04.01](/uploads/8e5de906698493e127dcdc475da9aaef/Screen_Shot_2016-02-01_at_17.04.01.png)


See merge request !2667
2016-02-01 18:24:51 +00:00
Stan HuandRémy Coutable f86ddfd365 Render sanitized SVG images
Closes https://github.com/gitlabhq/gitlabhq/issues/9265
2016-02-01 18:25:32 +01:00
Jacob Vosmaer 72bd004b31 Allow "@" in file names and path 2016-02-01 16:20:49 +01:00
James Lopez 94b27f9d79 added TODO to not working method 2016-02-01 15:49:52 +01:00
James Lopez 850942ceba Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issue 2016-02-01 15:49:03 +01:00
James Lopez 927ab48101 WIP - refactored migration 2016-02-01 15:47:11 +01:00
Yorick Peterse 33fb55a572 Instrument various Rugged constants 2016-02-01 15:03:58 +01:00
Yorick Peterse 1256dabb44 Instrument all Gitlab::Git instance methods 2016-02-01 13:54:39 +01:00
Dmitriy Zaporozhets da8e0f8659 Merge branch 'take-guidelines-into-account-for-mrs' into 'master'
Link to Thoughtbot review guidelines.



See merge request !2658
2016-02-01 10:21:02 +00:00
Yorick Peterse 99492d6b8d Optimize fetching issues closed by a merge request
Instead of running ClosingIssueExtractor for every commit in a merge
request we can gather all the commit messages (and the merge request
description), concatenate all this together and then run
ClosingIssueExtractor only once.

The result of this is that MergeRequest#closes_issues is now between
3.5x and 4x faster than the old setup. Using a merge request with 10
commits (each referencing a number of issues to close) this reduced the
call duration from around 200 milliseconds to around 50 milliseconds.

As a result of these changes the Jira related tests for
MergeRequest#closes_issues have been removed. These tests stubbed
Commit#closes_issues meaning that the only code that was really tested
was the call to Array#uniq to filter out duplicate issues. As this code
is no longer used (nor present) the corresponding tests were removed.

Related: gitlab-org/gitlab-ce#12419
2016-02-01 11:04:05 +01:00
Robert Speicher 48eb2cd664 Merge branch 'rs-two-factor-casing' into 'master'
Make "Two-factor" casing consistent throughout the application

See merge request !2662
2016-02-01 02:11:01 +00:00
Robert Speicher 3986f4f083 Make "Two-factor" casing consistent throughout the application 2016-01-31 20:34:51 -05:00
Robert Speicher 3a95c427fd Update CHANGELOG
[ci skip]
2016-01-31 19:25:00 -05:00
Robert Speicher 797bcdf43e Add notes about the regression issues to CONTRIBUTING.md
[ci skip]
2016-01-31 15:56:27 -05:00
Achilleas Pipinellis 0b3c76c72f Merge branch 'improve-gitlab-flow-doc' into 'master'
Improve GitLab flow documentation regarding the WIP merge requests



See merge request !2647
2016-01-31 19:12:21 +00:00
Robert Speicher 5d4f8012f6 Merge branch 'rename-inline-diff' into 'master'
Mark inline difference between old and new paths when a file is renamed

See merge request !2652
2016-01-31 03:04:33 +00:00
Sytse Sijbrandij 7d9856313d Link to Thoughtbot review guidelines. 2016-01-30 15:39:33 -08:00
Douwe Maan d240876aba Merge branch 'rs-issue-12706' into 'master'
Increase the minimum length for commit SHA matching to 7

This is the git default and will help to prevent false positive matches.

Closes #12706

See merge request !2655
2016-01-30 12:00:36 +00:00
Douwe Maan 47afe7ae8f Fewer html_safes 2016-01-30 12:54:19 +01:00
Douwe Maan fa0cbb1399 Fix specs and add a new one 2016-01-30 12:53:12 +01:00
Dmitriy Zaporozhets 55c4996b4d Merge branch 'cache-broadcast-message-current' into 'master'
Cache BroadcastMessage.current. Fixes #12770



See merge request !2633
2016-01-30 11:31:15 +00:00
Dmitriy Zaporozhets f862b4ae0f Merge remote-tracking branch 'origin/background-delete-process' 2016-01-30 12:14:48 +01:00
Warren Guy a1e1e72375 Generate valid Message-ID in email rejection mailer
Use a Message-ID that is RFC 2111 compliant. This fix is consistent with
how the Message-ID is generated in the 'notify' mailer.
2016-01-30 18:30:53 +08:00
Douwe Maan 3d61cf9f1b Merge branch 'warn-admin-oauth' into 'master'
Warn admin of granting admin rights during OAuth

Fixes #3951

Warning style the same as the warning a user sees on a archived project.



![Screenshot_from_2016-01-25_20-06-33](/uploads/42e6a218b963311fd20c0b7c87c8cf4f/Screenshot_from_2016-01-25_20-06-33.png)


See merge request !2601
2016-01-30 10:03:40 +00:00
Robert Speicher d97742570f Increase the minimum length for commit SHA matching to 7
This is the git default and will help to prevent false positive matches.

Closes #12706
2016-01-29 19:52:29 -05:00
Josh Frye a6d6cfaf92 Change ttl to 1 minute 2016-01-29 13:39:33 -05:00
Josh Frye d8a292d907 Cache BroadcastMessage.current for 5 minutes. Fixes #12770 2016-01-29 13:39:33 -05:00
Douwe Maan 677b4db9e6 Mark inline difference between old and new paths when a file is renamed 2016-01-29 19:37:17 +01:00
Achilleas Pipinellis dec2151718 Merge branch 'patch-1' into 'master'
Fixed typo for PRIVATE-TOKEN header

Was PRIVATE_TOKEN but should be PRIVATE-TOKEN.
Underscore vs. kebab-case.

See merge request !2624
2016-01-29 18:02:48 +00:00
James Lopez 7dffec2c43 WIP - add migration 2016-01-29 18:52:49 +01:00
Robert Speicher 01439ab9a7 Merge branch 'patch-1' into 'master'
add missing `RAILS_ENV=production` bit to bundle command

[ci skip]

See merge request !2626
2016-01-29 17:35:19 +00:00
Douglas Barbosa Alexandre a8b7ac91b4 Merge branch 'fix-viewing-wiki-page-lastest-version-via-version-id' into 'master'
Fix "old version" warning when viewing wiki page's latest version via version_id in URL

Fixes #12712

See merge request !2627
2016-01-29 17:12:42 +00:00
Drew Blessing 7ede227add Merge branch 'increase_lfs_size_column' into 'master'
Increase LFS objects size column

Fixes #12745 

Increases the `size` column integer limit to an 8-byte integer. This allows for a max value of `9223372036854775807` which is 9,223,372,036 GB. That should do it 😃 

I tested this by first reproducing the error (push a file larger than 2.1 GB). The error was:

```
RangeError (3145728000 is out of range for ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Integer with limit 4):
  lib/gitlab/lfs/response.rb:232:in `store_file'
  lib/gitlab/lfs/response.rb:170:in `render_lfs_upload_ok'
  lib/gitlab/lfs/response.rb:51:in `block in render_storage_upload_store_response'
  lib/gitlab/lfs/response.rb:204:in `render_response_to_push'
  lib/gitlab/lfs/response.rb:50:in `render_storage_upload_store_response'
  lib/gitlab/lfs/router.rb:76:in `put_response'
  lib/gitlab/lfs/router.rb:20:in `try_call'
  lib/gitlab/backend/grack_auth.rb:41:in `call'
  lib/gitlab/backend/grack_auth.rb:18:in `call_with_kerberos_support'
  lib/gitlab/backend/grack_auth.rb:8:in `call'
```

Then I ran this migration and pushed the file again. It uploaded successfully.


See merge request !2644
2016-01-29 17:03:15 +00:00
Douglas Barbosa Alexandre aa30088f6e Fix old version warning when viewing wiki latest version via version_id 2016-01-29 14:17:00 -02:00
Jacob Schatz b4b41b4ca6 Merge branch 'focus-emoji-search-field' into 'master'
Auto-focus emoji award search field

![emoji-search-focus](/uploads/7cd0448e00ced19d3cf1c4fdd141c74f/emoji-search-focus.gif)

Closes #12621 

cc. @jschatz1 

See merge request !2650
2016-01-29 15:27:24 +00:00
James Lopez eb51a4ac1b refactor previous test and add validation to project model 2016-01-29 15:35:21 +01:00