root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
18,287 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

827 Commits

Author SHA1 Message Date
Artem Sidorenko 0719022739 Spinach tests 2015-08-19 13:47:03 +02:00
Dmitriy Zaporozhets 72a425fa66
Merge branch 'remove-satellites' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-19 09:52:39 +02:00
Ben Bodenmiller 692e381e0c capitalize URL in "Home page URL" 2015-08-17 23:16:18 -07:00
Dmitriy Zaporozhets 69c193e78a
Merge branch 'master' into remove-satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 22:48:55 +02:00
Dmitriy Zaporozhets cb6ad67f52 Merge branch 'check-out-branch-button' into 'master' 
Add "Check out branch" button to the MR page.

I appreciated the thought behind adding the "Fetch this branch using ..." line, but not so much the implementation. I think a "Check out branch" button alongside the existing "Download as" makes more sense to get instructions on how to get the changes on your local machine, since that's pretty much what "Download as" does as well. 

Like the "command line", the button opens the command line merge instructions modal. I've improved the text of that modal in !1120.

![Screen_Shot_2015-08-08_at_22.10.19](https://gitlab.com/gitlab-org/gitlab-ce/uploads/fd185df012e9759dfea198ed9fa3f80f/Screen_Shot_2015-08-08_at_22.10.19.png)

It looks even better in combination with !1121, which gets rid of the "If you want to ..." line:

![Screen_Shot_2015-08-08_at_22.10.55](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3fa469d0e2bd4e3ec4992ffa5864c718/Screen_Shot_2015-08-08_at_22.10.55.png)

cc @dzaporozhets @rspeicher 

See merge request !1116
 2015-08-11 17:49:06 +00:00
Dmitriy Zaporozhets 3e259ea8bc Revert "Merge branch 'revert-satellites' into 'master' " 
This reverts commit 5daf44b7c8, reversing
changes made to 2f706fbd23.
 2015-08-11 14:33:31 +02:00
Dmitriy Zaporozhets 9f10943c1a
Revert "Merge branch 'drop-satellites'" 
This reverts commit 957e849f41, reversing
changes made to 6b9dbe9f5a.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 10:28:42 +02:00
Douwe Maan 4a2b7cef57 Merge branch 'master' into check-out-branch-button 2015-08-10 14:16:40 +02:00
Douwe Maan b716e45de1 Fix spec 2015-08-10 14:15:27 +02:00
Stan Hu 1a3283d4e8 Merge branch 'gravatar-host-link' into 'master' 
link to configured gravatar host on profile page

This MR updates the profile page to display the correct address for the configured gravatar service. Previously this always showed gravatar.com even if gravatar.com was not being used as the gravatar service.

See merge request !1093
 2015-08-09 22:42:07 +00:00
Robert Speicher fb6dc1f07d Add `Group#add_*` convenience methods 
Encapsulates the logic for `Gitlab::Access::WHATEVER` levels.
 2015-08-07 00:20:02 -04:00
Dmitriy Zaporozhets c5eb2977d7 Merge branch 'add-current-user-to-autocomplete' into 'master' 
Always add current user to autocomplete controller to support filter by "Me"

### What does this MR do?

This MR always adds the current user to the autocomplete list of users.

### Why was this MR needed?

Normally only the members from a team or the group are shown in the autocomplete list. However, this prevents a user from filtering issues belong to him/her if the user does not belong directly to either. To make this filtering more usable, we can be sure to add the current user to the list, which the JavaScript code will move to the top of the list.

### What are the relevant issue numbers?

Partial fix #2202

See merge request !1100
 2015-08-06 16:10:38 +00:00
Dmitriy Zaporozhets 485b9efe9f
Remove trailing lines 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-06 17:27:48 +02:00
Dmitriy Zaporozhets 02c4a0cc73
Add tests for abuse report feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-06 16:57:04 +02:00
Stan Hu 70f5291808 Always add current user to autocomplete controller to support filter by "Me" 
Partial fix #2202
 2015-08-06 00:46:14 -07:00
Ben Bodenmiller 0f785bbc7e ink to configured gravatar host on profile page 2015-08-05 00:48:16 -07:00
Dmitriy Zaporozhets b48b07044b
Merge branch 'master' into drop-satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-04 16:42:36 +02:00
Stan Hu 369275d630 Fix network graph when branch name has single quotes 
Closes https://github.com/gitlabhq/gitlabhq/issues/9500
 2015-07-29 23:29:47 -07:00
Stan Hu 562242cb9d Fix commit data retrieval when branch name has single quotes 
Closes #1724
 2015-07-26 03:47:01 -07:00
Douwe Maan 70a3c165a9 Allow custom label to be set for authentication providers. 2015-07-23 15:20:12 +02:00
Stan Hu df2bb60f90 Add support for destroying project milestones 
Closes https://github.com/gitlabhq/gitlabhq/issues/1504
 2015-07-17 06:54:32 -07:00
Dmitriy Zaporozhets fa88f2c084
Use real branches from test repo 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-16 17:09:20 +02:00
Dmitriy Zaporozhets 2be3c94925 Fix application initialize 2015-07-15 15:59:38 +02:00
Dmitriy Zaporozhets a87989fb7d Remove satellites 2015-07-15 15:45:57 +02:00
Dmitriy Zaporozhets 4dfded8934 Make left menu more hierarchical and less contextual by adding back item at top 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-10 13:29:46 +02:00
Dmitriy Zaporozhets d8dfbc5118
Improve readme tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-09 14:31:03 +02:00
Dmitriy Zaporozhets 846538076b
Dont check for link but for actual readme content 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-09 13:27:50 +02:00
Dmitriy Zaporozhets a0b9fe1288
Fix project tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-08 20:22:42 +02:00
Dmitriy Zaporozhets e05fbf0494
Fix creating file in new repo 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-08 17:41:59 +02:00
Dmitriy Zaporozhets 39a4bb2abd
Cleanup and some test fixes after refactoring project home page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-08 16:55:04 +02:00
Dmitriy Zaporozhets 8404ab46b9
Add shortcut for project activity page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-08 12:43:46 +02:00
Valery Sizov 411829fdb5 Audit log for user authentication 2015-07-06 12:36:08 +03:00
Stan Hu 0b4b045758 Merge branch 'improve-spinach-test-for-mr-submit' into 'master' 
Add an expect call to prevent random Spinach failure

This should help prevent getting the error:

```
Unable to find field "merge_request_title
```

This was happening probably because it takes some time after the "Compare branches" button is hit before the "New merge request" page showed up.

See merge request !882
 2015-07-01 16:54:32 +00:00
Douwe Maan 690aafebdb Merge branch 'group_settings_nav' into 'master' 
Fix consistency issue in sidebars of Project and Group Settings.

Fixes #2277

![before_after_group_settings_nav](https://dev.gitlab.org/gitlab/gitlabhq/uploads/370c701d0eff8f1f8e44cf954c75f2bf/before_after_group_settings_nav.png)

See merge request !1871
 2015-07-01 09:32:41 +00:00
Dmitriy Zaporozhets 32330e8c28 Merge branch 'rs-fix-subscription-feature' into 'master' 
Attempt to fix the "I should see that I am [un]subscribed" steps

Makes use of Capybara methods that wait. Hopefully this will fix the
random timing-related failures of this step.

See merge request !853
 2015-06-29 08:57:32 +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 c9f21c9691
Use page.within in tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-26 16:01:02 +02:00
Robert Speicher d92bb3cfe0 Attempt to fix the "I should see that I am [un]subscribed" steps 
Makes use of Capybara methods that wait. Hopefully this will fix the
random timing-related failures of this step.
 2015-06-25 21:37:16 -04:00
Robert Speicher e14d517b61 Fix merge request diff features 2015-06-25 21:30:18 -04:00
Dmitriy Zaporozhets 304386aa02
Write test for submitting issue as guest 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-25 16:38:14 +02:00
Nicolas a521e88fc0 Fix consistency issue in sidebars of Project and Group Settings. 
Fixes #2277.
 2015-06-24 18:05:16 +02:00
Stan Hu 357cd97199 Add an expect call to prevent random Spinach failure: 
"Unable to find field "merge_request_title"
 2015-06-23 23:19:32 -07:00
Dmitriy Zaporozhets 541f7675f9 Merge branch 'fix-diff-patch-public-mr' into 'master' 
Fix downloading of patches on public merge requests when user logged out

### What does this MR do?

This MR makes it possible to download a diff patch on a public merge request when a user is logged out.

### Why was this MR needed?

An Error 500 would result when a user attempted to click on the "Email Patches" or "Plain Diff" button:

```
NoMethodError - undefined method `id' for nil:NilClass:
  lib/gitlab/backend/shell_env.rb:9:in `set_env'
  lib/gitlab/satellite/action.rb:20:in `in_locked_and_timed_satellite'
  lib/gitlab/satellite/merge_action.rb:49:in `diff_in_satellite'
  app/models/merge_request.rb:219:in `to_diff'
  app/controllers/projects/merge_requests_controller.rb:42:in `block (2 levels) in show'
```

### What are the relevant issue numbers?

* Closes #1225
* Closes #1854 (dup)
* Closes #1858 (dup)

See merge request !872
 2015-06-23 15:03:00 +00:00
Dmitriy Zaporozhets 94f130cbfc Merge branch 'admin-edit-identities' into 'master' 
Admin can see, edit and remove user identities

Related to #1415 and https://dev.gitlab.org/gitlab/gitlabhq/issues/2224

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

See merge request !843
 2015-06-23 14:24:16 +00:00
Dmitriy Zaporozhets 4acd1f5d6a Fix tests for admin identities after migrate to rspec3 2015-06-23 15:49:15 +02:00
Stan Hu 555fd0cf4a Fix downloading of patches on public merge requests when user logged out 
Closes #1225
Closes #1854
Closes #1858
 2015-06-23 05:34:21 -07:00
Dmitriy Zaporozhets 8c6cbd4306 Merge branch 'master' into admin-edit-identities 2015-06-23 12:09:45 +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 fe94254571 Fix avatar tests to use banana_sample.gif since SVG is not supported 2015-06-22 12:04:07 -07:00