home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 15:46:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,436 Commits 48 Branches 340 Tags
896eb0aa136eb7e442208083df4e945df17c7bfe
Commit Graph
18436 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 896eb0aa13 Imporove LDAP documentation 
If user was blocked in Active Directory - user will be automatically blocked in GitLab during next Daily sync.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-12 12:15:08 +02:00
Dmitriy Zaporozhets 7bf9dcafd3 Merge branch 'approves-docs' into 'master' 
Documentation for approves feature

See merge request !418
 2015-06-11 14:55:29 +00:00
Dmitriy Zaporozhets 491dc6506f Documentation for approval feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-11 16:06:57 +02:00
Dmitriy Zaporozhets 9322e52432 Always show approvers list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-11 15:46:57 +02:00
Dmitriy Zaporozhets 747f66559e Merge branch 'mr-approves' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
 2015-06-10 16:51:07 +02:00
Dmitriy Zaporozhets dd691a4b09 Merge branch 'ce-to-ee' into 'master' 
Ce to ee

See merge request !417
 2015-06-10 14:45:18 +00:00
Dmitriy Zaporozhets 962fe84e49 Fix logout scenario 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-10 16:01:44 +02:00
Dmitriy Zaporozhets efdf3d2905 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	doc/README.md
	doc/workflow/README.md
 2015-06-09 19:24:37 +02:00
Dmitriy Zaporozhets 449903f21b Dont allow approvals requirement be less than zero 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-09 18:23:00 +02:00
Dmitriy Zaporozhets a90e7d3527 Add CHANGELOG item 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-09 18:15:27 +02:00
Dmitriy Zaporozhets 32384cf7d1 Move EE merge request settings into separate fieldset 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-09 18:13:41 +02:00
Dmitriy Zaporozhets 8c830688aa Add ability to change amount of required approvals in project settings 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-09 17:14:25 +02:00
Dmitriy Zaporozhets c05a0afbc0 Merge branch 'ref-ext-external-issues' into 'master' 
Move reference extractor EE special case to separate method.

Fixes gitlab/gitlabhq#2370.

@dzaporozhets With this change, the part

```ruby
    %i(user label issue merge_request snippet commit commit_range).each do |type|
      define_method("#{type}s") do
        references[type]
      end
    end
```

is the same as in CE again, and the only added part is the issues method, which should not conflict with CE stuff.

See merge request !415
 2015-06-09 14:51:11 +00:00
Dmitriy Zaporozhets 5c0bfc173a Approve widget with users who approved 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-09 16:50:09 +02:00
Dmitriy Zaporozhets a2726dc346 Check for accept mr button in approval test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-09 16:49:36 +02:00
Dmitriy Zaporozhets 15b17b3f6a Implement approve button 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-09 16:12:52 +02:00
Dmitriy Zaporozhets 73faf3c728 Rename approve->approval. Add approval count to project 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-09 15:57:34 +02:00
Dmitriy Zaporozhets 99ae2c0230 Explicitly say approve class name in association 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-09 14:42:11 +02:00
Dmitriy Zaporozhets 7ba4e05ffa Create Approve model for merge request 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-09 13:38:47 +02:00
Douwe Maan 4bed25b1e1 Move reference extractor EE special case to separate method. 2015-06-09 13:38:15 +02:00
Dmitriy Zaporozhets 1fb74b923e Merge branch 'max-file-size-git-hook' into 'master' 
Add Git hook to validate maximum file size.

Addresses #286.

See merge request !413
 2015-06-09 11:15:16 +00:00
Douwe Maan 356bafcbb4 Merge branch 'fix_edit_notes_form_hotkey_issue' into 'master' 
Make submit hotkey available to all notes forms.

Addresses #2221.

See merge request !1847
 2015-06-09 11:13:42 +00:00
Dmitriy Zaporozhets 9562f02859 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-09 12:40:00 +02:00
Dmitriy Zaporozhets 4e9de95221 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-06-09 12:39:45 +02:00
Dmitriy Zaporozhets 18e33e037f Merge branch 'fix-missing-js' into 'master' 
Move page-specific JS out of head and into body.

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

See merge request !787
 2015-06-09 10:39:10 +00:00
Dmitriy Zaporozhets 378904d628 Merge branch 'rs-issue-1778' into 'master' 
Correctly remove already-mentioned commits for cross references

Fixes #1778

See merge request !785
 2015-06-09 10:08:04 +00:00
Douwe Maan eb80edd34f Move page-specific JS out of head and into body. 2015-06-09 12:01:18 +02:00
Douwe Maan d7d3a2885f Merge branch 'feature/ldap_group_link_api' into 'master' 
Add API support for adding and removing LDAP group links

See merge request !4
 2015-06-09 09:27:39 +00:00
Douwe Maan 844cca4a1e Add Git hook to validate maximum file size. 2015-06-09 10:23:38 +02:00
Job van der Voort fbe1ca39aa Merge branch 'fixing_importing_doc' into 'master' 
Fixing importing doc

Fixed some details about the importing links and documents.

- Added extra info to Bitbucket importing
- Organized docs in alphabetical order
- Moved Importing link to general documentation, instead of workflow (that's where Sytse asked me to add it)

Thank you @job for merging previous changes.

See merge request !1845
 2015-06-09 07:01:50 +00:00
Job van der Voort 4d6a338cc4 Merge branch 'master' into 'master' 
Added line about adding docs in alphabetical order

I believe it's important to be organized when adding documentation, so whenever it applies, I believe documents should be added in alphabetical order.

See merge request !786
 2015-06-09 06:59:23 +00:00
Jeroen van Baarsen 199b93387b Merge pull request #9368 from zenati/patch-1 
No need to check if `repository_ref` is present
 2015-06-09 08:58:48 +02:00
Nicolas a68eabd212 Make submit hotkey available to all notes forms. 
Addresses #2221.
 2015-06-09 05:31:21 +02:00
Karen 42201b150d Added line about adding docs in alphabetical order 2015-06-08 22:28:41 +00:00
Robert Speicher 23954b0f77 Correctly remove already-mentioned commits for cross references 
Fixes #1778
 2015-06-08 18:13:14 -04:00
Karen Carias ed42be4019 fixed link 2015-06-08 21:03:57 +00:00
Karen Carias 732828b7bb fixed link 2015-06-08 21:03:15 +00:00
Karen Carias 60ac9253ad fixed link 2015-06-08 21:01:56 +00:00
Karen Carias b4116e76cb Removed link "importing to gitlab" because it's in "Documentation". Organized links in alphabetical order. 2015-06-08 20:55:42 +00:00
Karen Carias 0ea9c962a4 added link to "importing to GitLab". Also organized docs in alphabetical order. 2015-06-08 20:48:06 +00:00
Karen Carias 44aaf40ad3 fixed numbers 2015-06-08 20:37:28 +00:00
Karen Carias 0c538cd8b5 fixed numbers 2015-06-08 20:36:28 +00:00
Karen Carias fc9d90c379 fixed numbers 2015-06-08 20:35:53 +00:00
Karen Carias e150ab9cee Added info about milestones and wiki pages not imported from Bitbucket 2015-06-08 20:31:02 +00:00
Karen Carias ce7831ae39 fixed importing link 2015-06-08 20:26:58 +00:00
Dmitriy Zaporozhets b637f84950 Fix broadcast message colors to one displayed in preview 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-08 20:39:02 +02:00
Dmitriy Zaporozhets ccf7927229 Merge branch 'ce-to-ee' into 'master' 
CE to EE

See merge request !414
 2015-06-08 17:42:24 +00:00
Dmitriy Zaporozhets ec99074cbf Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-08 19:42:23 +02:00
Dmitriy Zaporozhets 0944dd4384 Merge branch 'improve-navigation' into 'master' 
Improve GitLab UI

* move logout button to top right

![Screenshot_2015-06-08_16.56.13](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7de04fab52ad6b742dbea100674f9671/Screenshot_2015-06-08_16.56.13.png)

* remove issue/mr title truncation on index pages. For smaller screens it allow to read complete title of issue

![Screenshot_2015-06-08_16.57.55](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9dcaadfba14f8561c12fcd29a2e70112/Screenshot_2015-06-08_16.57.55.png)

* Improve mobile UI for several pages

See merge request !783
 2015-06-08 17:41:36 +00:00
Dmitriy Zaporozhets a83d0034e3 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/services/files/base_service.rb
	app/services/files/create_service.rb
	app/services/files/delete_service.rb
	app/services/files/update_service.rb
	doc/workflow/README.md
 2015-06-08 18:24:34 +02:00