home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-25 04:26:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
21,935 Commits 48 Branches 340 Tags
ff8cd116a04d187f63222b3b29ebb6818dfd65e5
Commit Graph
2484 Commits
Author SHA1 Message Date
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
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
Jacob Schatz 6592bfbb9e Moves star code to a class 2015-12-23 20:36:29 -05:00
Jacob Schatz 77daadc92c Merge branch 'master' into new-project-header-redesign 2015-12-23 18:59:06 -05:00
Jacob Schatz 52293ccd65 refactoring javascript to put starring functionality in a function 2015-12-23 12:54:51 -05:00
Jacob Schatz 69f9bf77d4 spinach tests will pass now 2015-12-23 12:26:50 -05:00
Jacob SchatzandJacob Schatz f56783e524 adds dropdown for cloning 2015-12-23 12:26:50 -05:00
Jacob SchatzandJacob Schatz 011a7a3297 adds starring and unstarring text to star button, also adds partial new styles 2015-12-23 12:26:50 -05:00
Jacob SchatzandJacob Schatz 7b50ab5c1d arrows for buttons 2015-12-23 12:26:50 -05:00
Andriy Dyadyura 5e0b989fca new button sizes 2015-12-23 15:46:13 +01:00
Dmitriy Zaporozhets a84ecf0e2e Fix close/reopen buttons 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-23 12:29:50 +01:00
Andriy Dyadyura f4dabf9795 new buttons issue 2015-12-22 21:37:11 +01:00
Andriy Dyadyura a72b71abcc new buttons issue 2015-12-22 21:29:31 +01:00
Drew Blessing 66a8281fdd Fix and test leave project display 2015-12-21 15:58:42 -06:00
Douwe Maan 17ed42e362 Merge branch 'issue_3452' 2015-12-21 17:43:58 +01:00
Grzegorz Bizon 27859f7ed9 Merge branch 'ci-commit-status-skipped' into 'master' 
Don't create CI status for refs that doesn't have .gitlab-ci.yml, even if the builds are enabled

Fixes #3827 
Fixes #4157

/cc @grzesiek @dblessing 

See merge request !2139
 2015-12-18 18:48:06 +00:00
Robert Speicher 3ca78f015a Merge branch 'reference_clean_up' into 'master' 
Do not display project group/name when issue and MR are in same project

I noticed that things seem a bit cluttered for related merge requests
when displaying the group/project name for every item, even when it's
in the same project.

For merge requests that are in the same project as the issue we probably
don't need to display the 'in group / name' bit.

See merge request !2141
 2015-12-18 18:36:34 +00:00
Robert Speicher 3f26d24f52 Merge branch 'remove-extra-spaces' into 'master' 
Remove extra spaces after branchname

See merge request !2152
 2015-12-18 18:00:25 +00:00
Douwe Maan 1b9e2530de Merge branch 'master' into edit-on-fork 
# Conflicts:
#	app/views/projects/tree/_tree_header.html.haml
 2015-12-18 17:15:05 +01:00
Grzegorz Bizon a54bd0ff77 Merge branch 'fix/mr-reopen-button-title' into 'master' 
Fix merge-request-reopen button title

Closes #4069

See merge request !2147
 2015-12-18 16:03:39 +00:00
Douwe Maan f4f4a6b530 Fix specs and behavior for LFS files 2015-12-18 16:14:12 +01:00
Douglas Barbosa Alexandre 95a67cdbcf Merge branch 'master' into branch-invalid-name 2015-12-18 11:46:10 -02:00
Douwe Maan 0ac57a540d Satisfy Rubocop 2015-12-18 11:19:08 +01:00
Zeger-Jan van de Weg ffa12a7f82 Remove extra spaces after branchname 2015-12-18 11:16:08 +01:00
Douwe Maan d9c82d679f Automatically fork a project when not allowed to edit a file. 2015-12-18 10:03:34 +01:00
Grzegorz Bizon 50798a90b6 Fix merge-request-reopen button title 
Closes #4069
 2015-12-18 09:12:44 +01:00
Drew Blessing 50ef67617c Add branch and tag operation to tree dropdown 2015-12-17 14:50:00 -06:00
Douglas Barbosa Alexandre 1757e6ef65 Add JS validation for invalid characters in branch name 
More info about valid ref names:

https://www.kernel.org/pub/software/scm/git/docs/git-check-ref-format.ht
ml
 2015-12-17 17:17:37 -02:00
Drew Blessing 84caae7294 Do not display project group/name when issue and MR are in same project 2015-12-17 10:14:50 -06:00
Kamil Trzcinski 58a56a0396 Don't create CI status for refs that doesn't have .gitlab-ci.yml, even if the builds are enabled 2015-12-17 16:33:47 +01:00
Dmitriy Zaporozhets 4b7c9c7fe2 Revert sidebar position for issue and merge request 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-17 10:34:15 +01:00
Dmitriy Zaporozhets 3162a5a293 Fix ux issue with "This issue will be closed automatically" message 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-17 00:04:29 +01:00
Dmitriy Zaporozhets a9b078535b Merge branch 'move-mr-builds-tab' into 'master' 
Move MR Builds tab next to Commits

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/4132

@dzaporozhets We've got two people who feel strongly about this now, @sytses filed an issue for it :)

![Screen_Shot_2015-12-16_at_22.19.35](/uploads/37e705610ba54e386928d7972398c247/Screen_Shot_2015-12-16_at_22.19.35.png)


See merge request !2128
 2015-12-16 22:44:52 +00:00
Douwe Maan 6493fd3d58 Move MR Builds tab next to Commits 2015-12-16 22:18:19 +01:00
Douwe Maan 2d0f9dd02e Fix merge widget JS for buttons 2015-12-16 19:53:38 +01:00
Douglas Barbosa Alexandre c91cf1f66b Remove the hint on the branch name input 2015-12-16 16:48:14 -02:00
Douwe Maan 76708c2c18 Merge branch 'master' into fix-merge-immediately-button 2015-12-16 19:43:52 +01:00
Douglas Barbosa Alexandre 9c266d4935 Add more descriptive error message when create branch with invalid name 2015-12-16 16:34:03 -02:00
Douwe Maan 8eb51dc037 Fix updating and disabling merge button when Merge Immediately is clicked 2015-12-16 19:27:46 +01:00
Dmitriy Zaporozhets 6374bdb352 Merge branch 'mr-builds-fixes' into 'master' 
Link to correct (source) project on MR builds tab

Used to link to `gitlab-org/gitlab-ce/commits/<branch-name>`, now links to correct project.

See merge request !2115
 2015-12-16 18:16:03 +00:00
Rubén Dávila 3f83a1585f Add link to MR from Build detail page. #3452 2015-12-16 11:54:48 -05:00
Douwe Maan 5fc90eec50 Link to correct (source) project on MR builds tab 2015-12-16 16:47:39 +01:00
Douwe Maan 79c90821ac Rename .issuable-details to .detail-page (and -header and -description) 2015-12-16 16:13:22 +01:00
Douwe Maan 41d6b3701e Merge branch 'master' into fix-milestone-snippet-header 2015-12-16 15:56:23 +01:00
Robert Speicher f49ac5c8d3 Fix clipboard buttons on MR instructions and Commit#show 2015-12-15 16:11:01 -05:00
Douwe Maan 9dfe43c83b Move milestone edit button to the very right 2015-12-15 17:36:08 +01:00
Douwe Maan 5413960b1a Fix headers of milestone and snippet show pages 2015-12-15 17:29:37 +01:00
Grzegorz BizonandGrzegorz Bizon 6fb120d1b0 Assign notes object to a variable 2015-12-15 14:19:35 +01:00
Douglas Barbosa Alexandre 5afe03315d Preserve trailing new lines at the end of file on the online editor 
Because Haml automatically indents the HTML source code, the contents
of whitespace-sensitive tags like pre and textarea can get screwed up.
 2015-12-14 18:22:28 -02:00