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
6034 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 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
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 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
Jacob Schatz 0bb37c1ff2 makes message plural for multiple MRs and removes from loop. Duh. 2016-01-12 20:49:43 -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 aaf184bfa6 reverting _mr_title.html.haml 2016-01-12 14:38:37 -05:00
Jacob Schatz 906de20f82 reverting _disscusion 2016-01-12 13:52:36 -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
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
Jacob Schatz f2edb26a1e fixes conflicts 2016-01-11 18:06:15 -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
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
Drew Blessing 97022c414e Improve admin area button style 2016-01-11 09:11:40 -06:00
Dmitriy Zaporozhets a9800ce40b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2016-01-11 15:04:18 +01:00
Douwe Maan 66dee188d8 Merge branch 'rs-zenmode-cleanup' into 'master' 
Refactor ZenMode

- No longer depends on the "hidden checkbox".
- No longer depends on manually storing/restoring the scroll position.
  Instead, we take advantage of jquery.scrollTo.
- Event-based.
- Simplifies the state-based styling.

See merge request !2354
 2016-01-11 13:50:30 +00:00
Douwe Maan d89ad5078d Merge pull request #9960 from huacnlee/fix/do-not-use-coffeescript-in-erb 
use JavaScript instead of CoffeeScript in Views for master
 2016-01-11 14:31:55 +01:00
Grzegorz Bizon cdd3a80682 Allow subsequent validations in CI Linter 
Closes #5851
 2016-01-11 13:37:31 +01:00
Dmitriy Zaporozhets f41b535ced Merge branch 'fix-build-status-caching' into 'master' 
Fix caching issue where build status was not updating in project dashboard

The project dashboard page would show a stale build status since the caching key did not depend on it. Fix by adding the commit status if CI is applicable.

Closes #3268

See merge request !2353
 2016-01-11 12:10:33 +00:00
Dmitriy Zaporozhets 57a4319d42 Merge branch 'load-autocomplete-when-needed' into 'master' 
Only load autocomplete data when actually needed



See merge request !2365
 2016-01-11 11:58:45 +00:00
Kamil Trzciński b6c2908cb2 Merge branch 'fix-build-page-typo' into 'master' 
Fix typo in build page of projects

The column containing links to the builds is named Runner but actually
contains the Build.

See merge request !2347
 2016-01-11 11:54:18 +00:00
Yorick Peterse 569f5701ee Only load autocomplete data when actually needed 
Previously this would result in autocomplete data being loaded for every
page (e.g. the page showing all Git branches of a project).
 2016-01-11 11:13:11 +01:00
Dmitriy Zaporozhets e9f84c4c8c Merge branch 'new-branch-position-fix' into 'master' 
fixes new branch button positioning, when visible and not visible container

Fixes #5893
#5893 was not completely fixed. If a new branch was pushed the container is in correct position but if no container existed the position was incorrect. This MR fixes that. 

See merge request !2348
 2016-01-11 09:41:32 +00:00
Dmitriy Zaporozhets e3c024f712 Merge branch 'add-pencil-icon-to-group-page' into 'master' 
Add pencil icon to edit group settings

Move icons to upper-right corner of group page

Before:

![image](/uploads/6694c33eae6e10a4e21efef465a07114/image.png)

After:

![image](/uploads/0c17c2cf89fc0fde4344911b30f2635c/image.png)

Closes #6038

See merge request !2361
 2016-01-11 09:40:33 +00:00
Jeroen Nijhof 706255b926 Merge gitlab.com:gitlab-org/gitlab-ce 2016-01-11 09:32:35 +01:00
Stan Hu 1587d57197 Check for current user 2016-01-10 20:46:57 -08:00
Stan Hu 8aac39d836 Add pencil icon to edit group settings 
Move icons to upper-right corner of group page

Closes #6038
 2016-01-10 20:27:25 -08:00
iqualisoni e304a76eb6 Issue #5817 wording of the web hooks updated on issue and merge events 2016-01-11 01:02:27 -02:00
Jason Lee a789dcaeb3 use JavaScript instead of CoffeeScript in Views, the reason #9819 2016-01-11 11:01:15 +08:00
Steffen Köhler 9061b55c17 Fix typo in build page of projects 
The column containing links to the builds is named Runner but actually
contains the Build ID.

[ci skip]
 2016-01-10 16:20:51 +01:00
Stan Hu 5f6b093445 Disable "Already Blocked" button in admin abuse report page 2016-01-09 21:25:18 -08:00
Robert Speicher 89ca4f04f6 Refactor ZenMode 
- No longer depends on the "hidden checkbox".
- No longer depends on manually storing/restoring the scroll position.
  Instead, we take advantage of jquery.scrollTo.
- Event-based.
- Simplifies the state-based styling.
 2016-01-08 23:36:09 -05:00
Stan Hu d5c8f1fdde Fix caching issue where build status was not updating in project dashboard 
Closes #3268
 2016-01-08 16:08:10 -08:00
Robert Speicher 6d95444108 Merge branch 'cross-project-reference-typo-fix' into 'master' 
changes verb `references` to noun `reference`.

See merge request !2349
 2016-01-08 22:14:31 +00:00
Robert Speicher 00a68c3cb0 Remove Block Button from Abuse Reports page if User is Already Blocked 
An addition to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2292

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

See merge request !2313
 2016-01-08 22:02:34 +00:00
Drew Blessing 7a22b6b0de Improve button styles 2016-01-08 14:43:59 -06:00