home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-28 14:06:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
26,661 Commits 48 Branches 340 Tags
31e28ebcebc054eaeef2eddba64ff2ff7ca3104f
Commit Graph
4716 Commits
Author SHA1 Message Date
Steve Norman b3a751112d Allow user to be blocked and unblocked via the API 2015-07-03 11:17:57 +00:00
Stan Hu 3e738e3b9a Add support for unlocking users in admin settings 
Closes https://github.com/gitlabhq/gitlabhq/issues/9381
 2015-07-02 04:22:51 -07:00
Darby c611b6f623 Comment box/Placeholder text redo 2015-07-01 15:49:31 -07:00
Dmitriy Zaporozhets 2e6bbb12f8 Refactor can_be_merged logic for merge request 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-01 17:24:03 +02:00
Stan Hu 9add3e6eb5 Extract the longest-matching ref from a commit path when multiple matches occur 
Closes #1839
 2015-07-01 07:01:59 -07:00
Dmitriy Zaporozhets 2d85458ac7 Merge branch 'fix-zero-sha-lookup' into 'master' 
Repository#blob_at should return nil for 00000000... sha

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !916
 2015-07-01 09:30:43 +00:00
Dmitriy Zaporozhets 87df927f20 Merge branch 'reporter-manage-issues' into 'master' 
Reporter role can manage issue tracker now

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !908
 2015-07-01 09:19:56 +00:00
Dmitriy Zaporozhets baf12f45d8 Repository#blob_at should return nil for 00000000... sha 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-01 11:02:37 +02:00
Robert Speicher 42b643f057 Fix ApplicationHelper specs 
There were several specs that were failing when run by themselves.

- Use the `helper` object, as per RSpec 3 standards
- Use `assign` to assign instance variables that helpers expect
- Add `StubConfiguration` support module
 2015-06-30 17:47:53 -04:00
Robert Speicher 366799bbf1 Add spec/support/factory_girl 
Just for consistency with our Capybara, DatabaseCleaner, WebMock, etc.
setups.
 2015-06-30 17:47:53 -04:00
Dmitriy Zaporozhets a5b54f919a Reporter role can manage issue tracker now 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-30 13:33:02 +02:00
Dmitriy Zaporozhets 88162f6970 Merge branch 'fix-relative-submodule-namespace-path' into 'master' 
Fix Error 500 when relative submodule resolves to a namespace that has a different name from its path

### What does this MR do?

This MR fixes a bug in resolving a namespace when the `name` differed from `path`.

### Why was this MR needed?

The original code was using `name`, when the proper input to `namespace_project_path` was `path`.

### What are the relevant issue numbers?

Closes #1849

See merge request !864
 2015-06-29 14:04:04 +00:00
Robert Speicher f6503f71f9 Remove disableButtonIf[Any]EmptyField calls from forms 
These have been replaced by the "requiresInput" behavior.
 2015-06-26 22:07:59 -04:00
Robert Speicher e4472cee78 Add "Requires Input" JS behavior 2015-06-26 22:06:42 -04:00
Dmitriy Zaporozhets 9f166a8649 Merge branch 'rename-abilities' into 'master' 
Rename abilities to correspond contoller/model action names

write_ was renamed to create_
modify_  was renamed to update_

So now in update action we have next code

```
def create
  can?(current_user, :create_issue, @issue)
end

def update
  can?(current_user, :update_issue, @issue)
end
```

See merge request !896
 2015-06-26 16:39:17 +00:00
Dmitriy Zaporozhets 06ab7d89f9 Merge branch 'rs-issue-1887' into 'master' 
Reorder MergeRequestTabs constructor

The tab was being activated before we set the `[commits|diffs]Loaded`
variable, so even when the `/diffs` route is accessed directly, like
from the "Side-by-side" link, the tab was being loaded from its default
source.

Fixes #1887

See merge request !892
 2015-06-26 16:17:07 +00:00
Dmitriy Zaporozhets 342d553709 Rename abilities to correspond contoller/model action names 
write_ was renamed to create_
modify_  was renamed to update_

So now in update action we have next code

def create
  can?(current_user, :create_issue, @issue)
end

def update
  can?(current_user, :update_issue, @issue)
end

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-26 15:55:56 +02:00
Dmitriy Zaporozhets b9fa82daee Update tests and use js-issuable class for context form 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-26 15:05:30 +02:00
Robert Speicher e14d517b61 Fix merge request diff features 2015-06-25 21:30:18 -04:00
Dmitriy Zaporozhets 9c0229732a Merge branch 'rs-random-placeholder-tip' into 'master' 
Show a random Markdown tip in the textarea placeholder

cc @darby

See merge request !879
 2015-06-25 08:59:54 +00:00
Robert Speicher 09f2bec64c Prefix random Markdown tips with "Tip:" 2015-06-24 18:43:57 -04:00
Robert Speicher d2de219f6c Merge branch 'add-2fa-status-to-admin-api' into 'master' 
Add 2FA status to user admin API

This MR adds the `two_factor_enabled` field to the admin's API to indicate whether a given user has enabled 2FA.

See merge request !881
 2015-06-24 19:24:20 +00:00
Stan Hu 6548e9b48c Add 2FA status to user admin API 
Closes https://github.com/gitlabhq/gitlabhq/issues/9391
 2015-06-23 22:41:59 -07:00
Robert Speicher 82a671704d Show a random Markdown tip in the textarea placeholder 2015-06-23 21:00:10 -04:00
Robert Speicher e9b65a3e05 Only look up Commit authors/committers by email 
- Removes looking up authors/committers by name
- Renames `User.find_for_commit` to `User.find_by_any_email`
 2015-06-23 18:07:15 -04:00
Stan Hu 774b7ee277 Fix Error 500 when relative submodule resolves to a namespace that has a different name from its path 
Closes #1849
 2015-06-23 05:49:19 -07:00
Stan Hu e80d7a804f Fix error when deleting a user who has projects 
Closes #1856
Closes https://github.com/gitlabhq/gitlabhq/issues/9394
 2015-06-23 04:39:49 -07:00
Dmitriy Zaporozhets 883438970d Merge branch 'rubocop-for-tests' into 'master' 
Enable rubocop for tests too

cc @DouweM @rspeicher

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !862
 2015-06-23 10:36:36 +00:00
Dmitriy Zaporozhets f189c36d8d Merge branch 'rs-dev-issue-2414' into 'master' 
Allow Admin to filter users by 2FA status

> ![Screen_Shot_2015-06-19_at_4.38.12_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/deba7f2a6b8d1548c1d1ac401e0e35a1/Screen_Shot_2015-06-19_at_4.38.12_PM.png)

Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2414

See merge request !852
 2015-06-23 08:48:22 +00:00
Dmitriy Zaporozhets 779646ef38 Fix rubocop issues after merge of recent master 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-23 10:46:29 +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
Dmitriy Zaporozhets 4aa1fdd347 Merge branch 'fix-project-icon-links' into 'master' 
Fix avatar tests to use banana_sample.gif

Fixes tests that were broken in f5e0e5c0 due to the purge of `gitlab_logo.png`.

See merge request !866
 2015-06-23 08:32:21 +00:00
Stan Hu 9369adb93d Fix Style/NonNilCheck cop violations 2015-06-22 22:26:41 -07: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 dcfce8b198 Use alias_attribute to define User#two_factor_enabled 2015-06-22 21:14:07 -04:00
Robert Speicher 871bb2f143 Fix bad multi-line split from previous commit 2015-06-22 16:06:04 -04:00
Robert Speicher 15a05be70d Fix Style/Blocks cop violations 2015-06-22 16:00:54 -04:00
Stan Hu fe94254571 Fix avatar tests to use banana_sample.gif since SVG is not supported 2015-06-22 12:04:07 -07:00
Robert Speicher 8832839291 Fix Style/CommentIndentation cop violation 2015-06-22 14:56:48 -04:00
Robert Speicher 0bb320cfda Fix Style/HashSyntax violations 2015-06-22 14:54:33 -04:00
Robert Speicher 4dbf118a16 Fix Style/Not cop violations 2015-06-22 14:52:41 -04:00
Robert Speicher 0716a559b5 Fix Style/AsciiComments cop violation 2015-06-22 14:43:51 -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 cc9b5c49d1 Merge branch 'revert-mr-state-names' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	features/steps/project/merge_requests.rb
 2015-06-22 15:43:09 +02:00
Dmitriy Zaporozhets 595b3323a8 Merge branch 'rs-rspec3' into 'master' 
RSpec3

Upgrades rspec to 3.3.0, we're now up-to-date! 🎉

See merge request !831
 2015-06-22 13:15:27 +00:00
Dmitriy Zaporozhets 967214b2ec Merge requests API returns closed for closed and merged for merged. 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-22 15:11:53 +02:00