home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 22:59:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,119 Commits 48 Branches 340 Tags
cbf34cdbcb1d421b7ee4efc170ceddc2d3d6789b
Commit Graph
1043 Commits
Author SHA1 Message Date
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 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
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
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
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
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 6592bfbb9e Moves star code to a class 2015-12-23 20:36:29 -05:00
Jacob Schatz 7ba4482fcf fixes failing test by updating project clone instructions 2015-12-23 19:57:30 -05:00
Jacob Schatz 3ece40c222 fixes the search for projects 2015-12-23 18:27:38 -05:00
Jacob Schatz e11ee5ff01 adds test for issue close/reopen failure 2015-12-23 17:41:05 -05:00
Jacob Schatz b3e4bc5911 resolves conflicts with new buttons 2015-12-23 17:05:29 -05:00
Dmitriy Zaporozhets c53742b14d Merge branch 'rs-update-jquery' into 'master' 
Bump jquery-rails to ~> 4.0.0, jquery-ui-rails to ~> 5.0.0

Closes #2859 

See merge request !2183
 2015-12-23 12:05:48 +00:00
Valery Sizov efe98067da emoji picker search 2015-12-23 13:08:47 +02:00
Robert Speicher 5ad192ced2 Fix paths for jquery-ui assets 2015-12-22 17:14:01 -05:00
Valery Sizov a56d357be0 TYPO in the comment 2015-12-22 23:12:23 +02:00
Valery Sizov a48dd40a92 base implementation of emoji picker [ci skip] 2015-12-22 23:12:23 +02:00
Valery Sizov d794ae8e1f add frequently used category to emoji picker 2015-12-22 23:04:19 +02:00
Valery Sizov f049b93965 TYPO in the comment 2015-12-22 20:02:22 +02:00
Valery SizovandValery Sizov 2eed8007bf base implementation of emoji picker [ci skip] 2015-12-22 16:48:55 +02:00
Rubén Dávila 42da7cd375 Fix redirect to wrong URL when merging and MR detail URL has an anchor. #4189 2015-12-21 22:59:15 -05:00
Douglas Barbosa Alexandre 23b436dc93 Fix minor stylistic complaints 2015-12-21 22:21:10 -02:00
Jacob Schatz 3ea3d9ef28 changes issue-box to status-box since html was changed as well 2015-12-21 17:10:27 -05:00
Jacob Schatz 453479143d adds alerts for when http request errors out in some way. 2015-12-21 17:03:28 -05:00
Jacob Schatz 801b801bf0 removes console logs 2015-12-21 16:46:36 -05:00
Jacob Schatz 1f5b8e88f3 changes data-url to href for javascript url grabbing 2015-12-21 16:45:52 -05:00
Jacob Schatz 531d06d170 removes console.logs 2015-12-21 16:16:04 -05:00
Jacob Schatz 70dfa3a721 open and close issue via ajax request. With tests 2015-12-21 13:06:09 -05:00
Douglas Barbosa Alexandre 95a67cdbcf Merge branch 'master' into branch-invalid-name 2015-12-18 11:46:10 -02:00
Douwe Maan d9c82d679f Automatically fork a project when not allowed to edit a file. 2015-12-18 10:03:34 +01:00
Douglas Barbosa Alexandre 05737f6c85 Add restriction for single characters in branch name 2015-12-17 19:45:11 -02:00
Douglas Barbosa Alexandre e26d1b4757 Remove extra spaces in the error messages 2015-12-17 19:44:28 -02:00