home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-25 20:46:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,741 Commits 48 Branches 340 Tags
09bd8a8b0dbaed79e2a2b8b2416fe80809df8918
Commit Graph
18741 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Kamil Trzcinski 09bd8a8b0d Fix navigation 2015-09-14 13:58:38 +02:00
Kamil Trzcinski b15fcd4056 Remove unused user_sessions 2015-09-14 13:57:43 +02:00
Kamil Trzcinski 95037c9c55 Revert "monkey patch of Hash" 
This reverts commit 6014019ed4.
 2015-09-14 11:27:30 +02:00
Kamil Trzcinski 16e44ad7fc Fix IOError when fetching a new build by runner 2015-09-14 11:27:25 +02:00
Valery Sizov 6014019ed4 monkey patch of Hash 2015-09-14 12:06:52 +03:00
Valery Sizov 25149ce47e 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-14 11:16:56 +03:00
Valery Sizov ad5d2c3e78 fix of API 2015-09-14 11:15:54 +03:00
Dmitriy Zaporozhets 15eeae5fa8 Fix 500 when search for gitlab projects 2015-09-11 19:59:39 +02:00
Dmitriy Zaporozhets 2b683807b5 Use GitLab UI when render CI 2015-09-11 19:25:53 +02:00
Dmitriy Zaporozhets e3c30bf2e8 Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-11 16:32:11 +02:00
Dmitriy Zaporozhets cd606e1790 Remove kaminari views moved from CI 2015-09-11 14:43:51 +02:00
Dmitriy Zaporozhets ec8e2463db Remove db/ci 2015-09-11 14:38:34 +02:00
Dmitriy Zaporozhets 7ba5e4333b 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-11 14:33:03 +02:00
Dmitriy Zaporozhets ae83051ef9 Fix CI admin projects page 2015-09-11 13:43:37 +02:00
Valery Sizov 77bda265f4 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-11 14:41:26 +03:00
Valery Sizov d1914c1e1f admin fix 2015-09-11 14:40:57 +03:00
Dmitriy Zaporozhets 2ed2ef9210 Remove network from CI 2015-09-11 13:38:37 +02:00
Dmitriy Zaporozhets 187face620 CLeanup CI helpers since we dont use oauth any more 2015-09-11 13:15:18 +02:00
Dmitriy Zaporozhets ae5d2f5b31 Fix Ci::Ansi2html spec 2015-09-11 13:10:37 +02:00
Dmitriy Zaporozhets 0615de013d Fix ci commits features specs 2015-09-11 13:05:31 +02:00
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
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