- 13 Jan, 2016 7 commits
-
-
Dmitriy Zaporozhets authored
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
-
Dmitriy Zaporozhets authored
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
-
Dmitriy Zaporozhets authored
Comment and close button does not submit comment See merge request !2399
-
https://github.com/tbeadle/gitlabhqDmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
Include the user_id in user_*_team system hooks.
-
Stan Hu authored
Mention channel/key bug in irkerd docs
-
Robert Speicher authored
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
-
- 12 Jan, 2016 33 commits
-
-
Robert Speicher authored
Prepare Installation and Update docs for 8.4 RC1 [ci skip] See merge request !2401
-
Robert Speicher authored
[ci skip]
-
Landon authored
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.
-
Robert Speicher authored
Revert "Remove the `:coffee` and `:coffeescript` Haml filters" This reverts commit ae7de2f8. 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
-
Robert Speicher authored
This reverts commit ae7de2f8.
-
Jacob Schatz authored
-
Jacob Schatz authored
-
Jacob Schatz authored
-
Jacob Schatz authored
-
Jacob Schatz authored
-
Jacob Schatz authored
-
Jacob Schatz authored
-
Jacob Schatz authored
-
Jacob Schatz authored
-
Robert Speicher authored
Somehow this test existed on EE but not in CE, so it started failing after a bad CE-to-EE merge.
-
Dmitriy Zaporozhets authored
Change milestone close notice copy. Closes #6051 See merge request !2372
-
Jacob Schatz authored
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
-
Robert Speicher authored
Add CHANGELOG entry for 8.3.4 [ci skip] See merge request !2393
-
Robert Speicher authored
Never heard of gitlab-omnibus See merge request !2388
-
Jacob Vosmaer authored
-
Jacob Vosmaer authored
Use gitlab-workhorse 0.5.4 Fixes routing errors for /api/v3/projects/ See merge request !2391
-
Yorick Peterse authored
See merge request !2392
-
Achilleas Pipinellis authored
added make command to docs The gitlab-workhose update docs are missing a make command See merge request !2281
-
Yorick Peterse authored
See merge request !2389
-
Yorick Peterse authored
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.
-
Jacob Vosmaer authored
Fixes routing errors for /api/v3/projects/
-
Yorick Peterse authored
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.
-
Jacob Vosmaer authored
-
Josh Frye authored
-
Dmitriy Zaporozhets authored
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
-
Dmitriy Zaporozhets authored
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
-
Yorick Peterse authored
See merge request !2385
-
Yorick Peterse authored
I forgot to add these in the respective MRs. [ci skip]
-