home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 13:46:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,538 Commits 48 Branches 340 Tags
5a1706791e46fd69a67fcdebfc384a702b00a7ff
Commit Graph
11340 Commits
Author SHA1 Message Date
Robert Speicher 5a1706791e Update broadcast_message helper 
Now it returns the fully-formatted message so we can be consistent about
how it's shown.
 2016-01-13 11:34:58 -05:00
Robert Speicher 12903762d1 Simplify broadcast message JS 
Also resets the default example message when the user input is blank.
 2016-01-13 11:34:58 -05:00
Robert Speicher 6ae39c2cd1 Remove alert_type attribute from BroadcastMessage 2016-01-13 11:34:57 -05:00
Robert Speicher 7e24c5c45a Move broadcast message form to a partial 2016-01-13 11:34:19 -05:00
Robert Speicher 1c7febc3e3 Style the broadcast message form 2016-01-13 11:34:19 -05:00
Robert Speicher 79361b207e Add js-requires-input to form 2016-01-13 11:34:19 -05:00
Yorick Peterse b7f49aa0f0 Merge branch 'configure-randomize-metrics-sample-interval' into 'master' 
See merge request !2406
 2016-01-13 14:54:45 +00:00
Douwe Maan c7d9e7806a Merge branch 'fix/reference_filter_uri_decode_error_for_master' into 'master' 
Fix #9963 reference_filter "Encoding::CompatibilityError" bug with some complex URL;

https://github.com/gitlabhq/gitlabhq/pull/9964

@DouweM

See merge request !2383
 2016-01-13 14:21:32 +00:00
Douwe Maan bbc28428a6 Merge branch 'maintain-milestone-filter' into 'master' 
enable milestone filter to stick



See merge request !2241
 2016-01-13 13:32:20 +00:00
Yorick Peterse 2367160015 Make the metrics sampler interval configurable 2016-01-13 12:29:48 +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 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
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
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
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
Greg Smethells c73d55e1be enable milestone filter to stick 2016-01-12 13:18:05 -06: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
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
Jason Lee 932a247f5f Use CGI.escape instead of URI.escape, because URI is obsoleted. 
ref: https://github.com/ruby/ruby/commit/238b979f1789f95262a267d8df6239806f2859cc
 2016-01-12 18:20:03 +08: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 af7f0a4df4 Merge branch 'hover-descriptions' into 'master' 
adds hover titles to merge request and issue pages

Fixes #5899

See merge request !2375
 2016-01-12 08:55:40 +00:00
Dmitriy Zaporozhets 93a8c98155 Merge branch 'active-state-on-button-makes-it-uppercase' into 'master' 
changes bolded on active for dropdowns, sitewide.

Fixes #6056 <br/>
 **Note:** this change applies to all dropdowns. Currently all dropdowns using bootstrap's dropdown.js apply a bold and larger font for an active state.

See merge request !2377
 2016-01-12 08:53:22 +00:00
Dmitriy Zaporozhets f0450c486c Merge branch 'rs-add-title-to-emoji' into 'master' 
Add title attribute to Emojis in award picker



See merge request !2378
 2016-01-12 08:52:28 +00:00
Robert Speicher d4ffe705eb Call clearInterval for the currentTimer if one exists 
Prevents a double-click from causing the logo to sweep forever after a
load completes.
 2016-01-11 18:37:20 -05:00
Robert Speicher 21a46236e0 Add title attribute to Emojis in award picker 2016-01-11 18:15:38 -05:00
Jacob Schatz f2edb26a1e fixes conflicts 2016-01-11 18:06:15 -05:00
Jacob Schatz 9bea7efb73 changes bolded on active for dropdowns, sitewide. 2016-01-11 16:04:31 -05:00
Robert Speicher 6fc1aba4a3 Merge branch 'fix/ci-linter-sequence-validations' into 'master' 
Allow subsequent validations in CI Linter

Closes #5851

See merge request !2368
 2016-01-11 19:09:09 +00:00
Robert Speicher 5dad714df6 Merge branch 'fix-ci-builds-for-tags' into 'master' 
Generate builds when creating tag using web interface

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

See merge request !2366
 2016-01-11 17:53:06 +00:00
Jacob Schatz b3431a8ce8 adds hover titles to merge request and issue pages 2016-01-11 12:50:01 -05:00
Josh Frye 75180eae1c Change milestone close notice copy. Closes #6051 2016-01-11 11:28:12 -05:00