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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| \| * \| \| \| \|	added note	karen Carias	2015-09-13	1	-1/+4
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'improve-error-message' into 'master'	Job van der Voort	2015-09-12	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve english of error message See merge request !1284
\| * \| \| \| \|	Improve english of error message	Robert Schilling	2015-09-12	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge branch 'dashboard-titles' into 'master'	Dmitriy Zaporozhets	2015-09-11	58	-202/+260
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean up overlap between dashboard and explore - Clean up overlap between dashboard and explore. ... 5d785457 - Split up SnippetsController into separate dashboard and explore sections. - Use consistent page titles, header titles and sidebars between dashboard and explore sections when signed in or not. - Consistently case `Back to X` links. 260fcd45 - Link to help from signin page bottom. d92696d3 - Make Help accessible for guests. c258e977 cc @dzaporozhets See merge request !1260
\| * \ \ \ \	Merge branch 'master' into dashboard-titlesdashboard-titles	Douwe Maan	2015-09-10	124	-482/+1792
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Fix help access spec	Douwe Maan	2015-09-09	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix snippets exploration test	Douwe Maan	2015-09-09	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix spec	Douwe Maan	2015-09-09	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix RootController	Douwe Maan	2015-09-09	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Use new routing helper	Douwe Maan	2015-09-08	8	-10/+10
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Move partial to right place and fix tests.	Douwe Maan	2015-09-08	6	-10/+10
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Clean up overlap between dashboard and explore.	Douwe Maan	2015-09-08	39	-171/+228
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Split up SnippetsController into separate dashboard and explore sections. - Use consistent page titles, header titles and sidebars between dashboard and explore sections when signed in or not.
\| * \| \| \| \| \|	Consistently case `Back to X` links.	Douwe Maan	2015-09-08	5	-7/+7
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Link to help from signin page bottom.	Douwe Maan	2015-09-08	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Make Help accessible for guests.	Douwe Maan	2015-09-08	2	-1/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'rs-fix-highlighting' into 'master'	Douwe Maan	2015-09-11	5	-7/+63
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Syntax highlighting improvements On the server side: During development I would occasionally see SanitizationFilter sanitizing the result of SyntaxHighlightFilter, even though its attributes were whitelisted. This updates the `clean_spans` transformer to return the whitelisted node as [suggested by the Sanitize docs](http://git.io/vZR8i). On the client side: - Makes the syntax_highlight JS more flexible - Adds JS specs - Simplifies highlighting of new notes - Adds highlighting to Markdown preview See merge request !1278
\| * \| \| \| \| \|	RU-BO-COOOOOOOOPrs-fix-highlighting	Robert Speicher	2015-09-10	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Simplify syntax highlighting of new notes	Robert Speicher	2015-09-10	1	-2/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Apply syntax highlighting to Markdown previews	Robert Speicher	2015-09-10	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add specs for syntax_highlight JS	Robert Speicher	2015-09-10	2	-1/+51
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also makes it work when given a parent element containing a `.js-syntax-highlight` element so for dynamically-added things like notes or Markdown previews, we can more accurately target just the element we care about.
\| * \| \| \| \| \|	Prevent result of SyntaxHighlightFilter being sanitized	Robert Speicher	2015-09-10	1	-4/+8
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'rescue-syntax-highlighting-errors-updated' into 'master'	Robert Speicher	2015-09-10	2	-3/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add comments and clean up test for !1274 See merge request !1279
\| * \| \| \| \| \| \|	Add comments and clean up test for !1274	Stan Hu	2015-09-10	2	-3/+2
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'fix-rouge-warning-noise' into 'master'	Robert Schilling	2015-09-10	3	-26/+3
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump rouge to 1.10.1 to remove warning noise and fix other syntax highlighting bugs rouge warnings begone! Closes #2128 Closes #2433 See merge request !1277
\| * \| \| \| \| \|	Bump rouge to 1.10.1	Stan Hu	2015-09-10	3	-27/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Bump rouge to 1.10 to remove warning noise and fix other syntax highlighting ↵	Stan Hu	2015-09-10	2	-2/+3
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	bugs Closes #2128 Closes #2433
* \| \| \| \| \|	Merge branch 'fix-changelog' into 'master'	Robert Schilling	2015-09-10	1	-3/+1
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix some CHANGELOG entries Noticed a few things were off. See merge request !1276
\| * \| \| \| \|	Fix some CHANGELOG entries	Stan Hu	2015-09-10	1	-3/+1
\|/ / / / /
* \| \| \| \|	Merge branch 'rs-changelog' into 'master'	Robert Speicher	2015-09-10	1	-3/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing 7.14.x CHANGELOG entries [ci skip] See merge request !1275
\| * \| \| \| \|	Add missing 7.14.x CHANGELOG entries	Robert Speicher	2015-09-10	1	-3/+8
\|/ / / / /
* \| \| \| \|	Merge branch 'rescue-syntax-highlighting-errors' into 'master'	Robert Schilling	2015-09-10	3	-1/+28
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Gracefully handle errors in syntax highlighting by leaving the block unformatted A bug in Rouge caused an Exception: ```undefined method `sub' for :Literal:Symbol``` That caused https://gitlab.com/embeddable-common-lisp/ecl/issues/156 to hit Error 500 and fail to display. If a failure occurs, just render the text as preformatted. Closes #2433 See merge request !1274
\| * \| \| \| \|	Gracefully handle errors in syntax highlighting by leaving the block unformatted	Stan Hu	2015-09-10	3	-1/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #2433
* \| \| \| \| \|	Merge pull request #9604 from ↵	Stan Hu	2015-09-10	5	-0/+190
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	bpetheo/bpetheo_add_service_api_endpoint_to_retrive_service_parameters Added service API endpoint to retrieve service parameters
\| * \| \| \| \|	Added service API endpoint to retrieve service parameters	Petheo Bence	2015-09-10	5	-0/+190
\|/ / / / /
* \| \| \| \|	Merge branch 'ui-improvements' into 'master'	Dmitriy Zaporozhets	2015-09-10	10	-80/+77
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	UI improvements * Convert forked from button to text * Refactor md variables * Improve project fork page * Style blob show page * Style syntax highlight area for white theme See merge request !1273
\| * \| \| \|	Style syntax highlight area for white themeui-improvements	Dmitriy Zaporozhets	2015-09-10	3	-34/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Style blob show page	Dmitriy Zaporozhets	2015-09-10	4	-10/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Improve project fork page	Dmitriy Zaporozhets	2015-09-10	2	-27/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Refactor md variables	Dmitriy Zaporozhets	2015-09-10	2	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Conver forked from button to text	Dmitriy Zaporozhets	2015-09-10	2	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \|	Merge branch 'disable-issue-autofill' into 'master'	Dmitriy Zaporozhets	2015-09-10	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Turned off autocomplete for new issue titles See merge request !1271
\| * \| \| \| \|	Turned off autocomplete for new issue titlesdisable-issue-autofill	Darby	2015-09-09	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fix-semaphore-twitter-identity-issue' into 'master'	Dmitriy Zaporozhets	2015-09-10	1	-2/+4
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update OmniAuth test to pass in Semaphore This has caused all the build failures on GitHub master for the last few days. This change seems to pass Semaphore build on GitHub: https://semaphoreci.com/stanhu/gitlabhq/branches/fix-semaphore-twitter-identity-issue-try2 Closes #2469 See merge request !1272
\| * \| \| \| \|	Fix test	Stan Hu	2015-09-10	1	-2/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Fix fixed layout	Dmitriy Zaporozhets	2015-09-10	1	-1/+1
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \|	Merge pull request #9617 from dukex/patch-1	Robert Speicher	2015-09-09	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix 7.14 stable branch name in upgrade docs [ci skip]
\| * \| \| \| \|	fix 7.14 stable branch name	Duke	2015-09-09	1	-1/+1
\|/ / / / /
* \| \| \| \|	Improve accounts page UI	Dmitriy Zaporozhets	2015-09-10	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \|	Merge branch 'ui-improvements' into 'master'	Dmitriy Zaporozhets	2015-09-09	9	-15/+62
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ui improvements * allow containers without bg and border * style twbs panels See merge request !1270
\| * \| \| \| \|	Fix last element of sidebar being hidden for small screens	Dmitriy Zaporozhets	2015-09-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>