Commit Graph
11814 Commits
Author SHA1 Message Date
Rubén Dávila 2c31ebff88 Add little spacing between milestone stats. 2016-02-02 17:45:42 -05:00
Rubén Dávila 46b5f83a1b Show labels in Issues tab. 2016-02-02 17:45:42 -05:00
Rubén Dávila e6be134b6c Change style of Delete button. 2016-02-02 17:45:42 -05:00
Rubén Dávila 1162f8d77e Add elpased time. 2016-02-02 17:45:42 -05:00
Rubén Dávila 4e8266e8df Change format of Milestone stats. 2016-02-02 17:45:42 -05:00
Rubén Dávila 365d96ca85 Add labels tab to milestone detail view. 2016-02-02 17:45:42 -05:00
Jacob Schatz c4c919e59d Merge branch 'title-projects-dropdown' into 'master'
Added dropdown to list all projects on project header

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

When clicking the current project name, it shows a dropdown menu with a list of all projects for that group or user.

When closed:

![Screen_Shot_2016-01-14_at_19.17.44](/uploads/a7258ba388dba238fc2f0468711fc729/Screen_Shot_2016-01-14_at_19.17.44.png)

When open:

![Screen_Shot_2016-01-14_at_19.17.51](/uploads/716533d9eb44b123c5fdff36a4740489/Screen_Shot_2016-01-14_at_19.17.51.png)


cc. @jschatz1

See merge request !2438
2016-02-02 22:15:40 +00:00
Jacob Vosmaer 752468d55b Merge branch 'git-raw-workhorse' into 'master'
Send raw Git blobs via gitlab-workhorse



See merge request !2451
2016-02-02 17:22:04 +00:00
Jacob Vosmaer 15a1acb479 Merge remote-tracking branch 'origin/master' into git-raw-workhorse 2016-02-02 15:06:19 +01:00
Jacob Vosmaer b67f8eee0d Use @repository 2016-02-02 15:06:14 +01:00
Jacob Vosmaer d3affe8bca Merge remote-tracking branch 'origin/master' into lazy-blobs 2016-02-02 15:04:54 +01:00
Jacob Vosmaer 0a4db90d36 Use begin/end instead of defined? 2016-02-02 14:35:09 +01:00
Jacob Vosmaer c76e6b982b Move load command into _text partial 2016-02-02 14:17:08 +01: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
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 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
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 51574d779c Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-blobs 2016-02-01 13:51:05 +01:00
Jacob Vosmaer b2a634c352 Avoid trailing 'charset=' garbage 2016-02-01 12:01:13 +01:00
Jacob Vosmaer 2679ec4066 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-raw-workhorse 2016-02-01 11:33:36 +01:00
Jacob Vosmaer 02afa6793c Use only one header to send git blobs 2016-02-01 11:33:22 +01: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
Jacob Vosmaer 64c8ee47c9 WIP lazy blobs 2016-02-01 10:41:52 +01:00
Robert Speicher 3986f4f083 Make "Two-factor" casing consistent throughout the application 2016-01-31 20:34:51 -05: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
Phil Hughes 56b0c46bf6 added tests 2016-01-30 16:01:50 +00:00
Phil Hughes ad7ec74458 removed private method naming 2016-01-30 16:01:50 +00:00
Phil Hughes d34928ca58 remove period from function call 2016-01-30 16:01:49 +00:00
Phil Hughes 09dc9bd568 rubocop fixes 2016-01-30 16:01:49 +00:00
Phil Hughes e79b5ff9d6 removed un-used variable 2016-01-30 16:01:49 +00:00
Phil Hughes 6013934540 fixes issue when user is not logged in but viewing public project 2016-01-30 16:01:49 +00:00
Phil Hughes a5267d0fbd selecting project in dropdown takes user to the correct project 2016-01-30 16:01:49 +00:00
Phil Hughes 81e7086fec uses AJAX to select the projects 2016-01-30 16:01:49 +00:00
Phil Hughes 14394e8bad pulls in all user projects 2016-01-30 16:01:49 +00:00
Phil Hughes 9040010481 Added dropdown to list all projects on project header
When clicking the current project name, it shows a dropdown menu with a list of all projects for that group or user
2016-01-30 16:01:48 +00: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
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
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
Josh Frye 91b9cbff8d First pass at deleting projects in the background. 2016-01-29 09:14:16 -05:00
Dmitriy Zaporozhets 227728712e Merge branch 'note-background-job' into 'master'
Background process note logic for #3948

Quick and dirty way to get *most* of the note processing out of band and into the background. Seeing some pretty nice speed bumps. Keep in mind that doing this in process results in slower and slower responses as more notes are added and more participants exist.

```
without background processing
  Completed 200 OK in 627ms (Views: 0.5ms | ActiveRecord: 32.3ms)
  Completed 200 OK in 478ms (Views: 0.8ms | ActiveRecord: 28.3ms)
  Completed 200 OK in 1107ms (Views: 0.6ms | ActiveRecord: 36.6ms)

with background processing
  Completed 200 OK in 108ms (Views: 0.6ms | ActiveRecord: 4.7ms)
  Completed 200 OK in 78ms (Views: 0.5ms | ActiveRecord: 4.5ms)
  Completed 200 OK in 164ms (Views: 0.5ms | ActiveRecord: 8.3ms)
```

As you can see, speeds are consistent when doing the harder work out of process. I'm not sure the number of sql queries we're saving, but based on the logs alone it's a pretty good amount.

@dzaporozhets @yorickpeterse I would love some input on this.

See merge request !2631
2016-01-29 13:51:34 +00:00
Dmitriy Zaporozhets e221990eba Merge branch 'rs-remove-ip-blocking' into 'master'
Partially revert "Add IP check against DNSBLs at account sign-up"

This partially reverts 6a5cd3ca - we keep the migration and add a new
migration that reverts it in order to keep migration history intact.

See merge request !2643
2016-01-29 13:31:33 +00:00