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
3190 Commits
Author SHA1 Message Date
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 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
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 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
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 e6f34237bc reverting MR ajax changes, which will be in a different MR 2016-01-12 14:44:07 -05:00
Jacob Schatz fa8b228f9d restores merge request coffee file 2016-01-12 13:58:10 -05:00
Jacob Schatz eb3e7bdfd8 merge request close message moved and merge request now refered by !. 2016-01-12 08:40:02 -05: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
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
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
Dmitriy Zaporozhets 1ede18bfa8 Merge branch 'rs-woff-fonts' into 'master' 
Use WOFF versions of SourceSansPro

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

See merge request !2357
 2016-01-11 14:25:25 +00: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
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 ce066ba630 Merge branch 'autocomplete-on-load' into 'master' 
Load autocomplete data when loading an issue page



See merge request !2312
 2016-01-11 09:42:37 +00: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
Robert Speicher c7aeca993e Use WOFF versions of SourceSansPro 
See https://gitlab.com/gitlab-org/gitlab-ce/issues/6023
 2016-01-09 16:05:53 -05: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
Robert Speicher af68897acd Merge branch 'api-project-upload' into 'master' 
Add API project upload endpoint

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

See merge request !2329
 2016-01-08 20:29:43 +00:00
Jacob Schatz 463905929e fixes new branch button positioning, when visible and not visible container 2016-01-08 12:48:11 -05:00
Yorick Peterse cb22e5f942 Load autocomplete data when loading an issue page 
This ensures the dropdown is fully available the moment a user starts
typing out a username, issue ID, etc. While this won't speed up loading
the autocomplete data itself it should at least make it less annoying
for the user.
 2016-01-08 17:16:39 +01:00
Dmitriy Zaporozhets 68eab8b277 Merge branch 'cross-project-reference-move' into 'master' 
adds reference to the bottom of sidebar

Fixes #4183 
![Screen_Shot_2016-01-07_at_3.17.32_PM](/uploads/8d71b475f1775d555cf5898921e86a1d/Screen_Shot_2016-01-07_at_3.17.32_PM.png)


See merge request !2339
 2016-01-08 10:20:45 +00:00
Jacob Schatz a652c56366 adds 85% width for text 2016-01-07 15:25:38 -05:00
Jacob Schatz 60aedb46d9 adds reference to the bottom of sidebar 2016-01-07 15:18:07 -05:00
Jacob Schatz ad8366ed84 css change to height to make gray container fit 2016-01-07 13:23:17 -05:00
Jacob Schatz ab9612df8d initial json requests instead of HTML 2016-01-07 11:47:39 -05:00
Dmitriy Zaporozhets c7fc84f516 Use fadeTo instead of css 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-07 15:16:12 +01:00
Dmitriy Zaporozhets 44dc9aa69e Fix typo in js method and some repeating css 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-07 15:16:12 +01:00
Dmitriy Zaporozhets b2b4e9a7eb Prevent loading first 20 commits twice 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-07 15:16:11 +01:00
Dmitriy Zaporozhets d1a40e06cc Add ajax filtering for commits list 
Also handle commits list with Pager class to prevent code duplication

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-07 15:16:11 +01:00
Dmitriy Zaporozhets 5e93f912c3 Add search field to commits page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-07 15:16:11 +01:00
Douwe Maan 1886d727f7 Add API project upload endpoint 2016-01-07 13:37:14 +01:00
Dmitriy Zaporozhets 8d0886d6d0 Merge branch 'fix-missing-day-in-network-graph' into 'master' 
Fix missing date of month in network graph when commits span a month

Closes #3635, #1383

Before:

![image](/uploads/6a169e0cd402cb26f3a2cf13bd0ecc88/image.png)

After:

![image](/uploads/2600a454394383660a1e50a4a1ba1204/image.png)


See merge request !2325
 2016-01-07 12:10:57 +00:00
Jacob Vosmaer 41b8a238ce Merge branch 'master' of github.com:gitlabhq/gitlabhq 2016-01-07 12:56:18 +01:00
Stan Hu 7d013f7848 Fix missing date of month in network graph when commits span a month 
Closes #3635, #1383
 2016-01-06 21:05:46 -08:00
Janis Meybohm da53fcba2d Enable Microsoft Azure OAuth2 support 2016-01-06 14:30:43 +01:00
Jacob Schatz cbdc8dd46f adds ajax open and close merges, with discussion/comments working as well 2016-01-05 20:42:25 -05:00
Douwe Maan 07c39c9976 Merge branch 'brunsa2/gitlab-ce-diverging-branch-graphs' into 'master' 
Add graphs of commits ahead/behind default branch (by @brunsa2)

Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1716

See merge request !2301
 2016-01-05 15:44:22 +00:00
Dmitriy Zaporozhets a31d2f2a71 Merge branch 'new-markdown' into 'master' 
markdown fixes

old
![Screenshot_2016-01-05_10.49.46](/uploads/731f0e83ceefa74650ea27f8dca67b35/Screenshot_2016-01-05_10.49.46.png)

new
![Screenshot_2016-01-05_10.51.51](/uploads/85a82b2a589f9a4ad3dd47c6de3b89d7/Screenshot_2016-01-05_10.51.51.png)


See merge request !2295
 2016-01-05 11:48:29 +00:00
Andriy Dyadyura 00e8532d89 markdown fixes 2016-01-05 10:51:59 +01:00
Andriy Dyadyura f7ba38c073 markdown fixes 2016-01-05 10:45:18 +01:00
Dmitriy Zaporozhets e6713cd945 Merge branch 'improved-leave-project' into 'master' 
Adds settings menu to the top for editting and leaving projects

@creamzy @skyruler @dzaporozhets 
Menu contents depends on user's rights.

Fixes #4221


![Screen_Shot_2015-12-23_at_10.02.47_PM](/uploads/daeaef937bf9d9f4db7ccb674e344ac1/Screen_Shot_2015-12-23_at_10.02.47_PM.png)
![Screen_Shot_2015-12-23_at_10.02.41_PM](/uploads/58eb4eea7d640f01d7f05c2a408a2c04/Screen_Shot_2015-12-23_at_10.02.41_PM.png)
![Screen_Shot_2015-12-23_at_10.02.55_PM](/uploads/4b2ae027a13efcbad3eb81b04f134c4f/Screen_Shot_2015-12-23_at_10.02.55_PM.png)
![Screen_Shot_2015-12-23_at_10.04.47_PM](/uploads/bd5d9d8ddd72d16d74c32c6c1f569776/Screen_Shot_2015-12-23_at_10.04.47_PM.png)


See merge request !2195
 2016-01-05 09:34:13 +00:00
Dmitriy Zaporozhets 525f8fb4fb Merge branch 'rs-logo-animation' into 'master' 
Use the logo as a loading indicator

![logo-sweep](/uploads/ff048fd2e56a6dcae8801f998b484623/logo-sweep.gif)

See merge request !2277
 2016-01-05 09:30:09 +00:00
Robert Speicher 567d87d90f Restructure logo JS to use setInterval 2016-01-04 15:32:05 -05:00
Robert Speicher 9f46ca4443 Decrease the logo sweep delay 2016-01-04 14:57:11 -05:00