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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Show public RSS feeds to anonymous users	Michael Kozono	2017-02-28	18	-62/+44
\|
*	Merge branch '26348-group-members-rearrange' into 'master'	Dmitriy Zaporozhets	2017-02-28	4	-8/+7
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Move `Group -> Members` to top-level, fix missing sub-nav for Subgroups Closes #28678 See merge request !9589
\| *	Move `Group -> Members` to top-level, fix missing sub-nav for Subgroups	Kushal Pandya	2017-02-28	4	-8/+7
\| \|
* \|	Merge branch '27934-left-align-logo' into 'master'	Dmitriy Zaporozhets	2017-02-28	1	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Left align logo; increase max width of title Closes #27934 See merge request !9588
\| * \|	Left align logo; increase max width of title27934-left-align-logo	Annabel Dunstone Gray	2017-02-28	1	-2/+2
\| \|/
* \|	Merge branch 'issue-tags-layout' into 'master'	Annabel Dunstone Gray	2017-02-28	1	-1/+1
\|\ \ \| \|/ \|/\| \| \| \| \|	Fix 'New Tag' layout on Tags page See merge request !9176
\| *	Fix 'New Tag' layout on Tags page	Robert Marcano	2017-02-13	1	-1/+1
\| \|
* \|	Merge branch '27354-navigation-new-button' into 'master'	Dmitriy Zaporozhets	2017-02-28	1	-0/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Put back the new project button Closes #27354 See merge request !9426
\| * \|	Put back the new project button27354-navigation-new-button	Annabel Dunstone Gray	2017-02-22	1	-0/+4
\| \| \|
* \| \|	Fix CSS classes	Alex Sanford	2017-02-27	1	-3/+6
\| \| \|
* \| \|	Merge branch '27840-improve-search-bar-experience' into 'master'	Annabel Dunstone Gray	2017-02-27	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix #27840 - Improve the search bar experience on mobile Closes #27840 See merge request !9280
\| * \| \|	Fix #27840 - Improve the search bar experience on mobile	Pratik Borsadiya	2017-02-24	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'rss-btn-alignment-fix' into 'master'	Annabel Dunstone Gray	2017-02-27	3	-3/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed alignment of RSS button on activity pages Closes #28572 See merge request !9478
\| * \| \| \|	Fixed alignment of RSS button on activity pagesrss-btn-alignment-fix	Phil Hughes	2017-02-23	3	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added a tooltip to the buttons that did not have any Closes #28572
* \| \| \| \|	Merge branch 'ci-tables-ui-improvements' into 'master'	Annabel Dunstone Gray	2017-02-27	1	-92/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pipelines tables UI improvements Closes #28383, #26611, #21788, #27048, and #27828 See merge request !9442
\| * \ \ \ \	Merge branch 'master' into ci-tables-ui-improvementsci-tables-ui-improvements	Filipa Lacerda	2017-02-27	21	-36/+61
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (196 commits) Add quotes to coverage pattern Update CHANGELOG.md Bump omniauth to 1.4.2 Bump Hashie to 3.5.5 to eliminate warning noise use single backticks for inline code Add performance query regression fix for !9088 affecting #27267 Fix spec API: Return 400 for all validation erros in the mebers API Adds confirmation for cancel button Add newline Corrected indentation on the template string Adds backoff algo from EE to CE We don't need these checks anymore Raise error when no content is provided Address review Update API v3 in line with v4 Fix new offenses Fix spec Fix specs Rename commit_file, commit_dir and remove_file and update specs ...
\| * \ \ \ \ \	Merge branch 'master' into ci-tables-ui-improvements	Filipa Lacerda	2017-02-23	21	-413/+382
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (129 commits) Code style improvements remove require.context from network_bundle remove require.context from graphs_bundle remove require.context from filtered_search_bundle Ignore two Rails CVEs in bundler:audit job Remove Pages readme Change Pages redirect Add missing index.md to Pages docs Added double newline after file upload markdown insert Reorder main index items in Pages overview remove html comments remove <> wrapping text - part 3 wrapping text - part 2 [ci skip] fix link wrap text - part 1 - [ci skip] typo fix spelling, add intermediate cert link Improve `Gitlab::EeCompatCheck` by using the `git apply --3way` flag remove link to unfinished video ...
\| * \| \| \| \| \| \|	Remove unused file	Filipa Lacerda	2017-02-22	1	-92/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Add runner version to /admin/runners view	Jonathon Reinhart	2017-02-26	2	-0/+3
\| \|_\|/ / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'user-callouts' into 'master'	Filipa Lacerda	2017-02-24	3	-0/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added user-callouts Closes #27269 See merge request !9249
\| * \| \| \| \| \| \|	Modified the user_callout behaviour	Jose Ivan Vargas	2017-02-23	3	-17/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now it appends a template instead of relying in a partial to show it.
\| * \| \| \| \| \| \|	Removed disabled rules from the user_callout_spec.js	Jose Ivan Vargas	2017-02-23	2	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also changed the cookie sets to true and false values to make it consistent with the rest of the javascript. Fixed some haml and a missing new line
\| * \| \| \| \| \| \|	Moved the dismiss-icon listener to close the callout to a button	Jose Ivan Vargas	2017-02-23	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Changed the javascript class from using the global scope to exporting it via ↵	Jose Ivan Vargas	2017-02-23	3	-9/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	webpack Also improved accesibility and change the id from user_callouts to a class
\| * \| \| \| \| \| \|	Added CHANGELOG and corrected linter errors	Jose Ivan Vargas	2017-02-23	2	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Created unit tests, fixtures and integration tests	Jose Ivan Vargas	2017-02-23	5	-26/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also changed the user_callout haml to a partial and added the corresponding SVG icon
\| * \| \| \| \| \| \|	Initial version of the user-callouts	Jose Ivan Vargas	2017-02-23	2	-2/+30
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'remove-jquery-ui-plugins' into 'master'	Jacob Schatz	2017-02-24	3	-5/+11
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed jQuery UI highlight & autocomplete See merge request !8420
\| * \| \| \| \| \| \|	Removed jQuery UI highlight & autocompleteremove-jquery-ui-plugins	Phil Hughes	2017-02-09	3	-5/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In an effort to tackle #18437 this removes 2 of the jQuery UI plugins. Highlight & autocomplete, both used once in our code. Highlight was just removed easily, autocomplete was replaced with GL dropdown
* \| \| \| \| \| \| \|	Merge branch '28366-renamed-file-tooltip-contains-html' into 'master'	Filipa Lacerda	2017-02-24	1	-2/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Renamed file tooltip contains html" Closes #28366 See merge request !9374
\| * \| \| \| \| \| \| \|	Remove markup showing in tooltip for renamed files in diff view28366-renamed-file-tooltip-contains-html	Sam Rose	2017-02-20	1	-2/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'boards-card-template-to-js' into 'master'	Filipa Lacerda	2017-02-24	2	-11/+0
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issue boards card template in JS See merge request !9477
\| * \| \| \| \| \| \| \| \|	Issue boards card in JS	Phil Hughes	2017-02-23	2	-11/+0
\| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moved the issue boards card template into the JS. This helps to improve the code coverage & will eventually make it easier to move this to .vue files
* \| \| \| \| \| \| \| \|	Merge branch '28367-fix-unfold-diff-line-number-copy-paste' into 'master'	Jacob Schatz	2017-02-24	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixes line number copy issue for unfolded parallel view diff Closes #28367 See merge request !9365
\| * \| \| \| \| \| \| \| \|	fixes line number copy issue for unfolded parallel view diff28367-fix-unfold-diff-line-number-copy-paste	Nur Rony	2017-02-20	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '12726-preserve-issues-after-deleting-users' into 'master'	Douwe Maan	2017-02-24	3	-3/+9
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Deleting a user shouldn't delete associated issues. Closes #12726 See merge request !7393
\| * \| \| \| \| \| \| \| \| \|	Don't allow deleting a ghost user.	Timothy Andrew	2017-02-24	3	-3/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Add a `destroy_user` ability. This didn't exist before, and was implicit in other abilities (only admins could access the admin area, so only they could destroy all users; a user can only access their own account page, and so can destroy only themselves). - Grant this ability to admins, and when the current user is trying to destroy themselves. Disallow destroying ghost users in all cases. - Modify the `Users::DestroyService` to check this ability. Also check it in views to decide whether or not to show the "Delete User" button. - Add a short summary of the Ghost User to the bio.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'dm-more-namespace-full-path' into 'master'	Sean McGivern	2017-02-24	4	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use Namespace#full_path instead of #path where appropriate See merge request !9495
\| * \| \| \| \| \| \| \| \| \|	Use Namespace#full_path instead of #path where appropriatedm-more-namespace-full-path	Douwe Maan	2017-02-23	4	-4/+4
\| \| \|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2017-02-24	38	-490/+485
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	27762-add-default-artifacts-expiration * upstream/master: (247 commits) Switched CONTRIBUTING.md style guide recommendation for method chaining Fix new offenses Stylistic tweaks Fix OAuth/SAML user blocking behavior Revert "Enable Style/DotPosition" Revert "Prefer leading style for Style/DotPosition" Revert "Enable Style/BarePercentLiterals" Manually correct autocorrect Move up delegate calls Exclude migrations from Style/MutableConstant ActiveSupport delegation is preferred over Forwardable Update haml_lint to work with newest rubocop Add explanations to cops Update rubocop and rubocop-rspec and regenerate .rubocop_todo.yml Update rubocop and rubocop-rspec and regenerate .rubocop_todo.yml Order cops alphabetically Don’t exclude some file in lib from rubocop Fix new offenses Enable Rails/Delegate Enable Style/WordArray ...
\| * \| \| \| \| \| \| \| \|	Merge branch 'master' into 'master'	Clement Ho	2017-02-23	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	on branch deletion show loading icon and disabled the button See merge request !6761
\| \| * \| \| \| \| \| \| \| \|	on branch deletion show loading icon and disabled the button	wendy0402	2017-02-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	after user click delete branch, there is no processing indication, and user can click many times till. It seems flaw in UX. this will fix it fix bug in branch deletion link
\| * \| \| \| \| \| \| \| \| \|	Enable Rails/Delegate	Douwe Maan	2017-02-23	1	-1/+1
\| \| \|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'master' into 26900-pipelines-tabs26900-pipelines-tabs	Filipa Lacerda	2017-02-23	54	-540/+498
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (361 commits) Code style improvements remove require.context from network_bundle remove require.context from graphs_bundle remove require.context from filtered_search_bundle Ignore two Rails CVEs in bundler:audit job Remove Pages readme Change Pages redirect Add missing index.md to Pages docs Added double newline after file upload markdown insert Reorder main index items in Pages overview remove html comments remove <> wrapping text - part 3 wrapping text - part 2 [ci skip] fix link wrap text - part 1 - [ci skip] typo fix spelling, add intermediate cert link Improve `Gitlab::EeCompatCheck` by using the `git apply --3way` flag remove link to unfinished video ...
\| \| * \| \| \| \| \| \| \|	Code style improvements	Alfredo Sumaran	2017-02-23	9	-19/+47
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch 'revert-2cf17c42' into 'master'	Alfredo Sumaran	2017-02-22	3	-60/+59
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch '27934-left-align-nav' into 'master'" See merge request !9423
\| \| \| * \| \| \| \| \| \| \|	Revert "Merge branch '27934-left-align-nav' into 'master'"revert-2cf17c42	Annabel Dunstone Gray	2017-02-21	3	-60/+59
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !9338
\| \| * \| \| \| \| \| \| \| \|	Merge branch 'feature/brand-logo-in-emails' into 'master'	Sean McGivern	2017-02-22	6	-333/+262
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Custom brand header logo in emails Closes #24969 and #25570 See merge request !9049
\| \| \| * \| \| \| \| \| \| \|	use custom brand logo in pipeline mails	Alexis Reigel	2017-02-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \|	extract pipeline mails layout	Alexis Reigel	2017-02-22	6	-333/+262
\| \| \| \| \| \| \| \| \| \| \|