home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 02:26:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
22224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets a8dd4d36e2 Fix build features specs 2015-09-11 12:52:56 +02:00
Douwe Maan 4f461fd45f Merge branch 'rs-fix-highlighting' into 'master' 
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
 2015-09-11 08:47:13 +00:00
Stan Hu 9995f0806b Import forked repositories asynchronously to prevent large repositories from timing out 
Use import_status to track async import status and give feedback to the user

Closes #2388
Closes #2400
 2015-09-11 00:34:04 -07:00
Robert Speicher a5bb85f8a2 Merge branch 'rescue-syntax-highlighting-errors-updated' into 'master' 
Add comments and clean up test for !1274

See merge request !1279
 2015-09-10 22:30:21 +00:00
Stan Hu 267687993a Add comments and clean up test for !1274 2015-09-10 14:24:10 -07:00
Robert Schilling 7904a751f4 Merge branch 'fix-rouge-warning-noise' into 'master' 
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
 2015-09-10 21:03:36 +00:00
Stan Hu e20529cec4 Bump rouge to 1.10.1 2015-09-10 13:38:43 -07:00
Robert Speicher e3c97ede96 RU-BO-COOOOOOOOP 2015-09-10 16:06:24 -04:00
Robert Speicher 19c0bf2723 Simplify syntax highlighting of new notes 2015-09-10 15:38:25 -04:00
Robert Speicher 4e54b82326 Apply syntax highlighting to Markdown previews 2015-09-10 15:38:24 -04:00
Robert Speicher 404a01ab14 Add specs for syntax_highlight JS 
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.
 2015-09-10 15:38:24 -04:00
Robert Speicher 7cbf5e4d18 Prevent result of SyntaxHighlightFilter being sanitized 2015-09-10 15:08:06 -04:00
Stan Hu 3223a2a5ae Bump rouge to 1.10 to remove warning noise and fix other syntax highlighting bugs 
Closes #2128

Closes #2433
 2015-09-10 11:51:48 -07:00
Robert Schilling b2f3d024c3 Merge branch 'fix-changelog' into 'master' 
Fix some CHANGELOG entries

Noticed a few things were off.

See merge request !1276
 2015-09-10 18:49:51 +00:00
Stan Hu 201f50b94f Fix some CHANGELOG entries 2015-09-10 11:45:46 -07:00
Robert Speicher 7abb744eb9 Merge branch 'rs-changelog' into 'master' 
Add missing 7.14.x CHANGELOG entries

[ci skip]

See merge request !1275
 2015-09-10 18:02:00 +00:00
Robert Speicher c86865c1cf Add missing 7.14.x CHANGELOG entries 2015-09-10 13:59:27 -04:00
Robert Schilling b8c05a069b Merge branch 'rescue-syntax-highlighting-errors' into 'master' 
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
 2015-09-10 17:45:59 +00:00
Stan Hu 0a2c7fcc64 Merge pull request #9604 from bpetheo/bpetheo_add_service_api_endpoint_to_retrive_service_parameters 
Added service API endpoint to retrieve service parameters
 2015-09-10 10:40:37 -07:00
Petheo Bence 9bda4b8d88 Added service API endpoint to retrieve service parameters 2015-09-10 18:22:57 +02:00
Stan Hu 9d3344adbb Gracefully handle errors in syntax highlighting by leaving the block unformatted 
Closes #2433
 2015-09-10 09:16:27 -07:00
Dmitriy Zaporozhets 9a9417ee8e Fix more tests 2015-09-10 18:12:14 +02:00
Dmitriy Zaporozhets dc2e38e56d Config does not exists any more 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-10 17:27:17 +02:00
Dmitriy Zaporozhets c1de46dbc7 Fix project pages for authorized user 2015-09-10 17:14:55 +02:00
Dmitriy Zaporozhets 4e7b47dde1 Convert ci features specs to v3 2015-09-10 16:56:21 +02:00
Valery Sizov e5042137db Merge branch 'ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g' of gitlab.com:gitlab-org/gitlab-ce into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-09-10 17:55:36 +03:00
Valery Sizov 6db2843bc2 fix of project creation 2015-09-10 17:54:09 +03:00
Dmitriy Zaporozhets 762a23f268 Remove CI css that exists in GitLab 2015-09-10 16:37:04 +02:00
Valery Sizov f5af4efabd fix runners page 2015-09-10 17:05:43 +03:00
Dmitriy Zaporozhets 9d93c567b3 Fix part of CI api tests 2015-09-10 16:04:06 +02:00
Dmitriy Zaporozhets bf8013f1a4 Fix most of project specs 2015-09-10 15:56:33 +02:00
Dmitriy Zaporozhets 59c3a3239f Fix commit specs 2015-09-10 15:52:52 +02:00
Dmitriy Zaporozhets 10b3c85e2c Fix some issues with ci models specs 2015-09-10 15:47:15 +02:00
Dmitriy Zaporozhets 1c3c3ba512 Merge branch 'ui-improvements' into 'master' 
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
 2015-09-10 12:34:24 +00:00
Douwe Maan a6997e339b Merge branch 'master' into dashboard-titles 2015-09-10 13:13:01 +01:00
Dmitriy Zaporozhets 059b8828d3 Style syntax highlight area for white theme 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-10 13:36:42 +02:00
Dmitriy Zaporozhets b08c5521f5 Style blob show page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-10 13:25:09 +02:00
Dmitriy Zaporozhets df51b029ab Improve project fork page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-10 13:14:25 +02:00
Valery Sizov 381180bc27 remove gitlab_ci config 2015-09-10 13:42:41 +03:00
Dmitriy Zaporozhets 6933da1ee0 Refactor md variables 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-10 12:38:07 +02:00
Dmitriy Zaporozhets 86ef2eb728 Conver forked from button to text 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-10 12:35:37 +02:00
Dmitriy Zaporozhets dadf6daac4 Merge branch 'disable-issue-autofill' into 'master' 
Turned off autocomplete for new issue titles

See merge request !1271
 2015-09-10 10:17:53 +00:00
Dmitriy Zaporozhets 32208c501a Merge branch 'fix-semaphore-twitter-identity-issue' into 'master' 
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
 2015-09-10 10:13:21 +00:00
Douwe Maan d7501c7bb9 Fix sudo_gitlab helper 2015-09-10 09:25:41 +01:00
Dmitriy Zaporozhets af3b6f6362 Fix fixed layout 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-10 09:52:02 +02:00
Stan Hu 253bc0ca15 Fix test 2015-09-10 00:19:53 -07:00
Robert Speicher 25f684e81d Merge pull request #9617 from dukex/patch-1 
Fix 7.14 stable branch name in upgrade docs

[ci skip]
 2015-09-09 18:36:05 -07:00
Duke 19cba632d8 fix 7.14 stable branch name 2015-09-09 21:20:51 -03:00
Dmitriy Zaporozhets a0359fbd77 Improve accounts page UI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-10 00:34:09 +02:00
Dmitriy Zaporozhets 4f0a9beb53 Merge branch 'ui-improvements' into 'master' 
Ui improvements

* allow containers without bg and border
* style twbs panels

See merge request !1270
 2015-09-09 22:21:38 +00:00