Commit Graph
22518 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets b433efcf70 Add suport for layout without container
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-13 14:27:36 +01:00
Dmitriy Zaporozhets 777771db28 Merge branch 'referenced-merge-requests' into 'master'
merge request close message moved and merge request now refered by `!`.

Fixes #4161 

![Screen_Shot_2016-01-12_at_8.38.57_AM](/uploads/9390ce0ebd1d14bfc83130ff4913a823/Screen_Shot_2016-01-12_at_8.38.57_AM.png)

See merge request !2387
2016-01-13 09:23:23 +00:00
Dmitriy Zaporozhets 2d865213cb Merge branch 'rs-disable-colorization' into 'master'
Disable colorization if STDOUT is not a tty

Closes #6118 

See merge request !2403
2016-01-13 09:14:45 +00:00
Dmitriy Zaporozhets 73e0754070 Merge branch 'rs-block-user-before-removal' into 'master'
Block the reported user before destroying the record

This is intended to prevent the user from creating new objects while the
transaction that removes them is being run, resulting in objects with
nil authors which can then not be edited.

See https://gitlab.com/gitlab-org/gitlab-ce/issues/7117

See merge request !2402
2016-01-13 09:14:30 +00:00
Dmitriy Zaporozhets 9552db2fa7 Merge branch 'rs-time_ago_with_tooltip-conversion' into 'master'
Make sure time_ago_with_tooltip is using a Time object

Somehow this test existed on EE but not in CE, so it started failing
after a bad CE-to-EE merge.

See merge request !2398
2016-01-13 09:13:51 +00:00
Dmitriy Zaporozhets 96351a1e9f Merge branch 'comment-and-close-button-does-not-submit-comment' into 'master'
Comment and close button does not submit comment



See merge request !2399
2016-01-13 09:13:17 +00:00
Dmitriy Zaporozhets 32a5b741c2 Merge branch 'add_username_to_user_system_hooks' of https://github.com/tbeadle/gitlabhq
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-13 10:12:30 +01:00
Dmitriy Zaporozhets 678ee247ee Merge pull request #9952 from tbeadle/user_id_in_member_system_hook
Include the user_id in user_*_team system hooks.
2016-01-13 10:09:37 +01:00
Stan Hu cd243b83fc Merge pull request #9968 from vimalloc/patch-1
Mention channel/key bug in irkerd docs
2016-01-12 18:48:49 -08:00
Robert Speicher 6d68ba2870 Don't automatically require awesome_print
It patches core classes (such as String) to add colorization methods
like `red` which we can't disable the same way we can with the
Colorization gem.
2016-01-12 21:34:47 -05:00
Robert Speicher a43fd5ce6d Disable colorization if STDOUT is not a tty 2016-01-12 21:34:23 -05:00
Robert Speicher da40274fdc Block the reported user before destroying the record
This is intended to prevent the user from creating new objects while the
transaction that removes them is being run, resulting in objects with
nil authors which can then not be edited.

See https://gitlab.com/gitlab-org/gitlab-ce/issues/7117
2016-01-12 20:59:55 -05:00
Jacob Schatz e74e03fa66 changes $quote-gray to $secondary-text 2016-01-12 20:51:13 -05:00
Jacob Schatz 0bb37c1ff2 makes message plural for multiple MRs and removes from loop. Duh. 2016-01-12 20:49:43 -05:00
Robert Speicher 1813adcdea Merge branch 'rs-prepare-rc1' into 'master'
Prepare Installation and Update docs for 8.4 RC1

[ci skip]

See merge request !2401
2016-01-12 23:13:24 +00:00
Robert Speicher 3dfb69a59f Prepare Installation and Update docs for 8.4 RC1
[ci skip]
2016-01-12 18:04:02 -05:00
Landon 4819de1e70 Mention channel/key bug in irkerd docs
Per this issue: https://gitlab.com/esr/irker/issues/2

A documentation update was added to irkerd (https://gitlab.com/esr/irker/commit/190808c37d4ab5f0f16fe35352ff36863c2732d5) but the bug is still there. Making a note of it here could save someone a lot of hassle. 

This could probably be worded better if someone else wants to take a stab at it.
2016-01-12 15:54:09 -07:00
Robert Speicher 8c67a9fb36 Merge branch 'rs-revert-remove-filters' into 'master'
Revert "Remove the `:coffee` and `:coffeescript` Haml filters"

This reverts commit ae7de2f851.

Several files in EE still use the `:coffeescript` filter and
I don't have time to fix them before the CE-to-EE merge.

See https://gitlab.com/gitlab-org/gitlab-ee/builds/553647

I will reintroduce this change in a future MR.

See merge request !2400
2016-01-12 22:26:38 +00:00
Robert Speicher b0145d765b Revert "Remove the :coffee and :coffeescript Haml filters"
This reverts commit ae7de2f851.
2016-01-12 16:30:38 -05:00
Jacob Schatz f01d052071 gets merge request discussion working again 2016-01-12 16:29:14 -05:00
Jacob Schatz d82d3ecd48 adds back in discussion.haml.html for issues commenting and closing/reopening properly. 2016-01-12 15:45:48 -05:00
Jacob Schatz c0220198d1 removing last chunk of MR ajax changes, rest will be in another MR 2016-01-12 15:16:26 -05:00
Jacob Schatz 63363e47f4 reverting more MR ajax files, will appear in different commit 2016-01-12 14:55:54 -05:00
Jacob Schatz e6f34237bc reverting MR ajax changes, which will be in a different MR 2016-01-12 14:44:07 -05:00
Jacob Schatz aaf184bfa6 reverting _mr_title.html.haml 2016-01-12 14:38:37 -05:00
Jacob Schatz 7abfe14ee1 reverting merge_request_controller 2016-01-12 14:35:55 -05:00
Jacob Schatz fa8b228f9d restores merge request coffee file 2016-01-12 13:58:10 -05:00
Jacob Schatz 906de20f82 reverting _disscusion 2016-01-12 13:52:36 -05:00
Robert Speicher 100cdce21e Make sure time_ago_with_tooltip is using a Time object
Somehow this test existed on EE but not in CE, so it started failing
after a bad CE-to-EE merge.
2016-01-12 13:13:16 -05:00
Dmitriy Zaporozhets 5c874f06fc Merge branch 'change_milestone_close_copy' into 'master'
Change milestone close notice copy. Closes #6051



See merge request !2372
2016-01-12 17:42:45 +00:00
Jacob Schatz f225c2a005 Merge branch 'improve_more_buttons' into 'master'
Improve admin area button style

A lot of the buttons in the top right in the admin area were too big. This makes those the new `btn-nr` size which seems to look nice.

## User buttons

### Current

![Screen_Shot_2016-01-08_at_2.29.30_PM](/uploads/8920d4a67ff4a20617e5b4d319ba154e/Screen_Shot_2016-01-08_at_2.29.30_PM.png)

### New

![Screen_Shot_2016-01-08_at_2.29.21_PM](/uploads/494741f6e92592ff2c60683f399bb1c1/Screen_Shot_2016-01-08_at_2.29.21_PM.png)

## Project edit button

### Current

![Screen_Shot_2016-01-08_at_2.29.59_PM](/uploads/09a2f8fddc45120510dd10758ce33c51/Screen_Shot_2016-01-08_at_2.29.59_PM.png)

### New ![Screen_Shot_2016-01-08_at_2.30.14_PM](/uploads/93a72a7c42b1974643b1e9ffd3ec8511/Screen_Shot_2016-01-08_at_2.30.14_PM.png)

## Label button

### Current

![Screen_Shot_2016-01-08_at_2.38.09_PM](/uploads/9cff790e1a4e2d650487c9765d0235a4/Screen_Shot_2016-01-08_at_2.38.09_PM.png)

### New

![Screen_Shot_2016-01-08_at_2.38.31_PM](/uploads/9462ff2393249eb762dc7cb92605c733/Screen_Shot_2016-01-08_at_2.38.31_PM.png)

cc/ @jschatz1 @creamzy @skyruler 

See merge request !2351
2016-01-12 17:36:01 +00:00
Robert Speicher d047db910a Merge branch 'changelog-8.3.4' into 'master'
Add CHANGELOG entry for 8.3.4

[ci skip]

See merge request !2393
2016-01-12 17:18:00 +00:00
Robert Speicher 025f061765 Merge branch 'gitlab-omnibus-really' into 'master'
Never heard of gitlab-omnibus

See merge request !2388
2016-01-12 16:59:10 +00:00
Jacob Vosmaer 1c46ab040d Add CHANGELOG entry for 8.3.4 2016-01-12 17:10:07 +01:00
Jacob Vosmaer 9cbdc2d860 Merge branch 'gitlab-workhorse-0.5.4' into 'master'
Use gitlab-workhorse 0.5.4

Fixes routing errors for /api/v3/projects/

See merge request !2391
2016-01-12 15:55:11 +00:00
Yorick Peterse 83ad5fa5cb Merge branch 'remove-application-frames-from-views' into 'master'
See merge request !2392
2016-01-12 15:44:57 +00:00
Achilleas Pipinellis 8f1c46d18a Merge branch 'add_make' into 'master'
added make command to docs

The gitlab-workhose update docs are missing a make command

See merge request !2281
2016-01-12 15:22:54 +00:00
Yorick Peterse 6992b07245 Merge branch 'allocated-memory-per-transaction' into 'master'
See merge request !2389
2016-01-12 14:45:23 +00:00
Yorick Peterse 355c341fe7 Stop tracking call stacks for instrumented views
Where a vew is called from doesn't matter as much. We already know what
action they belong to and this is more than enough information. By
removing the file/line number from the list of tags we should also be
able to reduce the number of series stored in InfluxDB.
2016-01-12 15:41:22 +01:00
Jacob Vosmaer 0e769d2a48 Use gitlab-workhorse 0.5.4
Fixes routing errors for /api/v3/projects/
2016-01-12 15:18:17 +01:00
Yorick Peterse 5679ee0120 Track memory allocated during a transaction
This gives a very rough estimate of how much memory is allocated during
a transaction. This only works reliably when using a single-threaded
application server and a Ruby implementation with a GIL as otherwise
memory allocated by other threads might skew the statistics. Sadly
there's no way around this as Ruby doesn't provide a reliable way of
gathering accurate object sizes upon allocation on a per-thread basis.
2016-01-12 14:59:30 +01:00
Jacob Vosmaer fac252c9a2 Never heard of gitlab-omnibus 2016-01-12 14:47:55 +01:00
Jacob Schatz eb3e7bdfd8 merge request close message moved and merge request now refered by !. 2016-01-12 08:40:02 -05:00
Josh Frye 0c598004d7 Revert group milestone copy 2016-01-12 08:29:47 -05:00
Dmitriy Zaporozhets e85faec90e Merge branch 'show-ip-addresses' into 'master'
Add user's last used IP addresses to admin page

This would help admins figure out from where spam is originating.

Screenshot:

![image](/uploads/984005a3a35b7004bd0a363081eb53ba/image.png)


See merge request !2381
2016-01-12 11:44:40 +00:00
Dmitriy Zaporozhets c304988306 Merge branch 'improve_button_styles' into 'master'
Improve button styles

I noticed a couple of buttons don't match the newer styles.

## Issue edit note form

### Current (cancel button is big)

![Screen_Shot_2016-01-08_at_2.18.29_PM](/uploads/c7928e6644e886090f55cb61076c9e89/Screen_Shot_2016-01-08_at_2.18.29_PM.png)

### Now

![Screen_Shot_2016-01-08_at_2.18.22_PM](/uploads/d15c3c458a08ce5a59c367c7fb379c31/Screen_Shot_2016-01-08_at_2.18.22_PM.png)

## Merge request code discussion

### Current

![Screen_Shot_2016-01-08_at_2.21.37_PM](/uploads/b970ff3e5d9ef5e62f83bb56d5505f8d/Screen_Shot_2016-01-08_at_2.21.37_PM.png)

### Now (Also changed to `btn-save` class which changes to green. This matches everything else)

![Screen_Shot_2016-01-08_at_2.22.01_PM](/uploads/ed520de72177de92efe21d236bb04d24/Screen_Shot_2016-01-08_at_2.22.01_PM.png)

cc/ @jschatz1 @skyruler @creamzy 

See merge request !2350
2016-01-12 11:41:00 +00:00
Yorick Peterse 587f850170 Merge branch 'changelog-metrics' into 'master'
See merge request !2385
2016-01-12 10:37:54 +00:00
Yorick Peterse 9f8510b329 Updated CHANGELOG with changes I made
I forgot to add these in the respective MRs.

[ci skip]
2016-01-12 11:36:59 +01:00
Stan Hu 75123458ee Add user's last used IP addresses to admin page
This would help admins figure out from where spam is originating.
2016-01-12 00:59:29 -08:00
Dmitriy Zaporozhets c4511a1234 Merge branch 'update-fog' into 'master'
Bump fog to 1.36.0

Updates AWS regions and fixes a number of bugs. Tested a GitLab AWS backup without any issues.

Closes #4231

See merge request !2373
2016-01-12 08:57:08 +00:00