home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,538 Commits 48 Branches 340 Tags
5a1706791e46fd69a67fcdebfc384a702b00a7ff
Commit Graph
2553 Commits
Author SHA1 Message Date
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
Jacob Schatz eb3e7bdfd8 merge request close message moved and merge request now refered by !. 2016-01-12 08:40:02 -05: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
Jacob Schatz f2edb26a1e fixes conflicts 2016-01-11 18:06:15 -05: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
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
Jeroen Nijhof 706255b926 Merge gitlab.com:gitlab-org/gitlab-ce 2016-01-11 09:32:35 +01: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
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
Drew Blessing 7a22b6b0de Improve button styles 2016-01-08 14:43:59 -06:00
Jeroen Nijhof 2c37ae2f0a Merge gitlab.com:gitlab-org/gitlab-ce 2016-01-08 13:22:30 +01:00
Robert Speicher 4408dc0bd1 Use xmlschema where even more appropriate! 2016-01-07 20:01:08 -05:00
Robert Speicher 6344493655 Use to_s(:iso8601) where appropriate 2016-01-07 20:01:08 -05:00
Robert Speicher 59305715e9 Remove stamp gem 
Closes #5908
 2016-01-07 16:28:33 -05:00
Jacob Schatz ab9612df8d initial json requests instead of HTML 2016-01-07 11:47:39 -05: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 4443a5f3c7 Add support for ref and path to commits filtering 
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
Jeroen Nijhof 1695063d15 Merge gitlab.com:gitlab-org/gitlab-ce 2016-01-07 13:58:19 +01:00
Jacob Vosmaer 41b8a238ce Merge branch 'master' of github.com:gitlabhq/gitlabhq 2016-01-07 12:56:18 +01:00
Robert Speicher d47b3e63d5 Merge branch 'more-opengraph' into 'master' 
Add Open Graph data for group, project and commit.

See merge request !2211
 2016-01-06 19:11:05 +00:00
Jeroen Nijhof fe19169836 Use panel-default and .form-actions 2016-01-06 15:51:10 +01:00
Jeroen Nijhof 9b28220f88 Merge gitlab.com:gitlab-org/gitlab-ce 2016-01-06 14:55:44 +01:00
Douwe Maan 639d428046 Merge branch 'master' into more-opengraph 2016-01-06 13:06:25 +01:00
Douwe Maan c0849101e6 Merge branch 'master' into merge-when-build-succeeds-unchecked 2016-01-06 13:06:01 +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
Robert Speicher a0793d69c5 Remove now-redundant page_description call from Projects#show 2016-01-05 15:02:42 -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
Douwe Maan 7a3b762978 Merge branch 'master' into more-opengraph 
# Conflicts:
#	app/views/layouts/_head.html.haml
 2016-01-05 16:35:18 +01:00
Douwe Maan 097faeb481 Get "Merge when build succeeds" to work when commits were pushed to MR target branch while builds were running 2016-01-05 16:30:03 +01:00
Douwe Maan 7c3c901ada Merge branch 'joshfng/gitlab-ce-fix-3802' into 'master' 
Show 'New Merge Request' buttons on canonical repo. (by @joshfng)

Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2189 to run tests on our runners.

See merge request !2300
 2016-01-05 15:12:35 +00: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
Jacob Schatz 712af98e9c removes footer message about access to project 2016-01-04 09:07:50 -05:00
Douglas Barbosa Alexandre 567dc62b6d Show 'All' tab by default in the builds page 2016-01-04 10:21:10 -02:00
Dmitriy Zaporozhets b9ec1aaec8 Merge branch 'rs-delimit-all-the-things' into 'master' 
number_with_delimiter most of the things



See merge request !2258
 2016-01-04 10:36:54 +00:00
Josh Frye edd2ce3836 Change text back. Add additional tests. 2016-01-03 18:12:27 -05:00
Josh FryeandJosh Frye 95e6327b85 Fix tests 2016-01-03 18:12:27 -05:00