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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add custom ColorValidator	Robert Speicher	2015-12-07	2	-2/+2
\|
*	Merge branch 'fix-random-failing-test' into 'master'	Dmitriy Zaporozhets	2015-12-07	2	-2/+8
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix random failing test Make sure we wait till page reloads after request was merged. Otherwise we get request running which fails next test Improvement for !1897 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !2004
\| *	Fix random failing test	Dmitriy Zaporozhets	2015-12-07	2	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure we wait till page reloads after request was merged. Otherwise we get request running which fails next test Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Merge branch 'report-ssl-errors' of https://gitlab.com/stanhu/gitlab-ce	Dmitriy Zaporozhets	2015-12-07	1	-3/+1
\|\ \ \| \|/ \|/\|
\| *	Fix spec	Stan Hu	2015-12-04	1	-3/+1
\| \|
* \|	Merge branch 'fix/award-emoji-conflict-in-notes' into 'master'	Grzegorz Bizon	2015-12-07	4	-13/+47
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix problems with award-emoji-only comment This fixes a conflict between note with only a single emoji in content and award-emojis mechanisms. Closes #3734 cc @vsizov See merge request !1936
\| * \|	Add feature test for emoji-only diff notes	Grzegorz Bizon	2015-12-03	2	-0/+23
\| \| \| \| \| \| \| \| \| \| \| \|	This specs is related to bug described in #3734 (award-emojis).
\| * \|	Add test for award-emoji being added as regular comment	Grzegorz Bizon	2015-12-03	2	-13/+24
\| \| \|
* \| \|	Ensure "Remove Source Branch" button is not shown when branch is being ↵	Rubén Dávila	2015-12-04	2	-0/+52
\| \|/ \|/\| \| \| \| \|	deleted. #3583
* \|	Merge remote-tracking branch 'origin/ui/issuable-form'	Dmitriy Zaporozhets	2015-12-04	2	-3/+2
\|\ \ \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Fix specsui/issuable-form	Douwe Maan	2015-12-03	2	-2/+2
\| \| \|
\| * \|	Merge branch 'master' into ui/issuable-form	Douwe Maan	2015-12-03	4	-8/+8
\| \|\ \ \| \| \|/
\| * \|	Don't reset target branch when choosing to "Change branches" in MR	Douwe Maan	2015-12-02	1	-1/+0
\| \| \|
* \| \|	Merge branch 'ui/form-consistency' into 'master'	Dmitriy Zaporozhets	2015-12-04	6	-19/+19
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	UI: Improve form consistency Depends on !1953 See the commits for more details, the messages mostly speak for themselves. # Highlights ## Tag form Before: ![tag_before](/uploads/ee5ba6ef405749013f9e5717ebcf72f3/tag_before.png) After: ![tag_after](/uploads/71bb543553190d91c03fd706cce35923/tag_after.png) See merge request !1955
\| * \| \|	Fix specui/form-consistency	Douwe Maan	2015-12-03	1	-4/+4
\| \| \| \|
\| * \| \|	Fix specs	Douwe Maan	2015-12-03	2	-5/+5
\| \| \| \|
\| * \| \|	Merge branch 'master' into ui/form-consistency	Douwe Maan	2015-12-03	4	-8/+8
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| * \| \|	Add cancel button to forms that didn't have one already	Douwe Maan	2015-12-02	3	-4/+4
\| \| \| \|
\| * \| \|	Use consistent casing for form field labels	Douwe Maan	2015-12-02	1	-4/+4
\| \| \| \|
\| * \| \|	Use consistent casing for page titles	Douwe Maan	2015-12-02	2	-2/+2
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'ui/wiki' into 'master'	Dmitriy Zaporozhets	2015-12-03	2	-10/+10
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	UI: Use new style for wiki Depends on !1953 See the commits for more details, the messages mostly speak for themselves. # Highlights ## Wiki Page Before: ![Screen_Shot_2015-12-02_at_17.48.45](/uploads/aa53f768b8760f2e15d765e06d5ff773/Screen_Shot_2015-12-02_at_17.48.45.png) After: ![Screen_Shot_2015-12-02_at_17.48.16](/uploads/f8a376651aff9c8de82621578aaeb002/Screen_Shot_2015-12-02_at_17.48.16.png) ## Edit Wiki Page Before: ![Screen_Shot_2015-12-02_at_17.48.59](/uploads/c9ffddaca3156046b99cba11bdb0ea4f/Screen_Shot_2015-12-02_at_17.48.59.png) After: ![Screen_Shot_2015-12-02_at_17.48.26](/uploads/1aa62049f120c91436ed68fd7441c156/Screen_Shot_2015-12-02_at_17.48.26.png) See merge request !1967
\| * \| \|	Fix specsui/wiki	Douwe Maan	2015-12-03	2	-3/+3
\| \| \| \|
\| * \| \|	Merge branch 'master' into ui/wiki	Douwe Maan	2015-12-03	4	-8/+8
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| * \| \|	Use new style for wiki	Douwe Maan	2015-12-02	2	-7/+7
\| \| \|/ \| \|/\|
* \| \|	Fix specui/issuable-filter	Douwe Maan	2015-12-03	1	-1/+1
\| \|/ \|/\|
* \|	Brefer "Directory" over "Dir", "Files" over "Codeui/consistency	Douwe Maan	2015-12-02	1	-4/+4
\| \|
* \|	Use "Delete" in milestone and label delete buttons instead of "Remove"	Douwe Maan	2015-12-02	3	-3/+3
\| \|
* \|	Capitalize tab titles	Douwe Maan	2015-12-02	1	-1/+1
\|/
*	Fix rubocop complainnew-member-page	Dmitriy Zaporozhets	2015-11-25	1	-2/+5
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Split group feature tests	Dmitriy Zaporozhets	2015-11-25	8	-354/+378
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Refactor group steps	Dmitriy Zaporozhets	2015-11-25	1	-61/+16
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Refactor group members tests a bit	Dmitriy Zaporozhets	2015-11-25	4	-27/+15
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Small code improvementfix-group-member	Dmitriy Zaporozhets	2015-11-24	1	-1/+1
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Fix rubocop complain	Dmitriy Zaporozhets	2015-11-24	1	-1/+1
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Fix 500 error when update group member permission	Dmitriy Zaporozhets	2015-11-24	2	-10/+48
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge branch 'emoji_votes' into 'master'	Dmitriy Zaporozhets	2015-11-19	2	-0/+55
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Award Emoji This it first iteration of award emoji feature. We have plan to extend emoji picker by the next release. For now, you can add award by clicking to the emoji picker or posting a regular comment with emoji like ":+1:" and any other. You can post not only emoji that listed in the emoji picker. See merge request !1825
\| *	added spinach tests	Valery Sizov	2015-11-19	2	-0/+55
\| \|
* \|	Merge branch 'dirceu/gitlab-ce-new-merge-request-from-file-edit' into 'master'	Robert Speicher	2015-11-19	2	-30/+14
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Add option to create merge request when editing/creating a file Replaces !1611 Fixes #3059 See merge request !1820
\| *	Merge branch 'master' into dirceu/gitlab-ce-new-merge-request-from-file-edit	Douwe Maan	2015-11-18	2	-0/+26
\| \|\
\| * \|	Fix feature spec.	Douwe Maan	2015-11-18	2	-30/+14
\| \| \|
* \| \|	Fix specs	Douwe Maan	2015-11-18	1	-1/+0
\| \|/ \|/\|
* \|	Merge branch 'james11/gitlab-ce-removable-group-owner' into 'master'	Robert Speicher	2015-11-17	2	-0/+26
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent the last owner of a group from being able to delete themselves by 'adding' themselves as a master Replaces !1708. Fixes #1111. See merge request !1815
\| *	Merge branch 'master' into james11/gitlab-ce-removable-group-owner	Douwe Maan	2015-11-17	13	-36/+116
\| \|\
\| * \|	fixed last group owner issue and added test	James Lopez	2015-10-29	2	-0/+26
\| \| \|
* \| \|	Merge branch 'rs-revert-gh-9820' into 'master'	Robert Speicher	2015-11-17	1	-1/+1
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list" This reverts commit 63144cd062f6d259f1f30b6e06eb92a16caa8dec, reversing changes made to 8ab5df9d872414b2cca3ebd16d57b89e2f19e06a. Reverts https://github.com/gitlabhq/gitlabhq/pull/9820 See merge request !1804
\| * \|	Revert "Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list"rs-revert-gh-9820	Robert Speicher	2015-11-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 63144cd062f6d259f1f30b6e06eb92a16caa8dec, reversing changes made to 8ab5df9d872414b2cca3ebd16d57b89e2f19e06a.
* \| \|	Create milestones in the group	Dmitriy Zaporozhets	2015-11-16	3	-1/+34
\|/ / \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Avoid render edit_form in each notes.	Jason Lee	2015-11-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use RJS to render edit note feature. Before: ``` Rendered projects/notes/_note.html.haml (27.9ms) Rendered projects/_zen.html.haml (0.3ms) Rendered projects/notes/_hints.html.haml (0.7ms) Rendered projects/_md_preview.html.haml (3.9ms) Rendered projects/notes/_edit_form.html.haml (6.9ms) Rendered projects/notes/_note.html.haml (17.7ms) Rendered projects/_zen.html.haml (0.3ms) Rendered projects/notes/_hints.html.haml (0.6ms) Rendered projects/_md_preview.html.haml (3.4ms) Rendered projects/notes/_edit_form.html.haml (7.0ms) ``` After: ``` Rendered projects/notes/_note.html.haml (13.8ms) Rendered projects/notes/_note.html.haml (7.1ms) Rendered projects/notes/_note.html.haml (9.5ms) Rendered projects/notes/_note.html.haml (8.5ms) ``` This change reduce at least 6ms * N ('N' - number of notes).
* \|	Merge branch 'improve-ci-graphs'	Dmitriy Zaporozhets	2015-11-10	1	-3/+3
\|\ \
\| * \|	Fix graph description and textimprove-ci-graphs	Dmitriy Zaporozhets	2015-11-10	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>