Commit Graph
4716 Commits
Author SHA1 Message Date
Kamil Trzcinski 874166d80f Fix models/ci/web_hook_spec.rb 2015-09-15 22:01:31 +02:00
Kamil Trzcinski 8d5c9935ff Fix: models/ci/project_spec.rb 2015-09-15 22:00:17 +02:00
Kamil Trzcinski 209c72c4a1 Fix: services/ci/create_project_service_spec.rb 2015-09-15 21:53:04 +02:00
Kamil Trzcinski 345ff6cbf9 Fix: models/ci/mail_service_spec.rb 2015-09-15 21:47:01 +02:00
Kamil Trzcinski d495e4dff6 Fix: models/ci/build_spec.rb 2015-09-15 21:31:29 +02:00
Kamil Trzcinski 10cf1050d0 Fix: helpers/ci/runners_helper_spec.rb 2015-09-15 21:27:10 +02:00
Kamil Trzcinski 5f315bd565 Fix: helpers/ci/application_helper_spec.rb 2015-09-15 21:24:57 +02:00
Kamil Trzcinski 6cc15cf721 Fix: features/ci/triggers_spec.rb 2015-09-15 21:23:45 +02:00
Kamil Trzcinski 64ef1b3dcd Fix: features/ci/triggers_spec.rb 2015-09-15 21:22:51 +02:00
Kamil Trzcinski 5285e01d54 Fix: features/ci/runners_spec.rb 2015-09-15 21:21:46 +02:00
Kamil Trzcinski 9621f433a7 Fix: features/ci/projects_spec.rb 2015-09-15 21:06:12 +02:00
Kamil Trzcinski a598bd91f9 Refactor ci_admin_event and fix features/ci/events_spec.rb 2015-09-15 20:56:20 +02:00
Kamil Trzcinski 6d0980b011 Fix: ci_*_build factory should be valid 2015-09-15 20:51:03 +02:00
Kamil Trzcinski 8549d709fb Fix ci/projects_controller_spec.rb 2015-09-15 20:40:52 +02:00
Kamil Trzcinski ed18e04bb3 Cleanup CI backup => migrate with GitLab 2015-09-15 20:14:21 +02:00
Valery Sizov b87ca7500f fix specs. Stage 7 2015-09-15 17:43:17 +03:00
Valery Sizov 88b3195ecf fix specs. Stage 6 2015-09-15 16:29:36 +03:00
Stan Hu d3d03d1362 Create a "destroyed Milestone" event and keep Milestone events around in the DB
for posterity.

Also fix issue where destroying a Milestone would cause odd, transient messages like
"created milestone" or "imported milestone".

Add "in" preposition when creating and destroying milestones

Closes #2382
2015-09-15 05:51:11 -07:00
Valery Sizov e2cbb36ba9 fix specs. Stage 5 2015-09-15 15:51:03 +03:00
Valery Sizov 16ba41a186 fix specs. Stage 4 2015-09-15 14:45:59 +03:00
Valery Sizov 22bf844869 fix specs. Stage 3 2015-09-15 13:50:24 +03:00
Dmitriy Zaporozhets b35d5a6a16 Merge branch 'public_profiles' into 'master'
Make all group public

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1219#

Internal issue - https://dev.gitlab.org/gitlab/gitlabhq/issues/1361

See merge request !1247
2015-09-14 15:28:42 +00:00
Valery Sizov 910bf96ec3 fix specs. Stage 2 2015-09-14 18:14:17 +03:00
Dmitriy Zaporozhets c0c314c6bf Merge branch 'forked-repo-creation-async' into 'master'
Import forked repositories asynchronously to prevent large repositories from timing out

Preserve synchronous mode of adding a repository since some tasks (e.g. restore/check) require the former.

One side bug fix is that the `ProjectCacheWorker` is also run, updating the repository size and commit numbers properly. Previously all the values were set to 0 when a project were forked.

* Closes #2388
* Closes #2400

See merge request !1231
2015-09-14 14:56:13 +00:00
Valery Sizov 2c4daf1a68 fix part of specs 2015-09-14 16:48:33 +03:00
Dmitriy Zaporozhets db197aa61a Fix tests and improve wording 2015-09-14 14:16:08 +02:00
Valery Sizov 4c53cc0eba rubocop satisfy 2015-09-14 14:37:18 +03:00
Dmitriy Zaporozhets 66840f03cc Fix tests for group access 2015-09-14 12:15:11 +02:00
Dmitriy Zaporozhets 5fcfba2780 Merge branch 'dashboard-titles' into 'master'
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
2015-09-11 14:36:56 +00: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 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
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
Stan Hu 267687993a Add comments and clean up test for !1274 2015-09-10 14:24:10 -07: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 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
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 4e7b47dde1 Convert ci features specs to v3 2015-09-10 16:56:21 +02: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
Douwe Maan a6997e339b Merge branch 'master' into dashboard-titles 2015-09-10 13:13:01 +01:00
Douwe Maan 0d41b2dd87 Merge branch 'fix-emojis-relative-url' into 'master'
Fix emoji URLs in Markdown when relative_url_root is used

Path/URL helpers (e.g. `asset_url_helper`) already include the relative_url_root, so there is no need to attach it twice.

Also adds the ability to run rspecs with relative_url_defined on the enviornment. For example:

RELATIVE_URL_ROOT=/gitlab rspec

Closes #1728

See merge request !1254
2015-09-09 14:53:14 +00:00