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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'rs-emoji' into 'master'	Douwe Maan	2016-02-19	1	-6/+0
\| \| \| \| \| \| \| \| \|	Update Gemojione for new hotness :sparkles: Before \| After ------ \| ----- ![Screen_Shot_2016-02-12_at_3.38.43_PM](/uploads/299e5ffe38c91657085741261a678f81/Screen_Shot_2016-02-12_at_3.38.43_PM.png) \| ![Screen_Shot_2016-02-12_at_3.38.09_PM](/uploads/ccee29719a6445a9efd2498391a7eea0/Screen_Shot_2016-02-12_at_3.38.09_PM.png) See merge request !2800
*	Merge branch 'see-and-sort-on-vote-count-mr-issues' into 'master'	Douwe Maan	2016-02-18	1	-0/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add ability to see and sort on vote count from Issues and MR lists Fixes #3763 * Sort options ![Sort Options](/uploads/df6543d574d4df8bf7e4496a876e2930/sort.png) * Most popular ![Most popular](/uploads/bb92cc2fbef7b6b806dcdf8c52778fdd/most-popular.png) * Least popular ![Least popular](/uploads/7988ed451922c81dc228419b5edbd7cd/least-popular.png) See merge request !2781
*	Sort line notes used in parallel diff by created_at	Rémy Coutable	2016-02-17	1	-1/+1
\| \| \| \|	Fixes #13464.
*	Display "iid of max_iid" in Issuables' sidebar	Rémy Coutable	2016-02-16	1	-8/+4
\|
*	Fix the "x of y" displayed at the top of Issuables' sidebarfix/13356-issuable-index-of-total-in-sidebar	Rémy Coutable	2016-02-15	3	-85/+44
\| \| \| \| \| \| \| \|	1. We now display the index of the current issuable among all its project's issuables, of the same type and with the same state. 2. Also, refactored a bit the Issuable helpers into a new IssuablesHelper module. 3. Added acceptance specs for the sidebar counter.
*	Fix relative links in other markup formatsben.boeckel/gitlab-ce-fixup-links-in-generic-docs	Ben Boeckel	2016-02-12	2	-2/+16
\| \| \| \| \| \| \| \|	- Apply the RelativeLinkFilter filter to other formats, e.g., reStructuredText so links from the Files view or the Project view work - Remove the AsciidocPipeline pipeline Fixes #3533.
*	Fix milestone order in project and issue edit lists to due_dateolirogers/gitlab-ce-project-milestone-order	Oliver Rogers	2016-02-10	2	-7/+3
\|
*	Merge remote-tracking branch 'dev/master' into 'master'	Robert Speicher	2016-02-09	1	-1/+1
\|\
\| *	Merge branch 'ci-permissions' into 'master'	Robert Speicher	2016-02-08	1	-1/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Limit guest access to builds Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2646 See merge request !1942
\| \| *	Merge branch 'master' into ci-permissions	Kamil Trzcinski	2016-02-05	4	-15/+109
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| \| * \	Merge remote-tracking branch 'origin/master' into ci-permissions	Kamil Trzcinski	2016-02-04	4	-7/+31
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/views/projects/builds/index.html.haml
\| \| * \| \|	Make the CI permission model simpler	Kamil Trzcinski	2016-02-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 'rs-broadcast-markdown' into 'master'	Douwe Maan	2016-02-09	1	-1/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #11853
* \| \| \| \| \|	Merge branch 'snippet_search_refactoring'	Valery Sizov	2016-02-09	1	-3/+3
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Faster snippet search	Valery Sizov	2016-02-05	1	-3/+3
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge branch 'project-title-dropdown-toggle-button' into 'master'	Jacob Schatz	2016-02-05	1	-2/+2
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed the project switcher dropdown toggle Moved the positioning of the dropdown to be more aligned with the title Closes #13219 and #13214 cc. @jschatz1 @dzaporozhets See merge request !2733
\| * \| \| \|	Uses icon helper for dropdown toggle icon	Phil Hughes	2016-02-05	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Changed the project switcher dropdown toggle	Phil Hughes	2016-02-05	1	-2/+2
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moved the positioning of the dropdown to be more aligned with the title Closes #13219 and #13214
* \| \| \|	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
\| \| \| \|