Commit Graph
18287 Commits
Author SHA1 Message Date
karen Carias 437ecdf2b0 fixed title 2015-06-29 19:03:17 -07:00
karen Carias 5f38703bdc split to 2 documents 2015-06-29 18:53:51 -07:00
Dmitriy Zaporozhets 1161c93661 Merge branch 'doc-style' into 'master'
update documentation styleguide

See merge request !904
2015-06-29 15:24:49 +00:00
Job van der Voort fdabe90ac5 update documentation styleguide 2015-06-29 15:17:53 +00:00
Stan Hu e3dbaa7027 Merge branch '1791-fix-github-issue-order' into 'master'
Fix wrong order of issues when importing from github

### 1. What does this MR do?

The order of issues imported from GitHub is fixed.

### 2. Are there points in the code the reviewer needs to double check?

Nothing.

### 3. Why was this MR needed?

The default behaviors of GitHub API at listing issues are sort: :created and direction: :desc.

See GitHub API details at https://developer.github.com/v3/issues/#list-issues.

### 4. What are the relevant issue numbers / Feature requests?

Fixes #1791

### 5. Screenshots (if relevant)

Nothing

See merge request !898
2015-06-29 14:15:47 +00: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
Dmitriy Zaporozhets 8e6efc5e75 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-29 15:38:23 +02:00
Dmitriy Zaporozhets 155b035b00 Merge branch 'add_to_backup_docs' into 'master'
Explain warnings when using omnibus packages with backup restore

Instead of adding this to the omnibus documentation as proposed [here](https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/392), moving to one central place as part of efforts to have central location for the docs.

See merge request !903
2015-06-29 13:37:54 +00:00
Job van der Voort 4b69c0a9e7 Merge branch 'link-to-saml' into 'master'
Link to SAML docs from doc index

Without this link, the SAML docs are hard to discover.

See merge request !1882
2015-06-29 11:09:44 +00:00
Jacob Vosmaer 3c01ab10fe Link to SAML docs from doc index
Without this link, the SAML docs are hard to discover.
2015-06-29 11:32:40 +02: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 ea6ebee4ab Merge branch 'rs-fuubar' into 'master'
Add Fuubar as the default RSpec formatter

- Shows how many specs have been run, how many remaining
- Estimates how long is left
- Instantly shows failures
- Looks awesome 

![Screen_Shot_2015-06-26_at_1.00.47_AM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/da7c989e04237141d9adb4c4b5898359/Screen_Shot_2015-06-26_at_1.00.47_AM.png)

See merge request !893
2015-06-29 08:45:33 +00:00
Dmitriy Zaporozhets 83d8d611e9 Merge branch 'rs-disables-submit-behavior' into 'master'
Add "Requires Input" JS behavior

This aims to replace all of those `disableButtonIfEmptyField` calls littered throughout views and JS with a simple, clean, markup-based behavior.

While going through all of the old usages, I found a few places where the old behavior wasn't actually working, so... bonus, they work now!

See merge request !900
2015-06-29 08:35:40 +00:00
Dmitriy Zaporozhets 4642dcd591 Merge branch 'rs-update-gitlab-ci' into 'master'
Remove jasmine:ci task, execute teaspoon directly on CI

See merge request !901
2015-06-29 08:32:54 +00:00
Marin Jankovski 83c2abc4e6 Add a troubleshooting section for backup restore docs, explain about warnings when using omnibus packages. 2015-06-29 09:42:09 +02:00
Stan Hu e5661001d6 Bump rugments to v1.0.0beta8 to fix C prototype function highlighting
Closes #1890
2015-06-28 16:21:20 -07:00
Robert Speicher 60c7d35543 Remove jasmine:ci task, execute teaspoon directly on CI 2015-06-28 16:27:40 -04:00
Hiroyuki Sato 4a203aab57 Fix wrong order of issues when importing from github
See API details at https://developer.github.com/v3/issues/.
Refs #1791
2015-06-28 04:02:21 +09:00
Robert Speicher ae75b2ee40 Remove requires-input from the Network Graph form
The "Begin with the selected commit" checkbox requires the submit button
to be enabled, even if the extended SHA1 input field is blank.
2015-06-26 22:49:32 -04:00
Robert Speicher 9cc00aa501 Fix "Project Forked Merge Requests" scenario 2015-06-26 22:41:02 -04:00
Robert Speicher 8384b577ef Remove duplicate 'required: true' attribute 2015-06-26 22:08:34 -04: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 7ca017b513 Refactor issue, mr, note abilities to include project abilities too
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-26 18:15:36 +02:00
Dmitriy Zaporozhets 083d4604c4 Change dynamic abilities to new format
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-26 17:18:40 +02:00
Dmitriy Zaporozhets d63371ad78 Update controller filters
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-26 16:44:21 +02:00
Dmitriy Zaporozhets 2fa77909ae Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-26 16:39:38 +02:00
Dmitriy Zaporozhets 05ef7ba105 Merge branch 'permission-improvements' into 'master'
Update permissions for issue tracker management

Don't allow guest or reporter to set assignee, milestone and label when create or update new issue and merge request.
After this change `Guest` and `Reporter` rule is used to report issues but only `Developer` and higher roles can manage issues (schedule milestone, assign to user or close any issue)

Also I removed some duplication code between issues and merge requests and put all issuable partials in one directory

See merge request !890
2015-06-26 14:37:45 +00:00
Dmitriy Zaporozhets 58ceb8e950 Only people who can manage issue can assign labels to it
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-26 16:02:57 +02: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
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 d5947ada44 Simplify set of assignee, milestone and label to admin_issue rule
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-26 15:45:45 +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
Job van der Voort d3e040c719 Merge branch 'k-github-ee' into 'master'
added info about GitHub importing

Added info that importing doc also works for GitHub EE.

https://dev.gitlab.org/gitlab/gitlabhq/issues/2410#note_49396

See merge request !1878
2015-06-26 09:08:34 +00:00
Marin Jankovski c342a9abcc Merge branch 'SAML_1888' into 'master'
Add SAML to list of social_provider

Resolves issue 1888.  Still an issue because the SAML link under Connected Accounts will not have a logo.

See merge request !891
2015-06-26 08:55:31 +00:00
Robert Speicher 8183260414 Make Fuubar the default rspec formatter 2015-06-26 01:01:13 -04:00
Robert Speicher 07ac873037 Add Fuubar gem 2015-06-25 21:43:24 -04: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
Robert Speicher d2b5c3f6ce Trigger sticky_kit:recalc when diffs are pre-loaded 2015-06-25 21:26:20 -04:00
karen Carias e8e6bb09a2 fixed clone words 2015-06-25 16:44:31 -07:00
karen Carias c7f89e9ceb fixed phrase 2015-06-25 16:29:49 -07:00
Robert Speicher 4e7f23fe0b 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
2015-06-25 18:33:24 -04:00
karen Carias b7930718a3 added info about EE 2015-06-25 11:43:41 -07:00
karen Carias 047c074a15 added new doc command line commands
git status
2015-06-25 08:45:37 -07:00
Dmitriy Zaporozhets a9095280c7 UsersSelect is part of filter so I rather keep js executed in partial
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-25 16:54:35 +02: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
Dmitriy Zaporozhets cbb64a4f63 Fix js error on merge request page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-25 16:37:52 +02:00