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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Approvals are not reset after a new push is made if the request is coming ↵	Valery Sizov	2015-12-30	1	-4/+4
\| \| \| \|	from a fork
*	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into ce_upstream	Valery Sizov	2015-12-29	1	-0/+1
\|\
\| *	Doesn't accept null value for max file size on Git hooks	Douglas Barbosa Alexandre	2015-12-28	1	-0/+1
\| \|
* \|	Merge remote-tracking branch 'origin/master' into ce_upstream	Valery Sizov	2015-12-25	21	-58/+551
\|\ \ \| \|/ \|/\|
\| *	Merge branch 'revert_votes_back' into 'master'	Dmitriy Zaporozhets	2015-12-25	2	-3/+15
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| *	satisfy rubocoprevert_votes_back	Valery Sizov	2015-12-25	1	-1/+1
\| \| \|
\| \| *	add sorting of awards	Valery Sizov	2015-12-25	1	-0/+7
\| \| \|
\| \| *	revert back vote buttons to issue and MR pages	Valery Sizov	2015-12-25	1	-3/+8
\| \| \|
\| * \|	Merge branch 'rs-opengraph' into 'master'	Douwe Maan	2015-12-25	2	-0/+147
\| \|\ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Add Open Graph meta tags See merge request !2192
\| \| *	Satisfy Rubocop	Douwe Maan	2015-12-25	1	-2/+2
\| \| \|
\| \| *	Add support for `twitter:label` meta tagsrs-opengraph	Robert Speicher	2015-12-24	2	-0/+47
\| \| \|
\| \| *	Truncate page_description to 30 words	Robert Speicher	2015-12-24	1	-0/+13
\| \| \|
\| \| *	Account for `@project.description` being nil	Robert Speicher	2015-12-23	1	-0/+8
\| \| \|
\| \| *	Add page descriptions and images	Robert Speicher	2015-12-23	1	-0/+79
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A limited number of pages have defined their own descriptions, but otherwise we default to the Project's description (if `@project` is set), or the old `brand_title` fallback. The image will either be the uploaded project icon (never a generated one), the user's uploaded icon or Gravatar, or, finally, the GitLab logo.
\| * \|	Merge branch 'support-api-lookup-by-username' into 'master'	Dmitriy Zaporozhets	2015-12-25	1	-0/+7
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add API support for looking up a user by username Needed to support Huboard See merge request !2089
\| \| * \|	Add API support for looking up a user by username	Stan Hu	2015-12-24	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Needed to support Huboard
\| * \| \|	specs for forced two-factor authentication and grace period	Gabriel Mazetto	2015-12-24	1	-0/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	simplified code and fixed stuffs
\| * \| \|	WIP require two factor authentication	Gabriel Mazetto	2015-12-24	1	-0/+1
\| \| \| \|
\| * \| \|	Merge branch 'ldap-special-chars-fix' into 'master'	Douwe Maan	2015-12-24	1	-0/+15
\| \|\ \ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix identity and user retrieval when special characters are used Fixes #4023 I also added tests to make sure the user with special characters in his name is returned correctly. @rspeicher this probably should be added to 8.3 as a patch. See merge request !2176
\| \| * \|	Fix identity and user retrieval when special characters are used	Patricio Cano	2015-12-22	1	-0/+15
\| \| \| \|
\| * \| \|	Fix NewBranchForm spec	Douwe Maan	2015-12-24	1	-1/+1
\| \| \| \|
\| * \| \|	Merge branch 'fix-milestones-with-slashes' into 'master'	Dmitriy Zaporozhets	2015-12-24	1	-0/+10
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Error 500 when global milestones have slashes * Closes #4226 * Closes https://github.com/gitlabhq/gitlabhq/issues/9921 See merge request !2182
\| \| * \| \|	Fix Error 500 when global milestones have slashes	Stan Hu	2015-12-22	1	-0/+10
\| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	Closes #4226
\| * \| \|	Merge branch 'edit-on-fork' into 'master'	Dmitriy Zaporozhets	2015-12-24	1	-4/+4
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 specs	Douwe Maan	2015-12-18	1	-2/+2
\| \| \| \| \|
\| \| * \| \|	Automatically fork a project when not allowed to edit a file.	Douwe Maan	2015-12-18	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Merge branch 'fix/visibility-level-setting-in-forked-projects' into 'master'	Douwe Maan	2015-12-24	2	-0/+63
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix/visibility level setting in forked projects Fixes #3136 /cc @DouweM See merge request !1744
\| \| * \| \| \|	Add some specs for forked project visibility_level cases	Tomasz Maczukin	2015-12-24	2	-0/+63
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'branch-invalid-name' into 'master'	Douwe Maan	2015-12-24	3	-1/+165
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add JS validation for invalid characters in branch name Fixes #3293 Demo: ![out-1080p](/uploads/ba21c359b6b8b440c40cacf772ec0df7/out-1080p.gif) See merge request !2122
\| \| * \| \| \| \|	Add helper methods to JS validation spec for invalid branch namesbranch-invalid-name	Douglas Barbosa Alexandre	2015-12-22	1	-87/+92
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Fix minor stylistic complaints	Douglas Barbosa Alexandre	2015-12-21	1	-34/+34
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Fix spec	Douglas Barbosa Alexandre	2015-12-18	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'master' into branch-invalid-name	Douglas Barbosa Alexandre	2015-12-18	2	-4/+23
\| \| \|\ \ \ \ \ \| \| \| \| \|/ / / \| \| \| \|/\| \| \|
\| \| * \| \| \| \|	Add specs for JS validation for invalid characters in branch name	Douglas Barbosa Alexandre	2015-12-17	2	-0/+159
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'emoji-picker-fix' into 'master'	Valery Sizov	2015-12-24	1	-2/+2
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Emoji picker: better alias handling related to https://gitlab.com/gitlab-org/gitlab-ce/issues/3576 See merge request !2198
\| \| * \| \| \| \|	fix specemoji-picker-fix	Valery Sizov	2015-12-24	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'add-project-permissions' into 'master'	Dmitriy Zaporozhets	2015-12-23	1	-0/+13
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add project permissions to all project API endpoints This standardizes all the project API formats. Also needed to support Huboard. See merge request !2090
\| \| * \| \| \| \| \|	Add project permissions to all project API endpoints	Stan Hu	2015-12-22	1	-0/+13
\| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This standardizes all the project API formats. Also needed to support Huboard.
\| * \| \| \| \| \|	Merge branch 'fix/ci-runners-token-persistence' into 'master'	Grzegorz Bizon	2015-12-23	3	-8/+18
\| \|\ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix method that ensures authentication token Until now, `ensure_#{token_filed_name}!` method didn't persist new token in database. This closes #4235. See merge request !2185
\| \| * \| \| \| \|	Use method that creates runners registration token	Grzegorz Bizon	2015-12-23	2	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`runners_registration_token` now creates a new token if it is blank.
\| \| * \| \| \| \|	Add method that persist ensured token in `TokenAuthenticatable`	Grzegorz Bizon	2015-12-23	1	-6/+13
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Fix method that ensures authentication token	Grzegorz Bizon	2015-12-23	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Until now, `ensure_#{token_filed_name}` method didn't persist new token in database. This closes #4235.
\| * \| \| \| \| \|	Merge branch 'improve_emoji_picker' into 'master'	Dmitriy Zaporozhets	2015-12-23	1	-12/+0
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve emoji picker This request uses an emoji image sprite to show big set of emojis. The sprite has been made based one gemojione gem images. The categories are retrieved from https://github.com/jonathanwiesel/gemojione/blob/master/config/index.json as well. Some categories are pretty poor, it can be extended in the future. It's a first step on the way to improve picker. The first implementation was using https://github.com/iamcal/emoji-data project, but there was huge incompatibility with gemojione emojis set and I had to drop that solution. ![Screenshot_2015-12-22_23.26.27](/uploads/7d323eb0586204ac92915b41233b97ec/Screenshot_2015-12-22_23.26.27.png) See merge request !2172
\| \| * \| \| \| \| \|	fix specs	Valery Sizov	2015-12-22	1	-6/+0
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	base implementation of emoji picker [ci skip]	Valery Sizov	2015-12-22	1	-6/+0
\| \| \|/ / / / /
\| * \| \| \| \| \|	Merge branch 'fix/ci-lint' into 'master'	Grzegorz Bizon	2015-12-23	2	-28/+39
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make CI Lint form synchronous This removes `remote: true` from CI Lint form, making it synchronous form. This also removes some complexity related to displaying lint messages. View also has been updated, removed deprecated Bootstrap 2 tags. Improved design. See merge request !2171
\| \| * \| \| \| \|	Make CI Lint form synchronousfix/ci-lint	Grzegorz Bizon	2015-12-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This removes `remote: true` from CI Lint form, making it synchronous form. This also removes some complexity related to displaying lint messages. View also has been updated, removed deprecated Bootstrap 2 tags. Improved design. Closes #4206
\| \| * \| \| \| \|	Rename CI lint specs file	Grzegorz Bizon	2015-12-22	1	-0/+0
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Improve CI Lint specs (refactoring)	Grzegorz Bizon	2015-12-22	1	-18/+29
\| \| \|/ / / /
* \| \| \| \| \|	Merge branch 'feature/import_kerberos_identities_ad' of ↵	Dmitriy Zaporozhets	2015-12-25	5	-15/+202
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/cernvcs/gitlab-ee into ee-master