Commit Graph
22224 Commits
Author SHA1 Message Date
Douwe Maan 528d2823e9 Remove unused Gitlab::Markdown#cached? method 2015-10-14 21:52:41 +02:00
Robert Speicher d7f2a656f9 Update highlight themes so they always have the correct colors 2015-10-14 15:39:02 -04:00
Robert Speicher 386b13d624 Allow highlight themes to override pre colors 2015-10-14 15:38:19 -04:00
Douwe Maan 925dc5925b Cache rendered contents of issues, MRs and notes 2015-10-14 21:29:35 +02:00
Robert Speicher fc0d92746d Prevent a JS error in MergeRequestTabs
When `window.location.hash` is pointing to a note, e.g. `#note_1234`,
`scrollToElement` would throw an error because a selector such as
`.commits #note_1234` doesn't exist, so `offset()` returned `undefined`.

This error would prevent subsequent calls from running, which caused the
loading spinner to never be hidden.

Now we ensure the selector returns a valid element before trying to
scroll to it.
2015-10-14 15:01:25 -04:00
Kamil Trzciński a3a80eac11 Merge branch 'show_pending_warning' into 'master'
Show warning when build is pending and there are not runners

This change is based on: !1530.

This resolves #2967.



See merge request !1573
2015-10-14 18:57:05 +00:00
Kamil Trzciński 45c0b74dc4 Merge branch 'predefined_build_variables' into 'master'
Add a few predefined variables to CI builds

This adds CI_BUILD_TAG, CI_BUILD_STAGE, CI_BUILD_NAME and CI_BUILD_TRIGGERED to build environment.

This change is based on: !1530 

See merge request !1572
2015-10-14 18:55:59 +00:00
Mike Kelly ddeb766e96 Remove some padding from code blocks
This creates a weird "leading indent" on the first line of code blocks, at least in Chrome 46, and ends up making the first row not line up nicely with everything else.
2015-10-14 18:42:59 +00:00
Douwe Maan 539de0dd81 Merge branch 'master' into rs-redactor-filter 2015-10-14 20:23:36 +02:00
Douwe Maan b093cb35d1 Use Gitlab::Markdown for Asciidoc and ReferenceExtractor pipelines 2015-10-14 20:18:49 +02:00
Valery Sizov 0b9273a283 Merge branch 'uploads_path_fix' into 'master'
Fix: Images cannot show when projects' path was changed

Fixes #1443

See merge request !1521
2015-10-14 18:02:23 +00:00
Kamil Trzcinski 0ff8975939 Fix cancel_all specs 2015-10-14 19:59:56 +02:00
Valery Sizov ffb99edc26 Merge branch 'revert_service_passwd' into 'master'
Revert "Improve invalidation of stored service password if the endpoint URL is changed"

This reverts commit b463975480.

See merge request !1595
2015-10-14 17:48:41 +00:00
Douwe Maan da9746e59a Enable caching of Gitlab::Markdown rendered result 2015-10-14 19:28:46 +02:00
Douwe Maan ed41333a6e Use Gitlab::Markdown.render with :pipeline option rather than different methods 2015-10-14 19:28:09 +02:00
Zeger-Jan van de WegandZeger-Jan van de Weg 8db063b579 Scalable way of requesting all repos 2015-10-14 19:11:09 +02:00
Zeger-Jan van de Weg 54e6c0045b Added three rake tasks for repository maintainance
Tasks added:
gitlab:git:repack
gitlab:git:gc
gitlab:git:prune
2015-10-14 19:11:09 +02:00
Valery Sizov b83a18a55c Revert "Improve invalidation of stored service password if the endpoint URL is changed"
This reverts commit b463975480.
2015-10-14 19:21:27 +03:00
Valery Sizov 2fb02f9252 Merge branch 'fix/improve_reset_service_password' into 'master'
Improve invalidation of stored service password if the endpoint URL is changed

A number of issues were found in !1490 and !1558 (triggered by support request 7395)

* It is not possible to set a new URL and a password at the same time (new password is ignored)
* An error occurs on the Service Templates admin pages (prop_updated? was referencing the service's project, which is not defined for templates)
* Passwords are reset on every save in Service Templates admin pages

This should fix these 3 issues by respectively:
* Differentiating a property that has been assigned a new value (regardless of the new value) and a property that has been assigned a new value that is different from the old one
* Providing an alternate implementation to detected updated properties, not relying on the service's project
* Filtering an empty password parameter passed to the Service Templates admin page like on the project service page

See merge request !1583
2015-10-14 16:01:35 +00:00
Zeger-Jan van de Weg 7248566632 Add changelog line to right release 2015-10-14 17:59:01 +02:00
Zeger-Jan van de Weg 9ec32b1cac Prefer Licence over Copying 2015-10-14 17:59:01 +02:00
Zeger-Jan van de Weg c5d97c7e37 COPYING is now also accepted as licence file
Fixes #2526
2015-10-14 17:59:01 +02:00
Valery Sizov 8f584d5f2c Fix: Images cannot show when projects' path was changed 2015-10-14 18:50:35 +03:00
Valery Sizov a2f0a3650b Merge remote-tracking branch 'origin/cernvcs_hide_passwrd' 2015-10-14 18:40:58 +03:00
Kamil Trzcinski d9ece71ef0 Fix specs 2015-10-14 17:38:26 +02:00
Kamil Trzcinski d9e2232f63 Fix warning sign 2015-10-14 17:29:18 +02:00
Kamil Trzcinski 16bfd9d31a Fix specs 2015-10-14 17:29:18 +02:00
Kamil Trzcinski 7af4f5215e Show warning if build doesn't have runners with specified tags or runners didn't connect recently
Slightly refactor runner status detection: moving it to Runner class

Signed-off-by: Kamil Trzcinski <ayufan@ayufan.eu>
2015-10-14 17:29:18 +02:00
Kamil Trzcinski 4d69c6a336 Refactor builds view 2015-10-14 17:28:38 +02:00
Kamil Trzcinski 09255eecd0 Remove ordering from :ci_commits relation 2015-10-14 17:28:38 +02:00
Kamil Trzcinski a957eca6f3 Added builds view 2015-10-14 17:28:38 +02:00
Kamil Trzcinski 5807419519 Use tag? instead of tag to indicate that this is boolean 2015-10-14 17:28:17 +02:00
Kamil Trzcinski 7b5ab3ded5 Added CI_BUILD_TAG, _STAGE, _NAME and _TRIGGERED to CI builds 2015-10-14 17:28:17 +02:00
Kamil Trzcinski 2d0fcb4de2 Fix spinach tests introduced by 07101cfab6 2015-10-14 17:27:29 +02:00
Valery Sizov 6c1faf4b33 Merge remote-tracking branch 'origin/inified_404_error' 2015-10-14 18:21:27 +03:00
Douwe Maan 4a5b77188e Participable doesn't need to know about Mentionable 2015-10-14 16:20:11 +02:00
Kamil Trzciński 3b93d37e78 Merge branch 'fix-retry-and-cancel' into 'master'
Fix retry and cancel for build

This fixes some regressions introduced by Commit Status API

See merge request !1586
2015-10-14 13:40:33 +00:00
Alex Lossent b463975480 Improve invalidation of stored service password if the endpoint URL is changed
It now allows to specify a password at the same time as the new URL, and works
on the service template admin pages.
2015-10-14 15:27:59 +02:00
Jacob Vosmaer a74915a4ad Always return HTML in git_not_found
This allows us to give a nice 404 for e.g. archive.zip.
2015-10-14 15:22:03 +02:00
Jacob Vosmaer 381ca79bfa Remove archive file sending spec
This is done by gitlab-git-http-server now.
2015-10-14 15:21:14 +02:00
Han Loong Liauw 1f92c22fec New snippet design for projects
Split out header into shared partial
Used action partials to have unique actions for shared and personal
snippets
changed back to created date in list view
Switched to using existing color classes
2015-10-14 23:53:52 +11:00
Douwe Maan 07101cfab6 Merge branch 'fix_issue_2906' into 'master'
+ and Titleize New Project button on dashboard

Hello there. Its my first merge request in open source world. So please be tolerant to me if i do something wrong.

I try to fix https://gitlab.com/gitlab-org/gitlab-ce/issues/2906

See merge request !1564
2015-10-14 12:14:31 +00:00
Douwe Maan 61d8f96176 Fix specs 2015-10-14 13:46:17 +02:00
Douwe Maan d10e3c4498 Merge branch 'master' into filter-label 2015-10-14 13:23:01 +02:00
Valery Sizov 4117d9b310 Merge branch 'feature/api_hide_service_password' of gitlab.com:cernvcs/gitlab-ce 2015-10-14 14:15:34 +03:00
Kamil Trzcinski 33c9d6e45c Fix retry and cancel for build 2015-10-14 12:56:52 +02:00
Douwe Maan 3a69dd20a1 Allow dashboard and group issues/MRs to be filtered by label 2015-10-14 12:33:39 +02:00
Jacob Vosmaer 8f14332625 Remove RepositoryArchiveWorker specs
These tasks have shifted to gitlab_git and gitlab-git-http-server.
2015-10-14 12:19:02 +02:00
Jacob Vosmaer fc94b3b036 Fix API archive specs 2015-10-14 12:13:17 +02:00
Han Loong Liauw a60853fda0 include created_at date in heading 2015-10-14 20:37:36 +11:00