home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 15:46:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
17,995 Commits 48 Branches 340 Tags
764124c38096ff29a00a0fefbc1a279a32f1bca7
Commit Graph
240 Commits
Author SHA1 Message Date
Valery Sizov 6353ca9ae8 Revert "Update noteable after a new note is added" 
This reverts commit fbdaf0e2a5.
 2015-08-05 12:00:12 +03:00
Robert Speicher 4e22dcb6a3 Add spec to RelativeLinkFilter for Unicode filenames 2015-07-30 17:25:07 -04:00
Sven Strickroth 5eeab9f0a6 GoogleCode importer: Do not care about casing of image file extensions 
Signed-off-by: Sven Strickroth <email@cs-ware.de>
 2015-07-20 00:53:43 +02:00
Dmitriy Zaporozhets f40b99d02e Merge branch 'master' into rubocop-for-tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	spec/features/issues_spec.rb
	spec/models/forked_project_link_spec.rb
	spec/models/hooks/service_hook_spec.rb
	spec/models/hooks/web_hook_spec.rb
	spec/models/project_services/hipchat_service_spec.rb
	spec/requests/api/project_members_spec.rb
	spec/requests/api/projects_spec.rb
	spec/requests/api/system_hooks_spec.rb
	spec/services/archive_repository_service_spec.rb
	spec/support/matchers.rb
	spec/tasks/gitlab/backup_rake_spec.rb
 2015-06-23 10:44:03 +02:00
Stan Hu 52aa21b12d Fix Style/IndentationWidth cop violations 2015-06-22 22:25:40 -07:00
Stan Hu 3446bea719 Fix Style/CaseIndentation cop violations 2015-06-22 22:25:21 -07:00
Stan Hu 359ed48638 Fix Style/AlignHash cop violations 2015-06-22 22:24:39 -07:00
Robert Speicher 15a05be70d Fix Style/Blocks cop violations 2015-06-22 16:00:54 -04:00
Robert Speicher 94eff65569 Fix Style/SpaceInsideHashLiteralBraces cop violations 
These fixes were performed automatically by Rubocop's `-a` flag.
 2015-06-22 14:41:00 -04:00
Robert Speicher 56246b70fb Fix Style/TrailingBlankLines cop violations 2015-06-22 14:38:33 -04:00
Robert Speicher 649c9969ba Fix Style/IndentationConsistency cop violations 2015-06-22 14:33:01 -04:00
Dmitriy Zaporozhets cf259cdb43 Remove unnecessary whitespace between let and ( 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-22 14:39:07 +02:00
Robert SpeicherandDmitriy Zaporozhets e4e01dbf41 Fix Gitlab::OAuth::User spec 2015-06-22 12:13:49 +02:00
Robert SpeicherandDmitriy Zaporozhets bf71d53f63 Change to_not calls to not_to 
Both work, but now we're consistent across the entire app.
 2015-06-22 12:13:49 +02:00
Robert SpeicherandDmitriy Zaporozhets 0f627f1c60 Fix raise_error without an argument deprecation warnings 2015-06-22 12:13:47 +02:00
Robert SpeicherandDmitriy Zaporozhets 5a9ede4721 Update mock and stub syntax for specs 2015-06-22 12:13:46 +02:00
Stan Hu 62079d7654 Add init test for ProjectSearchResults 
See: https://github.com/gitlabhq/gitlabhq/pull/9368#issuecomment-110350335
 2015-06-18 10:35:48 -07:00
Alex Lossent d96d9aae42 Fix behavior of ldap_person method in Gitlab::OAuth::User 
Code tweaks in 45e9150a caused the ldap_person method to not return expected results.
Improved tests to cover the ldap_person method, which was previously stubbed.
 2015-06-17 18:06:27 +02:00
Dmitriy Zaporozhets 7300729190 Merge branch 'rs-dev-issue-2228' into 'master' 
Allow user to customize default Dashboard page

Renames the "Design" profile page to "Preferences" and adds a field to customize the default Dashboard page:

> ![Screen_Shot_2015-06-11_at_11.12.53_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b5282a3be7861d1148528c6bc9e7a0e0/Screen_Shot_2015-06-11_at_11.12.53_PM.png)

See merge request !778
 2015-06-15 11:29:36 +00:00
Dmitriy Zaporozhets 5c6d83b8e7 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-14 12:46:22 +02:00
Dmitriy Zaporozhets b645f0f432 Merge pull request #9340 from jvanbaarsen/update-noteable 
Update noteable after a new note is added
 2015-06-14 12:46:07 +02:00
Robert Speicher 422236c71e Change foo.should syntax to expect(foo).to in specs 2015-06-13 18:37:30 -04:00
Robert Speicher 75a40ad5bc Change foo.should_not syntax to expect(foo).not_to in specs 2015-06-13 18:19:24 -04:00
Robert Speicher 844d72716e Add Gitlab::Themes module; remove Gitlab::Theme 
Now we can simply loop through all themes, among other things.

This also removes the `dark_theme` / `light_theme` classes and the
`theme_type` helper, since they weren't used anywhere.
 2015-06-13 17:58:16 -04:00
Jeroen van Baarsen fbdaf0e2a5 Update noteable after a new note is added 
**What does this do?**
It makes sure that whenever a new note is added to an noteable item, the
updated_at of that item is also updated.

**Why is this needed?**
At this moment when you post a comment on an issue or add a label to an issue,
the updated_at is not changed. Because of this the filtering for least recently
updated is not really useful (since it only takes in account the original text
from the noteable).

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-06-05 15:22:55 +02:00
Douwe Maan 3f59a8f0be Merge branch 'cernvcs/gitlab-ce-feature/auto_link_ldap_omniauth' 2015-06-05 13:34:25 +02:00
Dmitriy Zaporozhets 9287865599 Merge branch 'fix-upgrader-script' into 'master' 
Fix upgrader script

This is a fix for upgrader script not guessing the latest version correctly.

Upgrader now handles versions where a version part (major/minor/patch) can have multi-digit number, also ensures that the latest version is chosen from git tags by converting tag to Gitlab::VersionInfo and than selecting the latest/greatest version.

Fixes: #1476

See merge request !695
 2015-06-04 16:01:13 +00:00
Alex Lossent dfcea8ed51 Add option to automatically link omniauth and LDAP identities 
Until now, a user needed to first sign in with his LDAP identity and then manually
link his/her account with an omniauth identity from their profile.
Only when this is done can the user authenticate with the omniauth provider and at
the same time benefit from the LDAP integration (HTTPS authentication with LDAP
username/password and in EE: LDAP groups, SSH keys etc.).
This feature automates the process by looking up a corresponding LDAP person when a
user connects with omniauth for the first time and then automatically linking the LDAP
and omniauth identities (of course, like the existing allow_single_sign_on setting,
this is meant to be used with trusted omniauth providers).
The result is identical to a manual account link.

Add config initializers for other omniauth settings.
 2015-06-03 11:46:20 +02:00
Dmitriy Zaporozhets 79aac2c128 Merge branch 'ignore-references' into 'master' 
Don't notify users mentioned in code blocks or blockquotes.

cc @rspeicher

See merge request !753
 2015-06-02 18:39:18 +00:00
Robert Speicher 9e7a9c63a5 Further limit the limited whitelist for project/group descriptions 2015-06-02 13:41:12 -04:00
Robert Speicher 79c4e3899f Rename ReferenceFilterSpecHelper to FilterSpecHelper 
And make it more generalized for all filter specs.
 2015-06-02 13:27:53 -04:00
Robert Speicher 023dd2907b Add a pipeline context option for SanitizationFilter 
When this option is `:description`, we use a more restrictive whitelist.
This is used for Project and Group description fields.
 2015-06-02 13:04:10 -04:00
Douwe Maan 94919c7ef6 Ignore references in blockquotes. 2015-06-02 13:17:21 +02:00
Douwe Maan fe78984f20 Actually ignore references in code blocks etc. 2015-06-02 13:17:11 +02:00
Martins Polakovs 6181160504 Update mocking/stubbing syntax to the new RSpec 3 syntax 2015-05-30 19:15:10 +03:00
Robert Speicher 7424d2fa5b Add ExternalLinkFilter to Markdown pipeline 
Forces a `rel="nofollow"` attribute on all external links.
 2015-05-27 15:39:08 -04:00
Robert Speicher 2c1bf71793 Fix ClosingIssueExtractor specs 2015-05-26 15:55:26 -04:00
Robert Speicher 5a9c5520d9 Make use of to_reference in more specs 2015-05-26 15:49:22 -04:00
Robert Speicher 81a09bc74c Support only double quotes for multi-word label references 2015-05-26 15:49:20 -04:00
Robert Speicher 94af050117 Use to_reference in reference filter specs 2015-05-26 15:48:32 -04:00
Robert Speicher 136ab73803 Update CommitRange#to_reference to use full SHAs 
We only want them shortened by the filter, which calls to_s
 2015-05-26 15:48:31 -04:00
Dmitriy Zaporozhets 08102ad748 Merge branch 'rs-issue-1690' into 'master' 
Better handle label references that aren't actually references

Fixes #1690

See merge request !705
 2015-05-26 14:35:54 +00:00
Robert Speicher b263a33c80 Better handle label references that aren't actually references 
Fixes #1690
 2015-05-25 16:06:34 -04:00
Martins Polakovs cfc9bff45e Fix upgrader script 2015-05-23 13:11:23 +03:00
Stan Hu 3b22cfe600 Remove Rack Attack monkey patches and bump to version 4.3.0 2015-05-22 16:25:03 -04:00
Robert Speicher 8ee382087d Subclass TaskList::Filter to fix a bug 
Instead of using a fork, we subclass the filter and only apply the
`task-list` class to list items that actually are task lists.

Closes #1645

See https://github.com/github/task_list/pull/60
 2015-05-20 12:08:33 -04:00
Jakub Jirutka b0659c1b07 Simplify and unify helpers for rendering markup 2015-05-18 22:52:13 +02:00
Jakub Jirutka daa0925016 Rename MarkdownHelper to MarkupHelper 2015-05-18 22:51:56 +02:00
Jakub Jirutka 8dbc4746fe Handle AsciiDoc better, reuse HTML pipeline filters (fixes #9263) 2015-05-18 20:48:03 +02:00
Robert Speicher 7f2fb72a0a Minor RelativeLinkFilter cleanup 2015-05-13 14:08:37 -04:00