home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
480 Commits
Author SHA1 Message Date
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 b716e45de1 Fix spec 2015-08-10 14:15:27 +02: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
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
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
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 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 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
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
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 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
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 f167f37e5a Fix rubocop issues at feature/ directory 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-22 14:21:34 +02:00
Robert SpeicherandDmitriy Zaporozhets afec5efc7d Fix features syntax 2015-06-22 12:13:45 +02:00
Dmitriy Zaporozhets 7524d7c082 Revert merge request states renaming 
Replaced:
* "Accepted" with "Merged"
* "Rejected" with "Closed"

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-19 17:09:50 +02:00
Robert Speicher 1f88d9b56f Remove "Multiselect Blob" feature specs 
These are well covered by the new Jasmine tests, and faster!
 2015-06-19 04:31:24 -04:00
Stan Hu a7932fe2fd Support commenting on a diff in side-by-side view 
Closes https://github.com/gitlabhq/gitlabhq/issues/9283
 2015-06-16 06:11:59 -07:00
Robert Speicher 4c42fc7c4c Call page.all instead of all in feature steps 
There's a naming conflict between Capybara and rspec-matchers which both
define the `all` method.

See https://github.com/jnicklas/capybara/issues/1396
 2015-06-12 05:12:42 -04:00
Robert Speicher 584f8601ef Change within to page.within in feature steps 2015-06-12 05:12:42 -04:00
Robert Speicher 69bbc413fe Update all should-style syntax to expect in features 2015-06-12 05:12:09 -04:00
Dmitriy Zaporozhets 11bf5b693b Fix test for accept merge request 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-12 09:29:27 +02:00
Dmitriy Zaporozhets a35aec7adb Fix merge request test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-11 22:27:26 +02:00
Robert Speicher 700d4387ce Use stub_const to stub constants instead of redefining them 
They're called constants for a reason, after all.
 2015-06-10 01:31:27 -04:00
Stan Hu 5e4384ec9b Support editing target branch of merge request 
Closes https://github.com/gitlabhq/gitlabhq/issues/7105
See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/130
 2015-05-29 04:08:08 -07:00
Robert Speicher 5c52eaa9d2 Persist current merge request tab selection via URL 
Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2350
 2015-05-27 22:39:11 -04:00
Stan Hu ab88b7da19 Fix project snippets button appearing when it is disabled 
Closes #1705
 2015-05-27 05:07:44 -07:00
Dmitriy Zaporozhets 9eec0d5436 Merge branch 'accepted-rejected-mrs' into 'master' 
Add Accepted and Rejected tabs to MR lists.

Before, MRs were referred to as Merged or Closed, but the Merge button on the MR page read "Accept Merge Request", the activity feed even read "X accepted merge request Y", and the Closed tab on the MR index included both Merged _and_ Closed MRs. I've changed every occurrence to consistently refer to MRs as either Accepted or Rejected, which is less technical and more clearly two opposites.

![Screen_Shot_2015-05-25_at_17.02.31](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b0bf43aa1b5b9898a1c6b204dbcf669a/Screen_Shot_2015-05-25_at_17.02.31.png)

![Screen_Shot_2015-05-25_at_17.02.47](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2ac05b1e1dba3b2d1692bd9242078f3a/Screen_Shot_2015-05-25_at_17.02.47.png)

![Screen_Shot_2015-05-25_at_17.03.03](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4c0f0fa869c9130a6af18d80a1c6ebed/Screen_Shot_2015-05-25_at_17.03.03.png)

Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2201.

See merge request !702
 2015-05-27 11:40:36 +00:00
Jeroen van Baarsen aa36a19613 Merge pull request #9319 from jvanbaarsen/validate-wiki-page-creation 
Validate wiki page creation
 2015-05-26 20:05:25 +02:00
Jeroen van Baarsen b16aad9dd1 Validate wiki page creation 
**What does this do?**
It adds validation to the creation of a wiki page, that way the user gets real
feedback instead of just a 404 page if the name of the wiki page was invalid

**Why is this needed?**
There are a lot of characters that are not allowed in the creation of a wiki
page, there is even a small text that is saying: Please don't use spaces.
Although we have that text there, we don't actually validate on this. This
commit adds validation on the title and gives the user actual feedback.

**What issues does this fix?**
Fixes http://github.com/gitlabhq/gitlabhq/issues/5357
Fixes https://github.com/gitlabhq/gitlabhq/issues/8565
Fixes https://github.com/gitlabhq/gitlabhq/issues/3913
Fixes https://github.com/gitlabhq/gitlabhq/issues/8166

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-05-26 19:01:11 +02:00