summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix models/ci/web_hook_spec.rbKamil Trzcinski2015-09-151-1/+1
|
* Fix: models/ci/project_spec.rbKamil Trzcinski2015-09-152-47/+7
|
* Fix: services/ci/create_project_service_spec.rbKamil Trzcinski2015-09-151-14/+12
|
* Fix: models/ci/mail_service_spec.rbKamil Trzcinski2015-09-151-33/+18
|
* Fix: models/ci/build_spec.rbKamil Trzcinski2015-09-151-1/+1
|
* Fix: helpers/ci/runners_helper_spec.rbKamil Trzcinski2015-09-151-6/+6
|
* Fix: helpers/ci/application_helper_spec.rbKamil Trzcinski2015-09-151-3/+3
|
* Fix: features/ci/triggers_spec.rbKamil Trzcinski2015-09-151-2/+4
|
* Fix: features/ci/triggers_spec.rbKamil Trzcinski2015-09-151-2/+4
|
* Fix: features/ci/runners_spec.rbKamil Trzcinski2015-09-153-12/+19
|
* Fix: features/ci/projects_spec.rbKamil Trzcinski2015-09-151-10/+13
|
* Refactor ci_admin_event and fix features/ci/events_spec.rbKamil Trzcinski2015-09-153-4/+4
|
* Fix: ci_*_build factory should be validKamil Trzcinski2015-09-151-0/+2
|
* Fix ci/projects_controller_spec.rbKamil Trzcinski2015-09-151-27/+9
|
* Use GitLab instead of GITLAB for rake taskKamil Trzcinski2015-09-151-1/+1
|
* Remove unused tasksKamil Trzcinski2015-09-152-20/+0
|
* Cleanup CI backup => migrate with GitLabKamil Trzcinski2015-09-157-346/+55
|
* fix specs. Stage 7Valery Sizov2015-09-1523-402/+406
|
* fix specs. Stage 6Valery Sizov2015-09-158-144/+148
|
* fix specs. Stage 5Valery Sizov2015-09-1516-74/+72
|
* fix specs. Stage 4Valery Sizov2015-09-156-36/+31
|
* fix specs. Stage 3Valery Sizov2015-09-155-82/+106
|
* Add rake task to migrate CI tagsKamil Trzcinski2015-09-153-1/+84
|
* Make small ui fixes for CIDmitriy Zaporozhets2015-09-147-18/+20
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* fix specs. Stage 2Valery Sizov2015-09-145-101/+32
|
* Merge branch 'ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g' of ↵Valery Sizov2015-09-1422-54/+60
|\ | | | | | | gitlab.com:gitlab-org/gitlab-ce into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
| * Merge commit '4c53cc0ebac36560d806732ff1fefba9206c75f3' into ↵Kamil Trzcinski2015-09-1428-190/+190
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Fix navigation and header tileKamil Trzcinski2015-09-1411-20/+45
| | | | | | | | | | | | Remove redundant navigation on commits and builds page
| * | Make commits to hover when going to commits and buildsKamil Trzcinski2015-09-141-1/+1
| | |
| * | Fix build triggers URL and slack notificationsKamil Trzcinski2015-09-142-3/+3
| | |
| * | Fix runners administrationKamil Trzcinski2015-09-141-1/+1
| | |
| * | Fix h3 page titles for triggers, variables and web hooksKamil Trzcinski2015-09-143-3/+5
| | |
| * | Remove duplicate noticesKamil Trzcinski2015-09-142-7/+1
| | |
| * | Fix navigationKamil Trzcinski2015-09-143-4/+4
| | |
| * | Remove unused user_sessionsKamil Trzcinski2015-09-141-15/+0
| | |
* | | fix part of specsValery Sizov2015-09-143-98/+100
| |/ |/|
* | rubocop satisfyValery Sizov2015-09-1428-190/+190
|/
* Revert "monkey patch of Hash"Kamil Trzcinski2015-09-141-15/+0
| | | | This reverts commit 6014019ed49295178ebd0c4ce5f6f1d210219420.
* Fix IOError when fetching a new build by runnerKamil Trzcinski2015-09-141-1/+8
|
* monkey patch of HashValery Sizov2015-09-141-0/+15
|
* Merge branch 'ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g' of ↵Valery Sizov2015-09-14184-2641/+1702
|\ | | | | | | gitlab.com:gitlab-org/gitlab-ce into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
| * Fix 500 when search for gitlab projectsDmitriy Zaporozhets2015-09-114-12/+7
| |
| * Use GitLab UI when render CIDmitriy Zaporozhets2015-09-1130-1337/+1182
| |
| * Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets2015-09-1154-167/+514
| |\ | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * Merge branch 'rs-fix-highlighting' into 'master'Douwe Maan2015-09-115-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-highlightingRobert Speicher2015-09-101-1/+1
| | | |
| | | * Simplify syntax highlighting of new notesRobert Speicher2015-09-101-2/+3
| | | |
| | | * Apply syntax highlighting to Markdown previewsRobert Speicher2015-09-101-0/+1
| | | |
| | | * Add specs for syntax_highlight JSRobert Speicher2015-09-102-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 sanitizedRobert Speicher2015-09-101-4/+8
| | | |
View Lorry Controller Status