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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Updated triggers UIupdated-triggers-ui	Phil Hughes	2016-04-27	3	-66/+63
\| \| \| \|	Closes #14090
*	Merge branch 'upgrade-gitlab-grit' into 'master'	Robert Speicher	2016-04-25	1	-3/+3
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade gitlab-grit gem to 2.8.1, loosening the mime-types gem's version dependency. Changelog for mime-types: https://github.com/mime-types/ruby-mime-types/blob/master/History.rdoc Resolves #15101. See merge request !3901
\| *	Upgrade gitlab-grit gem to 2.8.1, loosening the mime-types gem's version ↵	Connor Shea	2016-04-24	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|	dependency. Resolves #15101.
* \|	Merge branch 'link_user_avatar_in_activity_page_to_profile' into 'master'	Robert Speicher	2016-04-25	1	-1/+6
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Link user avatar in activity page to user profile Closes #14927 See merge request !3910
\| * \|	link user avatar in activity page to user profilelink_user_avatar_in_activity_page_to_profile	Arinde Eniola	2016-04-25	1	-1/+6
\| \| \|
* \| \|	Merge branch 'fix-changelog' into 'master'	Jacob Schatz	2016-04-25	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move CHANGELOG entry to 8.8 Fixes CHANGELOG entry for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3686 See merge request !3914
\| * \| \|	Move CHANGELOG entry to 8.8	Alfredo Sumaran	2016-04-25	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'emoji-unicode-fix' into 'master'	Jacob Schatz	2016-04-25	3	-17/+8
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes issue with emoji comments not showing correct emoji image Previously it would look for the unicode character inside the award menu. But this menu might not always be there. Now, the unicode characters are loaded onto the page in an array which the award emoji that looks in to get the correct emoji unicode character Fixes #15512 See merge request !3885
\| * \| \| \|	Removed usage of normilizeEmojiName methodemoji-unicode-fix	Phil Hughes	2016-04-22	2	-7/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed some Ruby based on feedback
\| * \| \| \|	Fixes issue with emoji comments not showing correct emoji image	Phil Hughes	2016-04-22	3	-13/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously it would look for the unicode character inside the award menu. But this menu might not always be there. Now, the unicode characters are loaded onto the page in an array which the award emoji that looks in to get the correct emoji unicode character Fixes #15512
* \| \| \| \|	Merge branch 'diff-line-colors' into 'master'	Jacob Schatz	2016-04-25	3	-8/+16
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update diff blue & yellow to match design <img src="/uploads/60e1351fb04ab1c8969685fbc8b61c88/Screen_Shot_2016-04-22_at_9.12.17_AM.png" width="500px"> <img src="/uploads/6812b22ec53f3041811261daa0584822/Screen_Shot_2016-04-22_at_9.12.05_AM.png" width="500px"> See merge request !3883
\| * \| \| \| \|	Update diff blue & yellow to match designdiff-line-colors	Annabel Dunstone	2016-04-22	3	-8/+16
\| \|/ / / /
* \| \| \| \|	Merge branch 'fix/ci-docker-images-documentation' into 'master'	Achilleas Pipinellis	2016-04-25	1	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace '-n' with '--name' in docker related documentation `-n` for `docker run` is outdated. We should use `--name` instead. This MR fixes the example in documentation. Fixes #15174 See merge request !3908
\| * \| \| \| \|	Replace '-n' with '--name' in docker related documentationfix/ci-docker-images-documentation	Tomasz Maczukin	2016-04-25	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \|	Merge branch 'fix/ci-php-docker-example' into 'master'	Achilleas Pipinellis	2016-04-25	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix php-docker example (for new docker versions) `/.dockerinit` file doesn't exists in new Docker versions. Instead `/.dockerenv` can be used. This MR fixes the PHP example which was working only for older Docker versions. Fixes gitlab-org/gitlab-ci-multi-runner#1241 See merge request !3907
\| * \| \| \| \| \|	Fix php-docker example (for new docker versions)fix/ci-php-docker-example	Tomasz Maczukin	2016-04-25	1	-1/+1
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \|	Merge branch 'blur-award-btn' into 'master'	Jacob Schatz	2016-04-25	1	-0/+2
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Triggers blur after clicking award button ![blur](/uploads/6cd53a5ac314e8048c656685935747e2/blur.gif) Fixes #15511 See merge request !3881
\| * \| \| \| \|	Triggers blur after clicking award buttonblur-award-btn	Phil Hughes	2016-04-22	1	-0/+2
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #15511
* \| \| \| \|	Merge branch 'issue_14904' into 'master'	Jacob Schatz	2016-04-25	11	-50/+118
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add new shortcuts Closes #14904 - On a project: `i` To navigate to New Issue page. - On a issuable: `l` To open Label dropdown on a issuable. - Global: Typing `?` multiple times now toggles the modal. See merge request !3686
\| * \| \| \| \|	Add Rspec test for "i" shortcutissue_14904	Alfredo Sumaran	2016-04-21	1	-0/+21
\| \| \| \| \| \|
\| * \| \| \| \|	Remove spinach features	Alfredo Sumaran	2016-04-21	3	-13/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Merge remote-tracking branch 'origin/master' into issue_14904	Alfredo Sumaran	2016-04-21	99	-3074/+1000
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Use gon.shortcuts_path directly	Alfredo Sumaran	2016-04-21	1	-2/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Move event handlers to methods	Alfredo Sumaran	2016-04-21	1	-10/+14
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into issue_14904	Alfredo Sumaran	2016-04-20	58	-191/+3448
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/views/shared/issuable/_sidebar.html.haml
\| * \| \| \| \| \| \|	Make shortcuts work when sidebar is collapsed	Alfredo Sumaran	2016-04-20	3	-35/+54
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into issue_14904	Alfredo Sumaran	2016-04-20	182	-568/+2797
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Add shortcut_path to GonHelper module	Alfredo Sumaran	2016-04-18	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Expose shortcuts url from the backend via gon	Alfredo Sumaran	2016-04-18	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Alfredo Sumaran <alfredo@gitlab.com>
\| * \| \| \| \| \| \| \|	Use proper method	Alfredo Sumaran	2016-04-18	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix specs	Alfredo Sumaran	2016-04-18	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Remove @focus	Alfredo Sumaran	2016-04-18	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add tests for the "i" shortcut	Alfredo Sumaran	2016-04-18	3	-0/+13
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update shortcuts image	Alfredo Sumaran	2016-04-18	1	-0/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update shortcuts dialog	Alfredo Sumaran	2016-04-18	1	-1/+13
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update CHANGELOG	Alfredo Sumaran	2016-04-18	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Set `i` as a shortcut for creating a new issue	Alfredo Sumaran	2016-04-18	2	-0/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Toggle help modal	Alfredo Sumaran	2016-04-18	1	-20/+23
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Set "l" for Label shortcut	Alfredo Sumaran	2016-04-18	1	-1/+4
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'project-dropdown-link-click-fix' into 'master'	Jacob Schatz	2016-04-25	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed issue with project dropdown links not being clickable See merge request !3870
\| * \| \| \| \| \| \| \| \|	Fixed issue with project dropdown links not being clickableproject-dropdown-link-click-fix	Phil Hughes	2016-04-22	1	-2/+2
\| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'word-break' into 'master'	Jacob Schatz	2016-04-25	3	-1/+6
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't break line in middle of word <img src="/uploads/cceb1a4212ff7785ace03cd6468edf85/Screen_Shot_2016-04-21_at_3.32.00_PM.png" width="500px"> See merge request !3864
\| * \| \| \| \| \| \| \| \|	Don't break line in middle of wordword-break	Annabel Dunstone	2016-04-21	3	-1/+6
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix/error-on-builds-page' into 'master'	Robert Speicher	2016-04-25	3	-1/+29
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix error on commit builds page This MR fixes error on commit builds page that occurs before CI commit (Pipeline) had been updated. Closes #15509 See merge request !3874
\| * \| \| \| \| \| \| \| \| \|	Add Changelog entry for commit builds page fix	Grzegorz Bizon	2016-04-25	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix error on commit builds page when no builds yet	Grzegorz Bizon	2016-04-25	2	-1/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #15509
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'rs-503-page' into 'master'	Dmitriy Zaporozhets	2016-04-25	3	-2/+58
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a branded 503 static error page [ci skip] Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15398 See merge request !3894
\| * \| \| \| \| \| \| \| \| \| \|	Add a branded 503 static error pagers-503-page	Robert Speicher	2016-04-22	3	-2/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15398
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'update-jquery-rails' into 'master'	Robert Speicher	2016-04-25	2	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade jQuery Rails from 4.0.5 to 4.1.1 Upgrades jQuery to 1.12.1 and jquery-ujs to 1.2.1. Changelogs: - https://github.com/rails/jquery-rails/blob/master/CHANGELOG.md - https://blog.jquery.com/2016/01/08/jquery-2-2-and-1-12-released/ - https://github.com/rails/jquery-ujs/releases See merge request !3642
\| * \| \| \| \| \| \| \| \| \| \|	Upgrade jQuery Rails from 4.0.5 to 4.1.1	connorshea	2016-04-10	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrades jQuery to 1.12.1 and jquery-ujs to 1.2.1. Changelogs: https://github.com/rails/jquery-rails/blob/master/CHANGELOG.md https://blog.jquery.com/2016/01/08/jquery-2-2-and-1-12-released/ https://github.com/rails/jquery-ujs/releases