home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 11:06:10 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
22224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dmitriy Zaporozhets 6006065e06 Update CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-25 16:18:32 +02:00
Dmitriy Zaporozhets 0bcfe9a0dc Dont allow set assignee, milestone or labels if user is guest 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-25 16:17:48 +02:00
Dmitriy Zaporozhets 5ff870a044 Move duplicate js functionality into IssuableForm 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-25 16:17:06 +02:00
Dmitriy Zaporozhets 2d31568b27 Refactor issue and merge request sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-25 16:04:50 +02:00
Matthew Firtion 024e854eca Add SAML to list of social_provider 2015-06-25 09:58:55 -04:00
Kamil Trzcinski 213d5fb773 Added missing packages required by docker builds 2015-06-25 15:42:56 +02:00
Dmitriy Zaporozhets d315d1eba4 Dont allow guest to set assigne, milestone and label when create new issue or merge request 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-25 15:38:04 +02:00
Dmitriy Zaporozhets 60baa1e866 Move issuable partials in common directory 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-25 15:11:22 +02:00
Dmitriy Zaporozhets 6288677134 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-25 13:33:50 +02:00
Dmitriy Zaporozhets 28830c0d5b Merge branch 'sidebar-animation' into 'master' 
Have sidebar labels disappear behind content instead of hide immediately when collapsing.

I'm not sure how to make a gif out of it, but I promise it looks pretty :)

See merge request !888
 2015-06-25 11:33:27 +00:00
Dmitriy Zaporozhets 482b9605a3 Merge branch 'highlight-link-sidebar' into 'master' 
prettier highlighting of active link in the sidebar

Before:

![Screenshot_2015-06-25_11.17.08](https://dev.gitlab.org/gitlab/gitlabhq/uploads/851606a122c1d1174d0f97857ad472d3/Screenshot_2015-06-25_11.17.08.png)

After:

![Screenshot_2015-06-25_11.17.42](https://dev.gitlab.org/gitlab/gitlabhq/uploads/b8dc55bcd76dac29652ef5d25f99ccff/Screenshot_2015-06-25_11.17.42.png)

Only with this theme it's not an improvement (this is an honest merge request (trademark pending)) :

![Screenshot_2015-06-25_11.18.35](https://dev.gitlab.org/gitlab/gitlabhq/uploads/5d631a11ee866f5fc51e985b02a836ba/Screenshot_2015-06-25_11.18.35.png)

See merge request !1879
 2015-06-25 11:32:27 +00:00
Douwe Maan 7b804e231a Have sidebar labels disappear behind content instead of hide immediately. 2015-06-25 11:42:15 +02:00
Job van der Voort 0429a24066 prettier highlighting of active link in the sidebar 2015-06-25 11:19:56 +02: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