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,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
3146 Commits
Author SHA1 Message Date
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
Robert Speicher 7df3c1e8ea Correct the logo ID names 
Her left, not ours!
 2016-01-04 14:54:56 -05:00
Robert Speicher ad42441d2d Remove jquery.blockUI.js plugin 
It was only used to block the issue (but not merge request) list when
the sort was changed.
 2016-01-04 13:12:29 -05:00
Jacob Schatz 770517d3e7 Revert "Merge branch 'rs-remove-jquery-blockui' into 'master' " 
This reverts commit bc12750fcc, reversing
changes made to 8a04b84e09.
 2016-01-04 09:42:10 -05:00
Dmitriy Zaporozhets bc12750fcc Merge branch 'rs-remove-jquery-blockui' into 'master' 
Remove jquery.blockUI.js plugin

It was required but no longer used.

See merge request !2273
 2016-01-04 10:25:15 +00:00
Dmitriy Zaporozhets 8a04b84e09 Merge branch 'rs-remove-jquery-history-js' into 'master' 
Remove jquery.history.js plugin

We're not concerning ourselves with non-HTML5 browser compatibility, and
this removes 21 KB from our compiled JavaScript.

Bonus fix: There was an extra space after the query string in the URLs
that has now been removed.

See merge request !2272
 2016-01-04 10:24:12 +00:00
Robert Speicher 71c31ecf73 Ensure the sweep always starts from the left 2016-01-02 20:00:52 -05:00
Robert Speicher e5800d65de Use the logo as a loading indicator 
Closes #5616
 2016-01-02 15:43:02 -05:00
Robert Speicher d1873f16b4 Update cal-heatmap style overrides 
Some were no longer needed, others needed `!important`.
 2016-01-01 22:12:50 -05:00
Robert Speicher 4caf0433b7 Reorder JS requires 
The old way broke d3, for some reason.
 2016-01-01 22:10:48 -05:00
Robert Speicher f8c3b69fb6 Remove unused "options" object from Calendar JS 2016-01-01 22:10:16 -05:00
Robert Speicher 3c4d24b71e Remove jquery.blockUI.js plugin 
It was required but never used.
 2016-01-01 17:52:40 -05:00
Robert Speicher f3ea2f29a5 Remove jquery.history.js plugin 
We're not concerning ourselves with non-HTML5 browser compatibility, and
this removes 21 KB from our compiled JavaScript.

Bonus fix: There was an extra space after the query string in the URLs
that has now been removed.
 2016-01-01 17:44:21 -05:00
Robert Speicher e70ffdbf29 Merge branch 'fix-user-autocomplete' into 'master' 
Fixes problem with user autocomplete URI 

```
Failed to load resource: net::ERR_NAME_NOT_RESOLVED
http://autocomplete/users.json?search=&per_page=20&active=true&current_user=false
```

Fixes #4118, #4136

See merge request !2136
 2015-12-30 01:32:35 +00:00
Jacob Schatz eb162c2b27 adds settings menu to the top for editting and leaving projects 2015-12-28 14:45:23 -05:00
Dmitriy Zaporozhets 2978be2e22 Merge branch 'rs-fix-shortcut-help' into 'master' 
Fix the "Show all" link for the keyboard shortcut modal

18cb430f79 introduced a typo that made this stop working.

See merge request !2218
 2015-12-28 12:02:18 +00:00
Valery Sizov 004b85540f Do not show frequently used emojis when empty 2015-12-28 10:11:05 +02:00
Robert Speicher e7314e4c27 Fix the "Show all" link for the keyboard shortcut modal 2015-12-27 20:34:46 -05:00
Igor Matsko 17ee4e6cc6 Fix user autocomplete uri 2015-12-26 12:12:59 +03:00
Robert Speicher 98f77d2edc Merge branch 'close-open-ajax-issue' into 'master' 
open and close issue via ajax request. With tests

Close and Reopen issues with ajax request.

See merge request !2164
 2015-12-25 21:00:16 +00:00
Dmitriy Zaporozhets fd231ff9fb Merge branch 'revert_votes_back' into 'master' 
Revert vote buttons back to issue and MR pages

https://gitlab.com/gitlab-org/gitlab-ce/issues/3672



/cc @dzaporozhets @JobV 


![joxi_screenshot_1450809309400](/uploads/379a75505e0d5f24e743aa0a6a6684e2/joxi_screenshot_1450809309400.png)


See merge request !2206
 2015-12-25 15:52:06 +00:00
Douwe Maan 7d5b51f387 Merge branch 'rs-opengraph' into 'master' 
Add Open Graph meta tags



See merge request !2192
 2015-12-25 13:41:55 +00:00
Valery SizovandValery Sizov a1b63e1252 revert back vote buttons to issue and MR pages 2015-12-25 14:11:19 +02:00
Valery Sizov e1a47bd123 Merge branch 'emoji_picker_frequently_used' into 'master' 
Emoji picker: add "frequently used" category

depend on !2172

![Screen_Shot_2015-12-24_at_16.39.04](/uploads/7117173c6f519282054bcb1b7ba248f4/Screen_Shot_2015-12-24_at_16.39.04.png)


See merge request !2180
 2015-12-24 15:58:32 +00:00
Valery Sizov 355e62eb49 added default for frequently used emojis 2015-12-24 16:40:10 +02:00
Dmitriy Zaporozhets aa712e2b36 Merge branch 'new-project-header-redesign' into 'master' 
Dropdowns for clone. Star and Fork with new count areas. Star and Unstarred Works now

Fixes #2876 and #3482
Used existing styles. <br/>
Did not attempt to make pixel perfect as styles already exist. <br/>

![Screen_Shot_2015-12-18_at_5.24.56_PM](/uploads/a79ba1e0be0232f2aeef8a43f3253479/Screen_Shot_2015-12-18_at_5.24.56_PM.png)

See merge request !2156
 2015-12-24 14:17:11 +00:00
Valery Sizov a55b653d93 fix of frequently used emojis 2015-12-24 15:44:43 +02:00
Valery Sizov 5ed1256492 Merge branch 'emoji-picker-search' into emoji_picker_frequently_used 2015-12-24 15:06:51 +02:00
Valery Sizov 44cf1cbaaf Merge remote-tracking branch 'origin/master' into emoji-picker-search 2015-12-24 14:57:07 +02:00
Valery Sizov 6d07054747 fix specs 2015-12-24 14:54:02 +02:00
Dmitriy Zaporozhets d1043c4389 Merge branch 'new-nav-width' into 'master' 
nav full width

old
![Screen_Shot_2015-12-21_at_3.47.01_PM](/uploads/ef47c61eb33521087fc40d400d01cba8/Screen_Shot_2015-12-21_at_3.47.01_PM.png)

new
![Screenshot_2015-12-24_12.16.53](/uploads/30cf37886b3710a22daa0b82583975e9/Screenshot_2015-12-24_12.16.53.png)


See merge request !2200
 2015-12-24 12:35:24 +00:00
Dmitriy Zaporozhets 76b7e24f85 Merge branch 'edit-on-fork' into 'master' 
Automatically fork a project when not allowed to edit a file.

Fixes #3215.

To do:

- [ ] Add tests

-----

## "Edit" button on file in a project the user does NOT have write access to

![edit_file](/uploads/7602157420768aef483a6586bba2d164/edit_file.png)

## Clicking will automatically create a fork

![during_fork](/uploads/32f4f5dff9f24ea99522000b0bf881c5/during_fork.png)

## When the fork has been created, the user is returned to the edit page on the original project with a notice

![edit_notice](/uploads/94ed1319404370ff1e9c0d672fb41e03/edit_notice.png)

## The user cannot change the target branch and is informed that editing will start an MR

![edit_footer](/uploads/4da68d4795c7177e575b7c434d16eeae/edit_footer.png)

## Hitting "Commit changes" will commit and start an MR from my fork to the origin project

![Screen_Shot_2015-12-17_at_23.38.08](/uploads/d777a4db6f38a5a1be84031694465bc1/Screen_Shot_2015-12-17_at_23.38.08.png)

-----

## "Create file, "Upload file" and "New directory" buttons in a project the user does NOT have write access to

![new_directory](/uploads/72f556248f30d6652523bbb4be01b3e0/new_directory.png)

## Clicking any of these options will automatically create a fork

![during_fork](/uploads/32f4f5dff9f24ea99522000b0bf881c5/during_fork.png)

## When the fork has been created, the user is returned to the tree page on the original project with a notice

![new_directory_notice](/uploads/a1a3e11308ae0e8f0913fae6813a37ed/new_directory_notice.png)

## Clicking "New directory" again will show the modal. The user cannot change the target branch and is informed that editing will start an MR

![new_dir](/uploads/99ca8cbfb2f70603e352b3fdf67b6281/new_dir.png)

## Hitting "Create directory" will commit and start an MR from my fork to the origin project

![Screen_Shot_2015-12-17_at_23.39.19](/uploads/3713d0235abf831361b803a6198c5bc1/Screen_Shot_2015-12-17_at_23.39.19.png)

cc @dzaporozhets @skyruler

See merge request !2145
 2015-12-24 12:24:57 +00:00
Douwe Maan 6b968a8fcd Merge branch 'branch-invalid-name' into 'master' 
Add JS validation for invalid characters  in branch name

Fixes #3293 

Demo:

![out-1080p](/uploads/ba21c359b6b8b440c40cacf772ec0df7/out-1080p.gif)


See merge request !2122
 2015-12-24 11:42:25 +00:00
Douwe Maan 541da4d51f Merge branch 'issue_4189' into 'master' 
Fix redirect to wrong URL when merging and MR detail URL has an anchor.

Closes #4189

See merge request !2169
 2015-12-24 11:41:36 +00:00
Valery Sizov 999a374f77 Merge branch 'emoji-picker-search'into emoji_picker_frequently_used 2015-12-24 13:38:17 +02:00
Valery Sizov e622259d5b Merge branch 'emoji-picker-fix' into 'master' 
Emoji picker: better alias handling

related to https://gitlab.com/gitlab-org/gitlab-ce/issues/3576

See merge request !2198
 2015-12-24 11:24:03 +00:00
Andriy Dyadyura 5939d24756 nav full width 2015-12-24 12:22:01 +01:00
Valery Sizov d4e9c75844 Merge remote-tracking branch 'origin/master' into emoji-picker-search 2015-12-24 12:01:22 +02:00
Valery Sizov 5da8c1f77a fixes after review 2015-12-24 11:57:46 +02:00
Valery Sizov 694579ce04 Merge branch 'emoji-picker-fix' into emoji-picker-search 2015-12-24 11:50:58 +02:00
Valery Sizov b6de0d2830 Emoji picker: better alias handling 2015-12-24 11:28:55 +02:00
Jacob Schatz 00e967a07f removes unused alert from issue spec. Requires flash in the *implementation* instead of the spec. 2015-12-23 20:57:16 -05:00
Jacob Schatz a1294e5aab fixes css spacing issues 2015-12-23 20:39:42 -05:00