Commit Graph
11121 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets b779111dfd Merge branch 'dedupe-notifications-watcher-and-subscriber' into 'master'
Don't notify users twice if they are both project watchers and subscribers

Closes #4708

See merge request !2290
2016-01-05 09:29:06 +00:00
Dmitriy Zaporozhets 53d6bca806 Merge branch 'rs-remove-jquery-blockui' into 'master'
Remove jquery.blockUI.js plugin

It was only used to block the issue (but not merge request) list when
the sort was changed.

See merge request !2287
2016-01-05 09:28:31 +00:00
Robert Speicher b807a23b4b Redesign the AbuseReports index
- Shows when the reported user joined
- Show relative timestamp for when the report was created
- Parse message with restricted Markdown pipeline to autolink URLs
2016-01-04 18:36:38 -05:00
Stan Hu 93096247d8 Don't notify users twice if they are both project watchers and subscribers
Closes #4708
2016-01-04 15:01:52 -08:00
Robert Speicher 6f4ea679d9 Merge branch 'show-all-builds-by-default' into 'master'
Show all builds by default in the builds page

Fixes #4240 

See merge request !2243
2016-01-04 18:42:37 +00:00
Robert Speicher ad42441d2d Remove jquery.blockUI.js plugin
It was only used to block the issue (but not merge request) list when
the sort was changed.
2016-01-04 13:12:29 -05:00
Dmitriy Zaporozhets e586492e48 Merge branch 'rs-issue-201' into 'master'
Prevent duplicate "username has already been taken" validation message

Closes #201 - two-year-old bug, woo! 💥 🎉

See merge request !2279
2016-01-04 17:20:38 +00:00
Dmitriy Zaporozhets 7e034a7f72 Merge branch 'reverting-rs-remove-jquery-blockui' into 'master'
Revert "Merge branch 'rs-remove-jquery-blockui' into 'master'"

This reverts commit bc12750fcc, reversing
changes made to 8a04b84e09.

See merge request !2285
2016-01-04 17:19:47 +00:00
Stan Hu 561acdebf8 Merge branch 'extra-system-hooks' into 'master'
Added system hooks messages for renaming and transferring a project

This is work in progress but I wanted to get some feedback on it in case there is something I've missed or a better way to do it.

As the title says when a project is renamed or transferred to another group a system hook message is generated.

Currently adds a couple of extra properties to the standard project system hooks messages.

old_path_with_namespace - The old path of the project so we can see what has been renamed / transferred
changed_at - The time that change took place

My main concern is if there is a better way of doing this than passing the extra_data variable into the system hook.  Would it be better to extend the project model with these 2 items as transient properties as I doubt they would need to be saved to the database?  The other 

I've also seen, but can't find, someone talking about the emails sent when a project is renamed or transferred doesn't reference the original project path so if you have similarly named projects then you might not know what has been moved.  I think the extra_data (or however it is best to implement this) would allow the extra information to be sent in emails.

Closes [System hooks for project transfer and repository rename](http://feedback.gitlab.com/forums/176466-general/suggestions/6006233-system-hooks-for-project-transfer-and-repository-r)


See merge request !611
2016-01-04 15:39:52 +00:00
Jacob Schatz 770517d3e7 Revert "Merge branch 'rs-remove-jquery-blockui' into 'master' "
This reverts commit bc12750fcc, reversing
changes made to 8a04b84e09.
2016-01-04 09:42:10 -05:00
Valery Sizov 8b18449125 remove public field from namespace and refactoring 2016-01-04 16:00:29 +02:00
Steve Norman 79ec7f2897 Added system hooks messages for renaming and transferring a project 2016-01-04 13:48:00 +00:00
Douglas Barbosa Alexandre 567dc62b6d Show 'All' tab by default in the builds page 2016-01-04 10:21:10 -02:00
Valery Sizov 4c5be69583 catch Emoji encode error 2016-01-04 14:06:48 +02:00
Dmitriy Zaporozhets b9ec1aaec8 Merge branch 'rs-delimit-all-the-things' into 'master'
number_with_delimiter most of the things



See merge request !2258
2016-01-04 10:36:54 +00:00
Dmitriy Zaporozhets 57377376cc Merge branch 'rs-abuse-report-form' into 'master'
Add js-requires-input and js-quick-submit to abuse report form



See merge request !2245
2016-01-04 10:28:09 +00:00
Dmitriy Zaporozhets bc12750fcc Merge branch 'rs-remove-jquery-blockui' into 'master'
Remove jquery.blockUI.js plugin

It was required but no longer used.

See merge request !2273
2016-01-04 10:25:15 +00:00
Dmitriy Zaporozhets 8a04b84e09 Merge branch 'rs-remove-jquery-history-js' into 'master'
Remove jquery.history.js plugin

We're not concerning ourselves with non-HTML5 browser compatibility, and
this removes 21 KB from our compiled JavaScript.

Bonus fix: There was an extra space after the query string in the URLs
that has now been removed.

See merge request !2272
2016-01-04 10:24:12 +00:00
Dmitriy Zaporozhets 55e12ccd8a Merge branch 'rs-bump-cal-heatmap' into 'master'
Bump cal-heatmap-rails to ~> 3.5.0



See merge request !2276
2016-01-04 10:18:23 +00:00
Dmitriy Zaporozhets f8696018cc Merge branch 'expire-cache-on-app-settings-change' into 'master'
Expire view caches when application settings change

If the admin disables Gravatar, for example, before the views would not invalidate. Now they invalidate automatically when this happens.

Closes #5728

See merge request !2280
2016-01-04 09:41:28 +00:00
Dmitriy Zaporozhets bfb3c8d936 Merge branch 'rs-safari-version-check' into 'master'
Don't attempt to set Referrer policy in Safari

While Safari supports the policy, it does not (currently, as of 9.x)
recognize `origin-when-cross-origin` as a valid value, so we omit the
policy entirely under Safari.

Closes #5609

See merge request !2269
2016-01-03 19:23:30 +00:00
Stan Hu 2802d4992d Expire view caches when application settings change
Closes #5728
2016-01-03 11:20:14 -08:00
Robert Speicher fd178c1e7d Prevent duplicate "username has already been taken" validation message
Closes #201 - two-year-old bug, woo! 💥 🎉
2016-01-02 20:03:28 -05:00
Robert Speicher d1873f16b4 Update cal-heatmap style overrides
Some were no longer needed, others needed `!important`.
2016-01-01 22:12:50 -05:00
Robert Speicher 4caf0433b7 Reorder JS requires
The old way broke d3, for some reason.
2016-01-01 22:10:48 -05:00
Robert Speicher f8c3b69fb6 Remove unused "options" object from Calendar JS 2016-01-01 22:10:16 -05:00
Robert Speicher 3c4d24b71e Remove jquery.blockUI.js plugin
It was required but never used.
2016-01-01 17:52:40 -05:00
Robert Speicher f3ea2f29a5 Remove jquery.history.js plugin
We're not concerning ourselves with non-HTML5 browser compatibility, and
this removes 21 KB from our compiled JavaScript.

Bonus fix: There was an extra space after the query string in the URLs
that has now been removed.
2016-01-01 17:44:21 -05:00
Steffen Köhler 74969021ef Fix typo in CI settings
[ci skip]
2016-01-01 13:34:24 +01:00
Robert Speicher 9a9a81bea0 Don't attempt to set Referrer policy in Safari
While Safari supports the policy, it does not (currently, as of 9.x)
recognize `origin-when-cross-origin` as a valid value, so we omit the
policy entirely under Safari.

Closes #5609
2015-12-31 20:44:55 -05:00
Robert Speicher bf249550d0 number_with_delimiter most of the things 2015-12-31 20:04:23 -05:00
Zeger-Jan van de WegandRobert Speicher 1be406d741 Swap Author and Assignee Selectors on issuable index view
Closes #4039
2015-12-30 18:21:53 -05:00
Robert Speicher c479dbae22 Add js-requires-input and js-quick-submit to abuse report form 2015-12-30 15:37:09 -05:00
Grzegorz Bizon 333d3d9e5d Merge branch 'fix/missing-ci-build-traces' into 'master'
Hotfix for builds trace data integrity

Closes #4246

See merge request !2224
2015-12-30 06:54:27 +00:00
Robert Speicher e70ffdbf29 Merge branch 'fix-user-autocomplete' into 'master'
Fixes problem with user autocomplete URI 

```
Failed to load resource: net::ERR_NAME_NOT_RESOLVED
http://autocomplete/users.json?search=&per_page=20&active=true&current_user=false
```

Fixes #4118, #4136

See merge request !2136
2015-12-30 01:32:35 +00:00
Stan Hu 59533d47dd Fix project transfer e-mail sending incorrect paths in e-mail notification
The introduction of ActiveJob and `deliver_now` in 7f214cee7 caused a race
condition where the mailer would be invoked before the project was committed
to the database, causing the transfer e-mail notification to show the old
path instead of the new one.

Closes #4670
2015-12-29 13:49:44 -08:00
Valery Sizov eeba266e3d Merge branch 'upvote_count_to_api' into 'master'
Revert upvotes and downvotes params back to MR API

issue https://gitlab.com/gitlab-org/gitlab-ce/issues/3672

See merge request !2212
2015-12-29 16:07:12 +00:00
Yorick Peterse 1dbf7284a9 Merge branch 'influxdb-without-sidekiq' into 'master'
See merge request !2238
2015-12-29 14:40:51 +00:00
Yorick Peterse 620e7bb3d6 Write to InfluxDB directly via UDP
This removes the need for Sidekiq and any overhead/problems introduced
by TCP. There are a few things to take into account:

1. When writing data to InfluxDB you may still get an error if the
   server becomes unavailable during the write. Because of this we're
   catching all exceptions and just ignore them (for now).
2. Writing via UDP apparently requires the timestamp to be in
   nanoseconds. Without this data either isn't written properly.
3. Due to the restrictions on UDP buffer sizes we're writing metrics one
   by one, instead of writing all of them at once.
2015-12-29 14:53:45 +01:00
Dmitriy Zaporozhets 10491c38b0 Merge branch 'issue_3780' into 'master'
Downcased user or email search for avatar_icon.

GitLab users are defined with their mail address which is enforced to be lower case. When a commit is listed in the history whose committer mail address is not written in all lower case, the corresponding GitLab user won't be found because the search is case sensitive resp. the mail address to search for not downcased.

Closes #3780 

See merge request !2234
2015-12-29 11:54:13 +00:00
Dmitriy Zaporozhets 58bc4b72d5 Merge branch 'feature/recaptcha_settings' into 'master'
Makes reCAPTCHA configurable through Application Settings screen

Following the work made by @stanhu here: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2216, made it configurable without needing to restart Gitlab

See merge request !2231
2015-12-29 09:39:54 +00:00
Grzegorz Bizon 504696453b Add hotfix that allows to access build artifacts created before 8.3
This is a temporary hotfix that allows to access build artifacts created
before 8.3. See #5257.

This needs to be changed after migrating CI build files.

Note that `ArtifactUploader` uses `artifacts_path` to create a storage
directory before and after parsisting `Ci::Build` instance, before and
after moving a file to store (save and fetch a file).
2015-12-29 09:51:19 +01:00
Valery Sizov d3807328d8 note votes methids implementation 2015-12-29 10:11:20 +02:00
Stan Hu e619d0b615 When reCAPTCHA is disabled, allow registrations to go through without a code 2015-12-28 16:59:59 -08:00
Robert Speicher f0ecd69be5 Merge branch 'fix-spelling-mistake' into 'master'
Fix spelling mistake, thanks Connor.

[ci skip]

See merge request !2227
2015-12-29 00:13:16 +00:00
Stefan KahlhöferandRubén Dávila 41c74cec09 Downcased user or email search for avatar_icon.
Signed-off-by: Rubén Dávila <rdavila84@gmail.com>
2015-12-28 18:13:50 -05:00
Gabriel Mazetto a3469d914a reCAPTCHA is configurable through Admin Settings, no reload needed. 2015-12-28 18:50:29 -02:00
Yorick Peterse 4d925f2147 Move InfluxDB settings to ApplicationSetting 2015-12-28 18:00:32 +01:00
Sytse Sijbrandij 4465e2eca0 Fix spelling mistake, thanks Connor. 2015-12-28 17:08:15 +01:00
Grzegorz Bizon 42592201d9 Hotfix for builds trace data integrity
Issue #4246
2015-12-28 15:28:39 +01:00