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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'fix-explore-filter' into 'master'	Dmitriy Zaporozhets	2016-02-10	7	-21/+15
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Add ajax filtering to all paged project lists. Fixes #13182 See merge request !2728
\| *	Cleanup to use one selectorfix-explore-filter	Josh Frye	2016-02-09	4	-4/+4
\| \|
\| *	MR feedback	Josh Frye	2016-02-09	1	-1/+1
\| \|
\| *	Extract events rendering to own action.	Josh Frye	2016-02-09	2	-2/+2
\| \|
\| *	Starred, All, and Trending on explore are paged also group projects. Need ↵	Josh Frye	2016-02-09	2	-8/+10
\| \| \| \| \| \| \| \|	ajax filter.
\| *	Fix explore filter. Fixes #13182	Josh Frye	2016-02-09	1	-8/+0
\| \|
* \|	Ensure link for README blobs includes the full pathrs-issue-13254	Robert Speicher	2016-02-09	1	-1/+1
\| \| \| \| \| \| \| \|	Closes #13254
* \|	Merge branch 'variables-build-log' into 'master'	Robert Speicher	2016-02-09	1	-1/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add notice about variables in build log Related to: https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1942 [ci skip] See merge request !2761
\| * \|	Add information about expose of build variables.variables-build-log	Kamil Trzcinski	2016-02-09	1	-1/+3
\| \| \|
* \| \|	Merge branch 'fix-logo-rasterization' into 'master'	Robert Speicher	2016-02-09	1	-20/+8
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent rasterization artifacts in the logo, and simplify markup. - Remove sketch-namespaced attributes. - Remove unused groups, and cancel out unnecessary transforms. - Use overlap to avoid rasterization artifacts in the logo. - Remove viewBox parameter and define paths in their final form. See merge request !2741
\| * \| \|	Prevent rasterization artefacts in the logo, and simplify markup.	Aaron Hamilton	2016-02-08	1	-20/+8
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Remove sketch-namespaced attributes. - Remove unused groups, and cancel out unnecessary transforms. - Use overlap to avoid rasterization artefacts in the logo. - Extend comment for `#logo` click event handler, as it's a non-obvious hack for Safari. - Remove viewBox parameter and define paths in their final form.
* \| \|	Merge remote-tracking branch 'dev/master' into 'master'	Robert Speicher	2016-02-09	6	-12/+19
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Merge branch 'ci-permissions' into 'master'	Robert Speicher	2016-02-08	6	-12/+19
\| \|\ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Limit guest access to builds Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2646 See merge request !1942
\| \| *	Remove current_user && when can? is used	Kamil Trzcinski	2016-02-05	2	-2/+2
\| \| \|
\| \| *	Merge branch 'master' into ci-permissions	Kamil Trzcinski	2016-02-05	35	-240/+287
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| \| * \	Merge remote-tracking branch 'origin/master' into ci-permissions	Kamil Trzcinski	2016-02-04	31	-176/+268
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/views/projects/builds/index.html.haml
\| \| * \| \|	Rename allow_guest_to_access_builds to public_builds	Kamil Trzcinski	2016-02-04	1	-4/+4
\| \| \| \| \|
\| \| * \| \|	Properly handle commit status permissions (for a build)	Kamil Trzcinski	2016-02-03	1	-4/+4
\| \| \| \| \|
\| \| * \| \|	Fix build errors	Kamil Trzcinski	2016-02-03	1	-1/+5
\| \| \| \| \|
\| \| * \| \|	Add CI setting: allow_guest_to_access_builds	Kamil Trzcinski	2016-02-02	1	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add the `read_build` ability if user is anonymous or guest and allow_guest_to_access_builds is enabled.
\| \| * \| \|	Make the CI permission model simpler	Kamil Trzcinski	2016-02-02	5	-11/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This MR simplifies CI permission model: - read_build: allows to read a list of builds, artifacts and trace - update_build: allows to cancel and retry builds - create_build: allows to create builds from gitlab-ci.yml (not yet implemented) - admin_build: allows to manage triggers, runners and variables - read_commit_status: allows to read a list of commit statuses (including the overall of builds) - create_commit_status: allows to create a new commit status using API Remove all extra methods to manage permission. Made all controllers to use explicitly the new permissions.
* \| \| \| \|	Merge branch ↵	Douwe Maan	2016-02-09	4	-0/+19
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'huacnlee/gitlab-ce-feature/option-to-include-author-info-in-mail' into 'master' Add option to include the sender name in body of Notify email _Originally opened at !2495 by @huacnlee._ - - - Fixes #7824. See merge request !2767
\| * \| \| \| \|	Add option to include the sender name in body of Notify email. fix #7824huacnlee/gitlab-ce-feature/option-to-include-author-info-in-mail	Jason Lee	2016-02-09	4	-0/+19
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'add-tooltip-to-stuck-builds' into 'master'	Douwe Maan	2016-02-09	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a tooltip to the stuck warning build symbol We want to give people an idea of what is wrong with their build, we do this by adding a tooltip telling them where they can find more information about their broken builds. Fixes #10919 See merge request !2680
\| * \| \| \| \|	Add a tooltip to the stuck warning build symbol	Jeroen van Baarsen	2016-02-08	1	-1/+1
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We want to give people an idea of what is wrong with their build, we do this by adding a tooltip telling them where they can find more information about their broken builds. Fixes #10919 Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* \| \| \| \|	Merge branch 'rs-broadcast-markdown' into 'master'	Douwe Maan	2016-02-09	2	-2/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow limited Markdown in Broadcast Messages Closes #11853 See merge request !2695
\| * \| \| \| \|	Allow limited Markdown in Broadcast Messagesrs-broadcast-markdown	Robert Speicher	2016-02-06	2	-2/+6
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #11853
* \| \| \| \|	Merge branch 'increase_import_timeout' into 'master'	Douwe Maan	2016-02-09	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Increase project import timeout from 4 minutes to 15 minutes Many users were experiencing timeouts when we only allowed 4 minutes before a timeout. A 15 minute timeout is more than reasonable and prevents us from having to add a configuration for this. Fixes gitlab-org/gitlab-ee#246 ## Import screenshot ![Screen_Shot_2016-02-04_at_1.45.20_PM](/uploads/d9d71ec953afae31e6fbe54a8932b945/Screen_Shot_2016-02-04_at_1.45.20_PM.png) See merge request !2717
\| * \| \| \| \|	Increase project import timeout from 4 minutes to 15 minutes	Drew Blessing	2016-02-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Many users were experiencing timeouts when we only allowed 4 minutes before a timeout. A 15 minute timeout is more than reasonable and prevents us from having to add a configuration for this. Fixes gitlab-org/gitlab-ee#246
* \| \| \| \| \|	Merge branch 'snippet_search_refactoring'	Valery Sizov	2016-02-09	1	-20/+24
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Faster snippet search	Valery Sizov	2016-02-05	1	-20/+24
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'feature/jschatz1/sidebar-features' into 'master'	Dmitriy Zaporozhets	2016-02-05	1	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feature/jschatz1/sidebar features * Changes sidebar width (290px). * Makes shortcuts for <kbd>j</kbd> and <kbd>k</kbd> keys for next and previous issues. ![Screen_Shot_2016-02-05_at_3.06.22_PM](/uploads/8590be43dc1b9feffd4f32b4e8cb7790/Screen_Shot_2016-02-05_at_3.06.22_PM.png) cc/ @dzaporozhets See merge request !2734
\| * \| \| \| \| \|	Add `j` and `k` shortcuts	Jacob Schatz	2016-02-05	1	-2/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'rrott/gitlab-ce-logo-issue-11867' into 'master'	Robert Speicher	2016-02-05	2	-2/+4
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes for issue with poor logo transition animation on Safari See merge request !2690
\| * \| \| \| \| \|	fixed issue with poor logo transition animation on safari	Roman Rott	2016-02-05	2	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	updates after code review: moved coffee code to appropriate file, updated css to not use js-prefixed selectors Updated comments and Changelog Removed duplicate line in changelog
* \| \| \| \| \| \|	Improve placeholder: search -> Search	Dmitriy Zaporozhets	2016-02-05	1	-1/+1
\| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Edited time ago location change.	Jacob Schatz	2016-02-05	3	-10/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change edited icon to word. Change edited text color to gray cc/ @creamzy
* \| \| \| \| \|	Merge branch 'fix-double-page' into 'master'	Dmitriy Zaporozhets	2016-02-05	2	-2/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix double paging ![Screen_Shot_2016-02-05_at_10.27.34_AM](/uploads/a21ad6c47ddecad29d377497ee2a167d/Screen_Shot_2016-02-05_at_10.27.34_AM.png) ![Screen_Shot_2016-02-05_at_10.27.44_AM](/uploads/3badb423df25f009886138c65cfe8347/Screen_Shot_2016-02-05_at_10.27.44_AM.png) See merge request !2727
\| * \| \| \| \| \|	Fix double paging	Josh Frye	2016-02-05	2	-2/+0
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'improve-broadcast-messages' into 'master'	Dmitriy Zaporozhets	2016-02-05	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve admin broadcast messages page * Show latest broadcast messages first on admin page * Use nice looking pagination Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes #13211 cc @rspeicher @DouweM See merge request !2725
\| * \| \| \| \|	Improve admin broadcast messages page	Dmitriy Zaporozhets	2016-02-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Show latest broadcast messages first on admin page * Use nice looking pagination Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Merge branch 'paginate-dashboard-projects' into 'master'	Dmitriy Zaporozhets	2016-02-05	6	-16/+24
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Page project list on dashboard See merge request !2689
\| * \| \| \| \|	Fix project filter form rendering	Dmitriy Zaporozhets	2016-02-05	1	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Implement changes from MR feedback	Josh Frye	2016-02-04	4	-10/+10
\| \| \| \| \| \|
\| * \| \| \| \|	Various filter fixes	Josh Frye	2016-02-04	7	-16/+18
\| \| \| \| \| \|
\| * \| \| \| \|	Delay filter until user stops typing	Josh Frye	2016-02-04	2	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Paginate + ajax filter dashboard projects	Josh Frye	2016-02-04	6	-26/+32
\| \| \| \| \| \|
* \| \| \| \| \|	Remove project-issuable-filter from admin builds page :)improve-nav-controls	Dmitriy Zaporozhets	2016-02-05	1	-7/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Re-use top-are css component for issues/mr pages	Dmitriy Zaporozhets	2016-02-05	9	-80/+75
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Merge branch 'list-padding' into 'master'	Dmitriy Zaporozhets	2016-02-05	3	-5/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	New padding for lists * improve consistency for list padding * reduce padding for project/group/events lists Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes #12511 cc @jschatz1 @skyruler @creamzy See merge request !2715