Commit Graph
22148 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
Dmitriy Zaporozhets b079e1657a Merge branch 'rs-abuse-reports' into 'master'
Redesign the AbuseReports index

- User profile links go to the admin area
- Shows when the reported user joined
- Show relative timestamp for when the report was created
- Parse message with restricted Markdown pipeline to autolink URLs

Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/4667

See merge request !2292
2016-01-05 09:27:18 +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 10a9751ace Update CHANGELOG
[ci skip]
2016-01-04 13:41:43 -05:00
Robert Speicher ce4c38b35c Merge branch 'debug-banzai-cache' into 'master'
Add DEBUG_BANZAI_CACHE env var to debug Banzai cache issue.

See https://gitlab.com/gitlab-org/gitlab-ce/issues/4130#note_3012511

See merge request !2283
2016-01-04 18:20:58 +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
Valery Sizov 01e1b6bd93 Merge branch 'namespace-clean_up' into 'master'
Remove public field from namespace

https://gitlab.com/gitlab-org/gitlab-ce/issues/3580

See merge request !2222
2016-01-04 14:52:59 +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
Douwe Maan 4b027bc93a Add DEBUG_BANZAI_CACHE env var to debug Banzai cache issue. 2016-01-04 14:30:30 +01:00
Dmitriy Zaporozhets 57074d606b Merge branch 'stabilize_emoji' into 'master'
Catch Emoji name lookup error

This is a first part of the fix https://gitlab.com/gitlab-org/gitlab-ce/issues/5829

See merge request !2282
2016-01-04 13:14:29 +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 cbf34cdbcb Merge branch 'autocomplete-performance' into 'master'
Improving autocomplete performance part 2

Related issue: gitlab-org/gitlab-ce#3507

See merge request !2253
2016-01-04 10:22:44 +00:00
Dmitriy Zaporozhets a2ba239fb4 Merge branch 'rs-bump-bootstrap-sass' into 'master'
Bump bootstrap-sass to ~> 3.3.0

Resolves bootlint error:

`bootlint:  W013  Bootstrap version might be outdated. Latest version is at least 3.3.6 ; saw what appears to be usage of Bootstrap 3.3.5`

See merge request !2275
2016-01-04 10:19:31 +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
Achilleas Pipinellis 34e1c18c53 Merge branch 'docs/local-share-upload' into 'master'
docs: raketasks: Add documentation on uploading to mounted shares

Fog has a local storage provider, which can be use to copy backups to locally mounted cifs / nfs / smb shares. This MR adds documentation to doc/raketasks/backup_restore.md in response to #3387.

@stanhu I found some time tonight and was able to get this started earlier than I initially expected, glad I could contribute.

See merge request !2246
2016-01-04 08:42:39 +00:00
Stan Hu 0a62d3b5d5 Merge pull request #9943 from Atul9/master
Update copyright notice to 2016 [ci skip]
2016-01-03 22:44:31 -08: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
Atul Bhosale befdc67707 Update copyright notice to 2016 [ci skip] 2016-01-03 18:28:52 +05:30
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 1a1113f7c4 Simplify ContributionsCalendar#starting_year and #starting_month 2016-01-01 22:11:34 -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 2417f55467 Bump d3_rails to ~> 3.5.0 2016-01-01 21:34:49 -05:00
Robert Speicher 762210db6d Bump cal-heatmap-rails to ~> 3.5.0 2016-01-01 21:29:21 -05:00
Robert Speicher 93ef008500 Bump bootstrap-sass to ~> 3.3.0 2016-01-01 21:11:39 -05:00
Robert Speicher de6b6ccc42 Merge branch 'fix_ci_settings_typo' into 'master'
Fix typo in CI settings

Remove a little typo in the CI section of the settings.

See merge request !2270
2016-01-01 22:54:35 +00: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
Achilleas Pipinellis 636ae8bc82 Merge branch 'fix_broken_docs_link' into 'master'
Fix broken SVN migration link

Closes https://gitlab.com/gitlab-com/doc-gitlab-com/issues/45

See merge request !2271
2016-01-01 12:58:00 +00:00
Achilleas Pipinellis 26de72a233 Fix broken SVN migration link [ci skip] 2016-01-01 13:52:26 +01: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
Robert Speicher d33cc4e530 Update CHANGELOG
[ci skip]
2015-12-31 14:21:31 -05:00