delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix feature steprs-remove-stamp	Robert Speicher	2016-01-07	1	-1/+1
\|
*	Add CHANGELOG item and tests	Dmitriy Zaporozhets	2016-01-07	2	-0/+14
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Jacob Vosmaer	2016-01-07	3	-0/+119
\|
*	Merge branch 'joshfng/gitlab-ce-fix-3802' into 'master'	Douwe Maan	2016-01-05	2	-0/+30
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	Change text back. Add additional tests.joshfng/gitlab-ce-fix-3802	Josh Frye	2016-01-03	2	-2/+13
\| \|
\| *	Remove feature tag from testing locally	Josh Frye	2016-01-03	1	-1/+0
\| \|
\| *	Show 'New Merge Request' buttons on canonical repo.	Josh Frye	2016-01-03	2	-0/+20
\| \|
* \|	remove public field from namespace and refactoringnamespace-clean_up	Valery Sizov	2016-01-04	1	-15/+0
\|/
*	spinach fix	Valery Sizov	2015-12-31	1	-1/+1
\|
*	Fix "I see current user as the first user" step	Robert Speicher	2015-12-30	1	-5/+4
\| \| \| \|	Why did this break? `¯\_(ツ)_/¯`
*	fix spinach	Valery Sizov	2015-12-25	1	-3/+5
\|
*	add sorting of awards	Valery Sizov	2015-12-25	1	-1/+1
\|
*	Merge branch 'emoji_picker_frequently_used' into 'master'	Valery Sizov	2015-12-24	1	-2/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	Merge branch 'emoji-picker-search' into emoji_picker_frequently_used	Valery Sizov	2015-12-24	6	-20/+137
\| \|\
\| * \	Merge branch 'emoji-picker-search'into emoji_picker_frequently_usedemoji_picker_frequently_used	Valery Sizov	2015-12-24	19	-32/+91
\| \|\ \
\| * \| \|	add some spinach	Valery Sizov	2015-12-22	2	-0/+12
\| \| \| \|
\| * \| \|	fix specs	Valery Sizov	2015-12-22	1	-2/+2
\| \| \| \|
* \| \| \|	Merge branch 'new-project-header-redesign' into 'master'	Dmitriy Zaporozhets	2015-12-24	4	-3/+7
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \|	Moves star code to a class	Jacob Schatz	2015-12-23	1	-2/+2
\| \| \| \|
\| * \| \|	fixes failing test by updating project clone instructions	Jacob Schatz	2015-12-23	2	-4/+7
\| \| \| \|
\| * \| \|	spinach tests will pass now	Jacob Schatz	2015-12-23	2	-1/+2
\| \| \| \|
* \| \| \|	Merge remote-tracking branch 'origin/master' into emoji-picker-searchemoji-picker-search	Valery Sizov	2015-12-24	6	-20/+137
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	Merge branch 'edit-on-fork' into 'master'	Dmitriy Zaporozhets	2015-12-24	2	-19/+122
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| * \| \|	Fix specedit-on-fork	Douwe Maan	2015-12-21	1	-2/+2
\| \| \| \| \|
\| \| * \| \|	Add tests for new functionality	Douwe Maan	2015-12-21	2	-14/+117
\| \| \| \| \|
\| \| * \| \|	Fix specs	Douwe Maan	2015-12-19	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	Merge branch 'master' into edit-on-fork	Douwe Maan	2015-12-18	2	-2/+3
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/views/projects/tree/_tree_header.html.haml
\| \| * \| \| \|	Fix specs and behavior for LFS files	Douwe Maan	2015-12-18	1	-3/+3
\| \| \| \| \| \|
\| \| * \| \| \|	Automatically fork a project when not allowed to edit a file.	Douwe Maan	2015-12-18	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'branch-invalid-name' into 'master'	Douwe Maan	2015-12-24	2	-1/+3
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add JS validation for invalid characters in branch name Fixes #3293 Demo: ![out-1080p](/uploads/ba21c359b6b8b440c40cacf772ec0df7/out-1080p.gif) See merge request !2122
\| \| * \| \| \| \|	Fix minor stylistic complaints	Douglas Barbosa Alexandre	2015-12-21	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'master' into branch-invalid-name	Douglas Barbosa Alexandre	2015-12-18	2	-2/+3
\| \| \|\ \ \ \ \ \| \| \| \| \|/ / / \| \| \| \|/\| \| \|
\| \| * \| \| \| \|	Add JS validation for invalid characters in branch name	Douglas Barbosa Alexandre	2015-12-17	2	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	More info about valid ref names: https://www.kernel.org/pub/software/scm/git/docs/git-check-ref-format.ht ml
\| \| * \| \| \| \|	Add more descriptive error message when create branch with invalid name	Douglas Barbosa Alexandre	2015-12-16	1	-1/+1
\| \| \| \|/ / / \| \| \|/\| \| \|
\| * \| \| \| \|	Merge branch 'issue_4189' into 'master'	Douwe Maan	2015-12-24	2	-0/+12
\| \|\ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix redirect to wrong URL when merging and MR detail URL has an anchor. Closes #4189 See merge request !2169
\| \| * \| \| \|	Fix redirect to wrong URL when merging and MR detail URL has an anchor. #4189issue_4189	Rubén Dávila	2015-12-21	2	-0/+12
\| \| \| \| \| \|
* \| \| \| \| \|	fixes after review	Valery Sizov	2015-12-24	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	emoji picker search	Valery Sizov	2015-12-23	2	-0/+18
\|/ / / / /
* \| \| \| \|	add some spinach	Valery Sizov	2015-12-22	2	-0/+12
\| \| \| \| \|
* \| \| \| \|	fix specs	Valery Sizov	2015-12-22	1	-2/+2
\|/ / / /
* \| \| \|	Backport JIRA service	Drew Blessing	2015-12-18	2	-0/+24
\| \|/ / \|/\| \|
* \| \|	Upgrade Poltergeist to 1.8.1. #4131issue_4131	Rubén Dávila	2015-12-17	2	-2/+3
\|/ /
* \|	Fix specfix-milestone-snippet-header	Douwe Maan	2015-12-16	1	-1/+1
\| \|
* \|	Rename .issuable-details to .detail-page (and -header and -description)	Douwe Maan	2015-12-16	2	-3/+3
\| \|
* \|	Merge branch 'master' into fix-milestone-snippet-header	Douwe Maan	2015-12-16	7	-23/+23
\|\ \
\| * \	Merge remote-tracking branch 'origin/feature/update-rubocop'	Dmitriy Zaporozhets	2015-12-16	7	-23/+23
\| \|\ \
\| \| * \|	Fixed Rubocop offenses	Gabriel Mazetto	2015-12-15	7	-23/+23
\| \| \| \|
* \| \| \|	Fix tests	Douwe Maan	2015-12-16	1	-1/+1
\|/ / /
* \| \|	Add spinach test for note polling	Grzegorz Bizon	2015-12-15	3	-1/+17
\| \|/ \|/\| \| \| \| \| \| \|	This also increases capybara timeout to 15 seconds (note polling interval). Capybara will look for new note for this period of time.
* \|	Preserve trailing new lines at the end of file on the online editor	Douglas Barbosa Alexandre	2015-12-14	2	-0/+19
\|/ \| \| \| \|	Because Haml automatically indents the HTML source code, the contents of whitespace-sensitive tags like pre and textarea can get screwed up.