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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add libravatar documentation.	Marin Jankovski	2014-10-14	2	-0/+70
\|
*	Merge pull request #8027 from bbodenmiller/patch-7	Robert Schilling	2014-10-13	1	-0/+1
\|\ \| \| \| \|	update changelog
\| *	update changelog	Ben Bodenmiller	2014-10-13	1	-0/+1
\|/ \| \|	Change log entry for https://github.com/gitlabhq/gitlabhq/pull/8020
*	Merge pull request #7942 from cirosantilli/commit-changes-uppercase	Dmitriy Zaporozhets	2014-10-13	5	-22/+21
\|\ \| \| \| \|	Make new and edit file submit more uniform
\| *	Make new and edit file submit more uniform	Ciro Santilli	2014-10-08	5	-22/+21
\| \|
* \|	Merge branch 'sorting-users-in-admin' into 'master'	Dmitriy Zaporozhets	2014-10-13	5	-11/+70
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sorting users in admin See merge request !1170
\| * \|	Admin: user sorting	Valery Sizov	2014-10-13	5	-11/+70
\| \| \|
* \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Dmitriy Zaporozhets	2014-10-13	1	-3/+3
\|\ \ \
\| * \ \	Merge pull request #8023 from bbodenmiller/patch-4	Sytse Sijbrandij	2014-10-13	1	-3/+3
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	minor updates to mysql cleanup
\| \| * \| \|	minor updates to mysql cleanup	Ben Bodenmiller	2014-10-13	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* take -> make * correct incorrect details about when pool size was changed
* \| \| \| \|	Merge branch 'feature-oauth-refactoring' into 'master'	Dmitriy Zaporozhets	2014-10-13	7	-159/+187
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feature oauth refactoring same MR as gitlab/gitlab-ee!188 See merge request !1169
\| * \| \| \|	Refactor OAuth refactorings to CE	Jan-Willem van der Meer	2014-10-10	7	-159/+187
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #8020 from mr-vinn/note-trunc-link	Dmitriy Zaporozhets	2014-10-13	3	-9/+110
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|	Improve event note display in dashboard and project activity views
\| * \| \|	Improve dashboard note view and add tests	Vinnie Okada	2014-10-12	3	-11/+78
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update the `#first_line_in_markdown` method so that the first line of parsed text is displayed more reliably, and the continuation indicators ("...") are displayed in all cases where the note is truncated. Also add Rspec tests for `EventsHelper#event_note`.
\| * \| \|	Preserve link href in truncated note view	Vinnie Okada	2014-10-12	2	-7/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Notes on the dashboard views are truncated to 150 characters; this change ensures that when a link's text is truncated it still points to the correct URL.
* \| \| \|	Merge pull request #8021 from bbodenmiller/schema.rb	Robert Schilling	2014-10-13	2	-4/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	simplify schema.rb reset in upgrade guides
\| * \| \| \|	simplify schema.rb reset in upgrade guides	Ben Bodenmiller	2014-10-12	2	-4/+2
\| \| \| \| \|
* \| \| \| \|	Merge pull request #7742 from bbodenmiller/patch-7	Sytse Sijbrandij	2014-10-13	1	-0/+68
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Cleanup MySQL database
\| * \| \| \|	Cleanup MySQL database	Ben Bodenmiller	2014-10-12	1	-0/+68
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Addresses changes made to installation guide and config files but never applied in update process. Relevant changes to installation guide and config files were made in gitlabhq@cbb5b00, gitlabhq@498a4e6, gitlabhq@c33d5e1, gitlabhq@485162e#diff-e1059d0fa0437ffad94facff86210603, gitlabhq@72e2fe2#diff-d1b4ff7de834bae6008dd49550413a6f, gitlabhq@5163a8f#diff-e1059d0fa0437ffad94facff86210603, gitlabhq@993af5d#diff-e1059d0fa0437ffad94facff86210603, & gitlabhq@d3f5a0c.
* \| \| \| \|	Merge branch 'ambiguous-sha' into 'master'fondev	Dmitriy Zaporozhets	2014-10-12	21	-27/+48
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix ambiguous sha problem with mentioned commit Before: write in database only 6 chars of commit sha. This cause to `Ambiguous SHA1 prefix` exception. - [x] write full commit sha in db. - [x] Standardise usage of sha truncation: 8 characters everywhere. - [x] prevent exception when ambiguous sha requested in markdown Fixes #1644 See merge request !1171
\| * \| \| \|	Fix tests	Dmitriy Zaporozhets	2014-10-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Fix spinach tests	Dmitriy Zaporozhets	2014-10-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Dontr decoarate already decorated stuff	Dmitriy Zaporozhets	2014-10-10	1	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Fix tests	Dmitriy Zaporozhets	2014-10-10	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Use 8chars short sha for commit in views	Dmitriy Zaporozhets	2014-10-10	5	-5/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Dont raise exception when wrong commit id passed	Dmitriy Zaporozhets	2014-10-10	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Use full commit sha width for reference in note body to prevent Ambiguous ↵	Dmitriy Zaporozhets	2014-10-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	SHA1 prefix problem Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Use short_id instead of [0..N] for short version of commit sha	Dmitriy Zaporozhets	2014-10-10	15	-21/+28
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Dmitriy Zaporozhets	2014-10-12	2	-0/+30
\|\ \ \ \
\| * \ \ \	Merge branch 'bug_with_apostrophe' into 'master'	Dmitriy Zaporozhets	2014-10-12	2	-0/+30
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bug with apostrophe when at mentioning users This fixes the situation where mentioning user with apostrophe at the end causes a link to issue 39 if the project has that issue, so `@marin` would look like `@marin's`. Fixes #1034 See merge request !1165
\| \| * \| \| \|	Add a comment why this is done.	Marin Jankovski	2014-10-10	1	-0/+6
\| \| \| \| \| \|
\| \| * \| \| \|	Substitute right single quote back with apostrophe.	Marin Jankovski	2014-10-10	2	-2/+3
\| \| \| \| \| \|
\| \| * \| \| \|	Add a test for apostrophe in code blocks.	Marin Jankovski	2014-10-09	1	-0/+8
\| \| \| \| \| \|
\| \| * \| \| \|	Replace apostrophe with right single quote to avoid markdown interpretation ↵	Marin Jankovski	2014-10-09	2	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	as issue 39.
\| \| * \| \| \|	Failing test for apostrophe at the end of user mention on project with issue ↵	Marin Jankovski	2014-10-09	1	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	iid 39.
* \| \| \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Dmitriy Zaporozhets	2014-10-12	1	-3/+3
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Merge pull request #7915 from bbodenmiller/patch-12	Sytse Sijbrandij	2014-10-12	1	-3/+3
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	improve wording on protected branches page
\| \| * \| \| \| \|	improve wording on protected branches page	Ben Bodenmiller	2014-10-12	1	-3/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'enabling_markdown_pipelines_from_gitlab' into 'master'	Dmitriy Zaporozhets	2014-10-12	3	-8/+30
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enabling markdown pipelines from gitlab Define which markdown pipelines are used in GitLab from application instead from gem. See merge request !1164
\| * \| \| \| \| \|	Make sure relative url and asset_host are honored, specs.	Marin Jankovski	2014-10-10	3	-3/+20
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Bump html-pipeline-gitlab gem version	Marin Jankovski	2014-10-10	1	-2/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Enable markdown pipeline filters from inside gitlab.	Marin Jankovski	2014-10-09	1	-8/+11
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Add more stuff to changelog	Dmitriy Zaporozhets	2014-10-10	1	-0/+6
\| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \|	Merge branch 'ssl_ciphers' into 'master'	Dmitriy Zaporozhets	2014-10-10	1	-4/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ssl ciphers update See merge request !1168
\| * \| \| \| \|	Add a comment on why we are using backward compatible ciphers.	Marin Jankovski	2014-10-10	1	-3/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Revert "update ssl_ciphers"	Marin Jankovski	2014-10-10	1	-1/+1
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit c41e5f5018d059a9c57d2c19088e6c274cc60e10.
* \| \| \| \|	Merge pull request #8004 from mr-vinn/rm-task-method	Marin Jankovski	2014-10-10	1	-7/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused method
\| * \| \| \| \|	Remove unused method	Vinnie Okada	2014-10-09	1	-7/+0
\|/ / / / /
* \| \| \| \|	Merge branch 'annotate' into 'master'	Dmitriy Zaporozhets	2014-10-09	29	-219/+264
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Annotate See merge request !1167
\| * \| \| \| \|	annotate	Valery Sizov	2014-10-09	29	-219/+264
\|/ / / / /