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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Allow limited Markdown in Broadcast Messagesrs-broadcast-markdown	Robert Speicher	2016-02-06	1	-1/+5
\| \| \| \|	Closes #11853
*	Merge branch 'bug/jschatz1/sidebar-issues' into 'master'	Dmitriy Zaporozhets	2016-02-05	1	-2/+4
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix diff and commit view on merge requests with new sidebar Fixes #3981 See merge request !2718
\| *	Fix diff and commit view on merge requestsbug/jschatz1/sidebar-issues	Jacob Schatz	2016-02-04	1	-2/+4
\| \| \| \| \| \| \| \| \| \|	with new sidebar Fixes #3981
* \|	Merge branch 'rymai/gitlab-ce-3007-fix-mr-label-links' into 'master'	Rémy Coutable	2016-02-05	1	-3/+10
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix label links for a merge request pointing to issues list _Originally opened at !2150._ --- I have added a type parameter to the `link_to_label` helper method that is set to `'merge_request'` when in the context of a merge request. I have also improved the specs to actually test the output of the method instead of its implementation. Fixes #3007. See merge request !2700
\| * \|	Allow link_to_label to take an optional type argrymai/gitlab-ce-3007-fix-mr-label-links	Rémy Coutable	2016-02-04	1	-3/+10
\| \|/ \| \| \| \| \| \| \| \| \| \|	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 'search-on-groups-is-ugly' into 'master'	Dmitriy Zaporozhets	2016-02-04	1	-12/+0
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change placeholder text to just 'search' Fixes #13168 ![Screen_Shot_2016-02-04_at_12.30.16_PM](/uploads/ca3c5549abeedce99d693606135d7428/Screen_Shot_2016-02-04_at_12.30.16_PM.png) See merge request !2711
\| *	Change placeholder text to just 'search'search-on-groups-is-ugly	Jacob Schatz	2016-02-04	1	-12/+0
\| \|
* \|	Merge branch 'feature/jschatz1/issuable-sidebar' into 'master'	Dmitriy Zaporozhets	2016-02-04	3	-0/+99
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+20
\| \|
\| *	Add detail to collapsed icons	Jacob Schatz	2016-01-28	1	-0/+6
\| \|
\| *	Sidebar collapse and expand work with whole page.	Jacob Schatz	2016-01-28	2	-5/+42
\| \|
\| *	Add js to expand and contract side menu	Jacob Schatz	2016-01-27	1	-3/+3
\| \|
\| *	New right side gutter design.	Jacob Schatz	2016-01-27	2	-0/+36
\| \| \| \| \| \| \| \|	[WIP]
* \|	In search autocomplete show only groups and projects you are member ofbetter-search-autocomplete	Dmitriy Zaporozhets	2016-02-04	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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>
* \|	Satisfy rubocop	Dmitriy Zaporozhets	2016-02-04	1	-1/+2
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Sort projects by last activity for project switcher in headersort-projects-dropdown	Dmitriy Zaporozhets	2016-02-03	1	-1/+4
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Add sort dropdown to dashboard projects pagedashboard-sort-dropdown	Dmitriy Zaporozhets	2016-02-03	1	-1/+12
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Merge branch 'support-akismet' into 'master'	Robert Speicher	2016-02-03	1	-0/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support Akismet spam checking for creation of issues via API Currently any spam detected by Akismet for non-members via API will be logged in a separate table in the admin page. Closes #5612 See merge request !2266
\| * \|	Hide the link for spam logs if the Askimet is disabled	Douglas Barbosa Alexandre	2016-02-02	1	-0/+4
\| \| \|
* \| \|	Merge branch 'title-projects-dropdown' into 'master'	Jacob Schatz	2016-02-02	1	-4/+9
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added dropdown to list all projects on project header Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4212 When clicking the current project name, it shows a dropdown menu with a list of all projects for that group or user. When closed: ![Screen_Shot_2016-01-14_at_19.17.44](/uploads/a7258ba388dba238fc2f0468711fc729/Screen_Shot_2016-01-14_at_19.17.44.png) When open: ![Screen_Shot_2016-01-14_at_19.17.51](/uploads/716533d9eb44b123c5fdff36a4740489/Screen_Shot_2016-01-14_at_19.17.51.png) cc. @jschatz1 See merge request !2438
\| * \|	rubocop fixes	Phil Hughes	2016-01-30	1	-3/+2
\| \| \|
\| * \|	removed un-used variable	Phil Hughes	2016-01-30	1	-2/+0
\| \| \|
\| * \|	fixes issue when user is not logged in but viewing public project	Phil Hughes	2016-01-30	1	-4/+6
\| \| \|
\| * \|	uses AJAX to select the projects	Phil Hughes	2016-01-30	1	-16/+4
\| \| \|
\| * \|	pulls in all user projects	Phil Hughes	2016-01-30	1	-8/+5
\| \| \|
\| * \|	Added dropdown to list all projects on project header	Phil Hughes	2016-01-30	1	-4/+25
\| \| \| \| \| \| \| \| \| \| \| \|	When clicking the current project name, it shows a dropdown menu with a list of all projects for that group or user
* \| \|	Render sanitized SVG images	Stan Hu	2016-02-01	1	-0/+12
\| \| \| \| \| \| \| \| \| \| \| \|	Closes https://github.com/gitlabhq/gitlabhq/issues/9265
* \| \|	Fewer html_safesrename-inline-diff	Douwe Maan	2016-01-30	1	-2/+2
\| \| \|
* \| \|	Mark inline difference between old and new paths when a file is renamed	Douwe Maan	2016-01-29	1	-1/+10
\|/ /
* \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	James Lopez	2016-01-28	3	-6/+4
\|\ \ \| \| \| \| \| \| \| \| \|	hotfix/ruby-21-broken-update
\| * \	Merge branch 'issue_2406' into 'master'	Dmitriy Zaporozhets	2016-01-28	3	-6/+4
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show list of forks for a given Project Closes #2406 See merge request !2376
\| \| * \|	Add icon for private forks notice. #2406	Rubén Dávila	2016-01-20	1	-1/+1
\| \| \| \|
\| \| * \|	Fix broken specs. #2406	Rubén Dávila	2016-01-20	1	-4/+2
\| \| \| \|
\| \| * \|	Setup new fork link in sidebar and routes. #2406	Rubén Dávila	2016-01-20	2	-3/+3
\| \| \| \|
* \| \| \|	trick rubocop and temporarily add ruby 2.1 images for any branch	James Lopez	2016-01-28	2	-2/+2
\|/ / /
* \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into update-ruby-2.2.4	James Lopez	2016-01-27	2	-2/+6
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Merge branch 'rs-issue-12677' into 'master'	Douwe Maan	2016-01-26	1	-1/+5
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update text_color_for_bg helper to support RGB triplet color codes Closes #12677 See merge request !2587
\| \| * \|	Update text_color_for_bg helper to support RGB triplet color codesrs-issue-12677	Robert Speicher	2016-01-24	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #12677
\| * \| \|	Adds base64 background search icon.	Jacob Schatz	2016-01-24	1	-1/+1
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	All inputs of type `search` will have the gray background and search icon centered. Because the search magnifier is a bg image, I had to hide it with `[value=""]`. I added a little javascript to make sure each input always has it's own value.
* \| \|	fix rubocop new 2.2 syntax issues	James Lopez	2016-01-25	2	-2/+2
\|/ /
* \|	Backport some changes from EEes_backport	Valery Sizov	2016-01-22	1	-0/+75
\| \|
* \|	Fix MR diff 'Edit' buttonfix-mr-diff-edit-button	Douwe Maan	2016-01-21	2	-7/+7
\| \|
* \|	Save and use actual diff base commit for MR diff highlighting	Douwe Maan	2016-01-20	1	-2/+1
\| \|
* \|	Restore helper	Douwe Maan	2016-01-20	1	-0/+4
\| \|
* \|	Move parallel diff logic to separate class	Douwe Maan	2016-01-20	1	-104/+0
\| \|
* \|	Refactor Gitlab::Highlight and fix tests	Douwe Maan	2016-01-19	1	-2/+6
\| \|
* \|	Merge branch 'master' into issue_3945	Rubén Dávila	2016-01-14	11	-51/+55
\|\ \ \| \|/
\| *	Merge branch 'import-gh-wiki' into 'master'	Douwe Maan	2016-01-14	1	-1/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Import GitHub wiki into GitLab Closes #2834 GitHub doesn’t apply any constraints to theirs wiki slug allowing chars like ,, :, *, etc, we need to remove our constraints or some wiki pages will not be available after they are imported. Some wikis use the Gollum's tags to link its internal/external resources like: images, urls, wiki pages, etc. So, to avoid that wiki links/images displays completely broken after they were imported, we added a new `WikiPipeline`, that for now will parse only simple links, and image tags. ##### Before `WikiPipeline`: ![Screenshot_2016-01-11_20.14.48](/uploads/46fd5dbb5acfc70aa8ecca3050b675e4/Screenshot_2016-01-11_20.14.48.png) ##### After `WikiPipeline`: ![Screenshot_2016-01-11_20.15.56](/uploads/b1d94aa852f385f867a7868c358b4257/Screenshot_2016-01-11_20.15.56.png) See merge request !2324
\| \| *	Use the WikiPipeline when rendering the wiki markdown content	Douglas Barbosa Alexandre	2016-01-14	1	-1/+1
\| \| \|
\| * \|	Merge branch 'new-buttons-everywhere' into 'master'	Dmitriy Zaporozhets	2016-01-14	1	-1/+1
\| \|\ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Standartize buttons and fields size Fixes #8069 and #8070 See merge request !2428