home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-27 05:26:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,755 Commits 48 Branches 340 Tags
22bf844869bde4e480d981b2f267bc692e701eb4
Commit Graph
18755 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Valery Sizov 22bf844869 fix specs. Stage 3 2015-09-15 13:50:24 +03:00
Kamil Trzcinski 9a3d0f1d92 Add rake task to migrate CI tags 2015-09-15 00:29:20 +02:00
Dmitriy Zaporozhets ebd06d7e7d Make small ui fixes for CI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-14 21:00:06 +02:00
Valery Sizov 910bf96ec3 fix specs. Stage 2 2015-09-14 18:14:17 +03:00
Valery Sizov a399fe32e8 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 16:49:03 +03:00
Valery Sizov 2c4daf1a68 fix part of specs 2015-09-14 16:48:33 +03:00
Kamil Trzcinski f31d8ef287 Merge commit '4c53cc0ebac36560d806732ff1fefba9206c75f3' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 
* commit '4c53cc0ebac36560d806732ff1fefba9206c75f3':
  rubocop satisfy

Conflicts:
	app/controllers/ci/builds_controller.rb
	app/controllers/ci/commits_controller.rb
 2015-09-14 14:04:08 +02:00
Kamil Trzcinski 1ce85dc4e2 Fix navigation and header tile 
Remove redundant navigation on commits and builds page
 2015-09-14 14:03:02 +02:00
Kamil Trzcinski d0b9a6fca2 Make commits to hover when going to commits and builds 2015-09-14 14:02:16 +02:00
Kamil Trzcinski 81560ab259 Fix build triggers URL and slack notifications 2015-09-14 14:01:17 +02:00
Kamil Trzcinski d0019456cd Fix runners administration 2015-09-14 14:00:53 +02:00
Kamil Trzcinski 40ccef76c9 Fix h3 page titles for triggers, variables and web hooks 2015-09-14 14:00:20 +02:00
Kamil Trzcinski ec91340240 Remove duplicate notices 2015-09-14 13:59:19 +02:00
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
Valery Sizov 4c53cc0eba rubocop satisfy 2015-09-14 14:37:18 +03: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