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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Allow link_to_label to take an optional type argrymai/gitlab-ce-3007-fix-mr-label-links	Rémy Coutable	2016-02-04	5	-24/+29
\| \| \| \| \| \|	You can set type: :merge_request to create a link to merge request lists instead of issues list. Accept both Symbol & String as type argument for the link_to_label helper
*	Merge branch 'fuzzy-file-search-menu-shortcut-placement' into 'master'	Dmitriy Zaporozhets	2016-02-04	1	-4/+4
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Puts shortcut key in the right place. Fixes #13192 ![Screen_Shot_2016-02-04_at_11.51.15_AM](/uploads/a10dc24b4a836199351ba98fca266695/Screen_Shot_2016-02-04_at_11.51.15_AM.png) See merge request !2710
\| *	Puts shortcut key in the right place.fuzzy-file-search-menu-shortcut-placement	Jacob Schatz	2016-02-04	1	-4/+4
\| \|
* \|	Merge branch 'feature/jschatz1/issuable-sidebar' into 'master'	Dmitriy Zaporozhets	2016-02-04	18	-115/+463
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement new design for issue and merge request right sidebar Fixes #3981 See merge request !2645
\| * \|	Properly link to the right issue or merge requestfeature/jschatz1/issuable-sidebar	Jacob Schatz	2016-02-04	2	-2/+22
\| \| \|
\| * \|	Resize sidebar on initial page refresh.	Jacob Schatz	2016-02-04	1	-2/+10
\| \| \|
\| * \|	Make size changes based on screen resize.	Jacob Schatz	2016-02-03	2	-0/+37
\| \| \|
\| * \|	Fixes sidebar width.	Jacob Schatz	2016-02-03	2	-4/+11
\| \| \|
\| * \|	Issue sidebar bug fix.	Jacob Schatz	2016-02-03	2	-5/+3
\| \| \| \| \| \| \| \| \| \| \| \|	Thanks @rspeicher.
\| * \|	Fix sidebar replacement for issues & MRs	Jacob Schatz	2016-02-03	1	-1/+1
\| \| \|
\| * \|	Sidebar works after sidebar ajax calls.	Jacob Schatz	2016-02-02	6	-9/+10
\| \| \|
\| * \|	Added correct colors and styles from antetype mockup.	Jacob Schatz	2016-02-02	4	-11/+12
\| \| \|
\| * \|	Add ajax calls to return JSON	Jacob Schatz	2016-01-30	6	-5/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix subtitles on minimize. Fix styles for show.
\| * \|	Add detail to collapsed icons	Jacob Schatz	2016-01-28	4	-3/+44
\| \| \|
\| * \|	Fix icon centering on collapsed view	Jacob Schatz	2016-01-28	1	-7/+6
\| \| \|
\| * \|	Sidebar collapse and expand work with whole page.	Jacob Schatz	2016-01-28	7	-17/+108
\| \| \|
\| * \|	Add icon when collapsed.	Jacob Schatz	2016-01-28	2	-2/+26
\| \| \| \| \| \| \| \| \| \| \| \|	Hide and show icons in collapse and expanded mode.
\| * \|	Add js to expand and contract side menu	Jacob Schatz	2016-01-27	4	-14/+39
\| \| \|
\| * \|	Adds prev/next buttons to top area	Jacob Schatz	2016-01-27	3	-4/+33
\| \| \|
\| * \|	New right side gutter design.	Jacob Schatz	2016-01-27	10	-97/+155
\| \| \| \| \| \| \| \| \| \| \| \|	[WIP]
* \| \|	Merge branch 'fix-test' into 'master'	Dmitriy Zaporozhets	2016-02-04	1	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken tests Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @DouweM See merge request !2708
\| * \| \|	Fix broken tests	Dmitriy Zaporozhets	2016-02-04	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Merge branch 'doc_bug' into 'master'	Drew Blessing	2016-02-04	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix documentation bug / typo Hey, noticed this a little bit ago. Need to get the example matching up with the following explanation. See merge request !2709
\| * \| \| \|	fix documentation bug / typo	Eric L Frederich	2016-02-04	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix/atom-url-issue' into 'master'	Douwe Maan	2016-02-04	6	-4/+93
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix atom url issue on projects This MR adds prevents a project to have a path ending in .atom that conflicts with the feed and Adds a migration to migrate old .atom projects to a different path Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3699 See merge request !2651
\| * \| \| \|	refactored migration based on feedback	James Lopez	2016-02-04	1	-1/+5
\| \| \| \| \|
\| * \| \| \|	refactored migration and spec based on feedback	James Lopez	2016-02-04	2	-8/+14
\| \| \| \| \|
\| * \| \| \|	fixed move project method in migration	James Lopez	2016-02-02	3	-35/+15
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issue	James Lopez	2016-02-02	21	-32/+414
\| \|\ \ \ \
\| * \| \| \| \|	added TODO to not working method	James Lopez	2016-02-01	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issue	James Lopez	2016-02-01	57	-379/+433
\| \|\ \ \ \ \
\| * \| \| \| \| \|	WIP - refactored migration	James Lopez	2016-02-01	2	-7/+43
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	WIP - add migration	James Lopez	2016-01-29	1	-0/+54
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	refactor previous test and add validation to project model	James Lopez	2016-01-29	2	-8/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issue	James Lopez	2016-01-29	258	-1732/+12958
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	WIP - spec failure on .atom project URL	James Lopez	2016-01-22	1	-0/+11
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/rs-database-info'	Dmitriy Zaporozhets	2016-02-04	4	-6/+58
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Display database type and version in Administration dashboardrs-database-info	Robert Speicher	2016-02-02	4	-6/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #12900
* \| \| \| \| \| \| \|	Merge branch 'rs-backport-ldap-2fa' into 'master'	Dmitriy Zaporozhets	2016-02-04	3	-28/+33
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support Two-factor Authentication for LDAP users Closes #12653 See merge request !2688
\| * \| \| \| \| \| \| \|	Support Two-factor Authentication for LDAP usersrs-backport-ldap-2fa	Robert Speicher	2016-02-03	3	-28/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #12653
* \| \| \| \| \| \| \| \|	Merge branch 'remove-newrelic' into 'master'	Dmitriy Zaporozhets	2016-02-04	3	-20/+0
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove newrelic gem. Closes #12860 See merge request !2682
\| * \| \| \| \| \| \| \| \|	Remove newrelic gem. Closes #12860remove-newrelic	Josh Frye	2016-02-03	3	-20/+0
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'better-search-autocomplete'	Dmitriy Zaporozhets	2016-02-04	2	-2/+3
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	In search autocomplete show only groups and projects you are member ofbetter-search-autocomplete	Dmitriy Zaporozhets	2016-02-04	2	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For big instances search autocomplet is flooded with groups you have no access to and insternal/public projects you don't care. It affects way how easily you can go to group/project you are actually member of Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'disable-remove-source-branch' into 'master'	Douwe Maan	2016-02-04	3	-2/+10
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide remove source branch button when new commit is added to branch Fixes #3339 This MR hides the 'Remove source branch' button when a new commit is added to the source branch /cc @DouweM See merge request !2701
\| * \| \| \| \| \| \| \| \| \| \|	Hide remove source branch button when new commit is added to branch	Zeger-Jan van de Weg	2016-02-04	3	-2/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #3339 This MR hides the 'Remove source branch' button when a new commit is added to the source branch
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'new-issue-projects-sort' into 'master'	Dmitriy Zaporozhets	2016-02-04	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sort projects by last activity for new issue dropdown When creating new issue from dashboard page I want to see projects sorted by last activity instead of ID Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !2702
\| * \| \| \| \| \| \| \| \| \| \|	Sort projects by last activity for new issue dropdownnew-issue-projects-sort	Dmitriy Zaporozhets	2016-02-04	1	-1/+1
\|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When creating new issue from dashboard page I want to see projects sorted by last activity instead of ID Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'rs-whitelist-in-pipeline' into 'master'	Douwe Maan	2016-02-04	4	-31/+50
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make Pipelines responsible for defining their custom whitelist This allows for future pipelines to more easily define a custom whitelist. See merge request !2693
\| * \| \| \| \| \| \| \| \| \| \|	Make Pipelines responsible for defining their custom whitelistrs-whitelist-in-pipeline	Robert Speicher	2016-02-03	4	-31/+50
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows for future pipelines to more easily define a custom whitelist.