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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Decouple Markdown previews from DropzoneInputrs-markdown-preview	Robert Speicher	2015-11-25	3	-77/+92
\|
*	Merge branch 'new-member-page' into 'master'	Dmitriy Zaporozhets	2015-11-25	19	-489/+457
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve group and project members pages * Improve UI for group members page * Improve UI for project members page For internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2057 This MR should solve usability problem with adding new member to group/project See merge request !1886
\| *	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	10	-356/+380
\| \| \| \| \| \| \| \|	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>
\| *	Improve project members page UI	Dmitriy Zaporozhets	2015-11-25	6	-49/+36
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Improve UI for group members page	Dmitriy Zaporozhets	2015-11-25	5	-32/+43
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Merge branch 'bump-gitlab-shell' into 'master'	Dmitriy Zaporozhets	2015-11-25	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump gitlab-shell to 2.6.8 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> For gitlab/gitlabhq#2635 See merge request !1939
\| * \|	Bump gitlab-shell to 2.6.8	Dmitriy Zaporozhets	2015-11-25	1	-1/+1
\|/ / \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Merge branch 'sherlock-total-query-time' into 'master'	Yorick Peterse	2015-11-25	4	-0/+25
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \|	Added total query time to Sherlock This makes it easier to see if a problem is caused by slow queries or slow Ruby code (unrelated to any SQL queries that might be used). See merge request !1887
\| *	Added total query time to Sherlocksherlock-total-query-time	Yorick Peterse	2015-11-24	4	-0/+25
\| \| \| \| \| \| \| \| \| \|	This makes it easier to see if a problem is caused by slow queries or slow Ruby code (unrelated to any SQL queries that might be used).
* \|	Merge branch 'lfs-doc' into 'master'	Robert Schilling	2015-11-25	1	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add reference to Microsoft's Git Credential Manager for Windows. Minor update to the LFS-documentation, referencing Microsoft's Git Credential Manager for Windows. See merge request !1892
\| * \|	Add reference to Microsoft's Git Credential Manager for Windows.	Eirik Lygre	2015-11-24	1	-2/+2
\| \| \|
* \| \|	Merge branch 'rs-update-colorize' into 'master'	Dmitriy Zaporozhets	2015-11-25	3	-17/+4
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump colorize to ~> 0.7.0 Also removes `colored` which came in during the CI merge and is redundant. Closes #2822 See merge request !1895
\| * \| \|	Remove usage of Coloredrs-update-colorize	Robert Speicher	2015-11-24	1	-11/+1
\| \| \| \|
\| * \| \|	Bump colorize to ~> 0.7.0	Robert Speicher	2015-11-24	2	-6/+3
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also removes `colored` which came in during the CI merge and is redundant. Closes #2822
* \| \|	Merge branch 'rs-update-rack-oauth2' into 'master'	Dmitriy Zaporozhets	2015-11-25	2	-4/+4
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump rack-oauth2 to ~> 1.2.1 Closes #2748 See merge request !1891
\| * \| \|	Bump rack-oauth2 to ~> 1.2.1rs-update-rack-oauth2	Robert Speicher	2015-11-24	2	-4/+4
\| \|/ /
* \| \|	Merge branch 'rs-update-creole' into 'master'	Dmitriy Zaporozhets	2015-11-25	2	-3/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump creole to ~> 0.5.0 Closes #2815 See merge request !1890
\| * \| \|	Bump creole to ~> 0.5.0rs-update-creole	Robert Speicher	2015-11-24	2	-3/+3
\| \|/ / \| \| \| \| \| \| \| \| \|	Closes #2815
* \| \|	Merge branch 'rs-update-gon' into 'master'	Dmitriy Zaporozhets	2015-11-25	2	-4/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump gon to ~> 6.0.1 Closes #2856 See merge request !1889
\| * \| \|	Bump gon to ~> 6.0.1rs-update-gon	Robert Speicher	2015-11-24	2	-4/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #2856
* \| \| \|	Merge branch 'session_expire_delay_cannot_be_nil' into 'master'	Robert Speicher	2015-11-25	1	-2/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Maybe rescue session_expire_delay by setting a default value. Related to gitlab-org/omnibus-gitlab#956 See merge request !1880
\| * \| \| \|	Also fallback to a default value if none is set.session_expire_delay_cannot_be_nil	Marin Jankovski	2015-11-24	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Maybe rescue session_expire_delay by setting a default value.	Marin Jankovski	2015-11-24	1	-0/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'rs-rescue-standarderror' into 'master'	Robert Speicher	2015-11-25	1	-1/+1
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rescue StandardError, not Exception See merge request !1893
\| * \| \| \|	Rescue StandardError, not Exceptionrs-rescue-standarderror	Robert Speicher	2015-11-24	1	-1/+1
\|/ / / /
* \| \| \|	Merge branch 'fix-group-member' into 'master'	Dmitriy Zaporozhets	2015-11-24	5	-12/+51
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix 500 error when update group member permission Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes #3578 See merge request !1884
\| * \| \| \|	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	5	-12/+51
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Merge branch 'issue_guidelines_with_omnibus_commands' into 'master'	Dmitriy Zaporozhets	2015-11-24	1	-2/+2
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Spell out commands for omnibus-gitlab packages. User got confused in gitlab-org/gitlab-ce#3614 See merge request !1881
\| * \| \|	Spell out commands for omnibus-gitlab packages.issue_guidelines_with_omnibus_commands	Marin Jankovski	2015-11-24	1	-2/+2
\| \|/ /
* \| \|	Merge branch 'fix-small-text' into 'master'	Dmitriy Zaporozhets	2015-11-24	1	-0/+6
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix ultra-light color for small text Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1879
\| * \|	Fix ultra-light color for small textfix-small-text	Dmitriy Zaporozhets	2015-11-24	1	-0/+6
\|/ / \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Merge branch 'service-tests' into 'master'	Dmitriy Zaporozhets	2015-11-24	2	-0/+68
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Add tests for (Create\|Update)ReleaseService As promised See merge request !1875
\| *	Add tests for (Create\|Update)ReleaseServiceservice-tests	Robert Schilling	2015-11-23	2	-0/+68
\| \|
* \|	Merge branch 'ci-artifacts-path' into 'master'	Robert Speicher	2015-11-23	7	-6/+22
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose artifacts path This fixes broken artifacts storage path. Fixes #3607 Fixes #3608 Related: gitlab-org/omnibus-gitlab!544 See merge request !1869
\| * \|	Expose artifacts pathci-artifacts-path	Kamil Trzcinski	2015-11-23	7	-6/+22
\| \| \|
* \| \|	Merge branch 'ci-fix-500' into 'master'	Robert Speicher	2015-11-23	4	-0/+10
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix 500 when using CI - Fix for Ci::Build state machine, allowing to process builds without the project - Forcefully update builds that didn't want to update with state machine - Fix saving GitLabCiService as Admin Template Fixes #3556 See merge request !1873
\| * \| \|	Update CHANGELOG	Robert Speicher	2015-11-23	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \|	Fix 500 when using CIci-fix-500	Kamil Trzcinski	2015-11-23	4	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Fix for Ci::Build state machine, allowing to process builds without the project - Forcefully update builds that didn't want to update with state machine - Fix saving GitLabCiService as Admin Template
* \| \| \|	Merge branch 'fix-clipboard-styling-in-create-mr' into 'master'	Robert Speicher	2015-11-23	1	-0/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix CSS styling for clipboard icon in new MR page Closes #3602 See merge request !1870
\| * \| \| \|	Fix CSS styling for clipboard icon in new MR page	Stan Hu	2015-11-22	1	-0/+4
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	Closes #3602
* \| \| \|	Merge branch 'bundler-audit' into 'master'	Dmitriy Zaporozhets	2015-11-23	3	-0/+14
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add bundler-audit to CI Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @DouweM @rspeicher @vsizov See merge request !1874
\| * \| \| \|	Allow bundler:audit to fail	Dmitriy Zaporozhets	2015-11-23	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Fix gitlab-ci.yml syntax	Dmitriy Zaporozhets	2015-11-23	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Add bundler-audit to CI	Dmitriy Zaporozhets	2015-11-23	3	-0/+13
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Merge branch 'required_version_and_docs_update' into 'master'	Dmitriy Zaporozhets	2015-11-23	6	-43/+77
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update required version of lfs client and separate the docs for users and admins. See merge request !1855