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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #7967 from Bugagazavr/issue-actor	Valeriy Sizov	2014-11-05	6	-4/+25
\|\ \| \| \| \|	Add issueable actor to hooks
\| *	Add issueable actor	Kirill Zaitsev	2014-10-05	6	-4/+25
\| \|
* \|	Merge pull request #8222 from cirosantilli/concat-with-backslash	Robert Schilling	2014-11-04	1	-3/+3
\|\ \ \| \| \| \| \| \|	Continue strings with backslash instead of append
\| * \|	Continue strings with backslash instead of append	Ciro Santilli	2014-11-01	1	-3/+3
\| \| \|
* \| \|	Merge pull request #8182 from cirosantilli/dry-css-behavior	Valeriy Sizov	2014-11-04	1	-8/+18
\|\ \ \ \| \| \| \| \| \| \| \|	Factor behaviors.scss constants
\| * \| \|	Factor behaviors.scss constants	Ciro Santilli	2014-10-27	1	-8/+18
\| \| \| \|
* \| \| \|	Merge pull request #8196 from bbodenmiller/patch-12	Valeriy Sizov	2014-11-04	1	-1/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	clarify that 'template1=#' is part of prompt
\| * \| \| \|	clarify that 'template1=#' is part of prompt	Ben Bodenmiller	2014-10-29	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Similar to https://github.com/gitlabhq/gitlabhq/blob/master/doc/install/database_mysql.md clarify that `template1=#` is part of the prompt.
* \| \| \| \|	Merge pull request #8197 from bbodenmiller/patch-14	Valeriy Sizov	2014-11-04	1	-0/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Quit the database session at end of database setup
\| * \| \| \| \|	Quit the database session at end of database setup	Ben Bodenmiller	2014-10-30	1	-0/+3
\| \|/ / / /
* \| \| \| \|	Merge pull request #8224 from liammonahan/master	Valeriy Sizov	2014-11-04	3	-4/+9
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Expose projects_limit through users API if UserFull.
\| * \| \| \| \|	Expose projects_limit through users API if UserFull.	Liam Monahan	2014-11-02	3	-4/+9
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #8241 from cirosantilli/rm-unneeded-backslash	Robert Schilling	2014-11-04	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unneeded backslash: "\/" == "/"
\| * \| \| \| \| \|	Remove unneeded backslash: "\/" == "/"	Ciro Santilli	2014-11-04	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Dmitriy Zaporozhets	2014-11-04	3	-5/+11
\|\ \ \ \ \ \ \
\| * \ \ \ \ \ \	Merge pull request #8231 from cirosantilli/0000	Dmitriy Zaporozhets	2014-11-04	3	-5/+11
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix push not allowed to protected branch if commit starts with 7 zeros.
\| \| * \| \| \| \| \| \|	Fix push not allowed to protected branch if	Ciro Santilli	2014-11-03	3	-5/+11
\| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	commit starts with 7 zeros.
* \| \| \| \| \| \| \|	Merge branch 'jastkand/gitlab-ce-fix-api-auth' into 'master'	Dmitriy Zaporozhets	2014-11-04	6	-3/+57
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Jastkand/gitlab ce fix api auth Fixes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/209 See merge request !1232
\| * \| \| \| \| \| \|	Merge branch 'master' into jastkand/gitlab-ce-fix-api-auth	Dmitriy Zaporozhets	2014-11-03	32	-145/+183
\| \|\ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG
* \| \| \| \| \| \| \|	Merge branch 'api-events-username' into 'master'	Dmitriy Zaporozhets	2014-11-03	4	-0/+12
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose author username in project events API Fixes gitlab/gitlabhq#1476 See merge request !1236
\| * \| \| \| \| \| \| \|	Update changelog	Dmitriy Zaporozhets	2014-10-31	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \|	Expose author username in project events API	Dmitriy Zaporozhets	2014-10-31	3	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \|	Merge pull request #8156 from stevenosloan/update_slack_and_use_raw_webhook_url	Marin Jankovski	2014-11-03	6	-75/+33
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \|	update slack-notifier for new webhook_url format
\| * \| \| \| \| \| \| \|	update slack-notifier to 1.0.0, use raw webhook_url per slack recommendation	Steven Sloan	2014-10-23	6	-75/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	per changes with slack, they’re now using “static” web hook urls that describe the team & service with IDs that don’t change if the team or service name change. their recommendation is to use the raw webhook_url instead of building it out of components to allow more flexibility this should also prevent issues cropping up with mistakes in how the urls are parsed
* \| \| \| \| \| \| \| \|	Merge pull request #8223 from cirosantilli/slack-require-spec-helper	Robert Schilling	2014-11-02	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use require spec_helper instead of relative path
\| * \| \| \| \| \| \| \| \|	Use require spec_helper instead of relative path	Ciro Santilli	2014-11-01	1	-1/+1
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	More portable if either test or class gets moved, more uniform with the rest of the tests.
* \| \| \| \| \| \| \| \|	Merge pull request #8209 from naveda89/patch-1	Robert Schilling	2014-11-02	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \|	Fixed markdown error in 7.3-to-7.4 update guide
\| * \| \| \| \| \| \| \|	Fixed markdown error in 7.3-to-7.4 update guide	Alvaro Naveda	2014-10-31	1	-0/+1
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Just fixed a minor bug in the markdown notation
* \| \| \| \| \| \| \|	Merge pull request #8217 from bbodenmiller/change-label-generation	Robert Schilling	2014-11-01	1	-1/+0
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove feature label
\| * \| \| \| \| \| \| \|	remove feature label	Ben Bodenmiller	2014-10-31	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For automatic label generation remove label `feature` as it is basically means the same thing as label `enhancement`.
* \| \| \| \| \| \| \| \|	Merge pull request #8213 from cirosantilli/factor-backend-shell-path	Robert Schilling	2014-10-31	1	-12/+20
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Factor lib backend gitlab shell path
\| * \| \| \| \| \| \| \| \|	Factor lib backend gitlab shell path	Ciro Santilli	2014-10-31	1	-12/+20
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #8211 from cirosantilli/rake-import-style	Robert Schilling	2014-10-31	1	-4/+3
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	Fix doc rake import md style [ci-skip]
\| * \| \| \| \| \| \| \|	Fix doc rake import md style [ci-skip]	Ciro Santilli	2014-10-31	1	-4/+3
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'better-service-migration' into 'master'	Dmitriy Zaporozhets	2014-10-31	2	-2/+2
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Better service migration Prevent crashes and saving invalid record. Skip non-valid services. Better fix for https://github.com/gitlabhq/gitlabhq/pull/8199 See merge request !1235
\| * \| \| \| \| \| \|	Save only valid record in service migrations	Dmitriy Zaporozhets	2014-10-31	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Dmitriy Zaporozhets	2014-10-31	1	-0/+1
\|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge pull request #8205 from CromFr/master	Dmitriy Zaporozhets	2014-10-31	1	-0/+1
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|	Doc: Unicorn minimum worker_processes is 2
\| \| * \| \| \| \| \| \|	Doc: Unicorn minimum worker_processes is 2	Crom (Thibaut CHARLES)	2014-10-30	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A value of 1 cause http push fail (issue #6978 on GitHub)
* \| \| \| \| \| \| \| \|	Merge branch 'api-delete-branch-json' into 'master'	Dmitriy Zaporozhets	2014-10-31	4	-1/+14
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Api delete branch json Fixes gitlab/gitlabhq#1478 See merge request !1233
\| * \| \| \| \| \| \| \|	Delete branch via API: doc updated	Dmitriy Zaporozhets	2014-10-30	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \|	API delete branch: render branch name json instead of true	Dmitriy Zaporozhets	2014-10-30	3	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \|	Merge branch 'improve_rake_import_doc' into 'master'	Sytse Sijbrandij	2014-10-30	1	-15/+33
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve import Documentation Improved the documentation steps for importing bare git repositories to GitLab. @dzaporozhets I added a step to create gitlab-satellites. Is this step really necessary, or do the satellites get created as needed? See merge request !1234
\| * \| \| \| \| \| \| \|	Modified according to suggestions by @sytse	Patricio Cano	2014-10-30	1	-30/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fixed typo	Patricio Cano	2014-10-30	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Corrected layout, to be more friendly.	Patricio Cano	2014-10-30	1	-9/+9
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Corrected the wording of the documentation and the layout.	Patricio Cano	2014-10-30	1	-16/+14
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Added the satellites:create step, that might be necessary after the import.	Patricio Cano	2014-10-30	1	-3/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Corrected syntax.
\| * \| \| \| \| \| \| \|	Improved rake documentation for importing existing repositories with a rake ↵	Patricio Cano	2014-10-29	1	-7/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	task.
* \| \| \| \| \| \| \| \|	Revert "Change update recommendation" since it should be fixed with	Sytse Sijbrandij	2014-10-30	1	-9/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	c3104abfd4d5c58838a6f4514ffa4b7c04ff6dcd This reverts commit 8101640c33d240fc5b29c3dec33c56b67325a89f.