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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \|	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
\| * \| \| \| \| \|	Add few fixes to documentation based on comments from review	Dmitriy Zaporozhets	2015-11-23	2	-4/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \|	Update required version of lfs client and separate the docs for users and ↵required_version_and_docs_update	Marin Jankovski	2015-11-20	6	-43/+76
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	admins.
* \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-11-23	8	-32/+196
\|\ \ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'issue_2296' into 'master'	Douwe Maan	2015-11-23	8	-32/+196
\| \|\ \ \ \ \ \ \ \| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Generate system note after Task item has been updated on Issue or Merge Request. Reference: #2296 Everytime the User check or uncheck a Task Item from the Issue or Merge Request description, a new update is going to be added to the activity logs of the Issue or Merge Request. Note that when using the edit form, you can only update the Task item status or add/delete/modify existing ones. Doing both actions is not fully supported. See merge request !1848
\| \| * \| \| \| \| \|	Little fix for Rubocop's complaints. #2296issue_2296	Rubén Dávila	2015-11-20	1	-2/+2
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fix bug that happened when replacing the Task list. #2296	Rubén Dávila	2015-11-20	2	-1/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	REF: https://gitlab.com/gitlab-org/gitlab-ce/issues/2296#note_2724697
\| \| * \| \| \| \| \|	Monkey patching TaskList::Item is no longer required. #2296	Rubén Dávila	2015-11-20	3	-13/+4
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Refactor creation of system notes for Issue/MR labels. #2296	Rubén Dávila	2015-11-20	1	-10/+7
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Generate system note after Task item has been updated on Issue or Merge ↵	Ruben Davila	2015-11-19	9	-24/+181
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Request. #2296 Everytime the User check or uncheck a Task Item from the Issue or Merge Request description, a new update is going to be added to the activity logs of the Issue or Merge Request. Note that when using the edit form, you can only update the Task item status or add/delete/modify existing ones. Doing both actions is not fully supported.
* \| \| \| \| \| \| \|	Merge pull request #9843 from ferdinandrosario/upgrade	Dmitriy Zaporozhets	2015-11-23	2	-28/+28
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	Updated rails patch
\| * \| \| \| \| \| \|	Updated rails patch	Ferdinand Rosario	2015-11-19	2	-28/+28
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'issue_2993' into 'master'	Dmitriy Zaporozhets	2015-11-23	2	-2/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update copy used in alert message when deleting branches or tags. Reference: #2993 Before: ![Screen_Shot_2015-11-19_at_4.10.34_PM](/uploads/5cdf7e8c5d4c6bd9e18584b118420c8c/Screen_Shot_2015-11-19_at_4.10.34_PM.png) ![Screen_Shot_2015-11-19_at_4.14.19_PM](/uploads/80513b96492122860733462efa8c8015/Screen_Shot_2015-11-19_at_4.14.19_PM.png) After: ![Screen_Shot_2015-11-19_at_4.59.56_PM](/uploads/80367f2acea0d22d36a5297bdc29163e/Screen_Shot_2015-11-19_at_4.59.56_PM.png) ![Screen_Shot_2015-11-19_at_4.59.30_PM](/uploads/134cf02d1fb3feff2159b5659d149d54/Screen_Shot_2015-11-19_at_4.59.30_PM.png) See merge request !1846
\| * \| \| \| \| \| \| \|	Update copy used in alert message when deleting branches or tags. #2993issue_2993	Rubén Dávila	2015-11-19	2	-2/+2
\| \| \| \| \| \| \| \| \|