Commits · 9f3b4f84ed3c31bd0f32d96fb8c81277b8d9e4d2 · nexedi / gitlab-ce

20 Feb, 2014 4 commits

Merge branch 'feature/reset_access_button' into 'master' · 9f3b4f84
Dmitriy Zaporozhets authored Feb 20, 2014
```
Feature: Reset Access Button

Fixed #59
```
9f3b4f84
Improve wording for reset button · 5fa97192
Dmitriy Zaporozhets authored Feb 20, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
5fa97192
UI and controller for group members access reset · 37723dc6
Dmitriy Zaporozhets authored Feb 20, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
37723dc6

Dmitriy Zaporozhets authored Feb 20, 2014

Allows reset all ldap group members access to default one
specified in Group -> Ldap Access selectbox.
Does not affect user who initiated reset action.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

93874928

19 Feb, 2014 15 commits
- Merge branch 'ce_6_6' into 'master' · 4fe147c0
  Dmitriy Zaporozhets authored Feb 19, 2014
```
6.6.0.beta1 from GitLab CE
```
  4fe147c0
- Merge branch 'shell-version-readme' into 'master' · 54f6825f
  Jacob Vosmaer authored Feb 19, 2014
```
Shell Version Readme

I added it to the 6.1-6.2 guide as well, as we saw that some peope were still using version 1.7.8 eventhough they were on 6.1-ee.
```
  54f6825f
- db schema · 7d8453d8
  Dmitriy Zaporozhets authored Feb 19, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  7d8453d8
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce_6_6 · cf413ffb
  Dmitriy Zaporozhets authored Feb 19, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	LICENSE
	VERSION
	db/schema.rb
	features/steps/group/group.rb
	lib/api/internal.rb
```
  cf413ffb
- Mention new rails in changelog · dad6b021
  Dmitriy Zaporozhets authored Feb 19, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  dad6b021
- Merge branch 'link-release-docs' into 'master' · d353e203
  Dmitriy Zaporozhets authored Feb 19, 2014
```
Link Release Docs
```
  d353e203
- Merge branch 'rails-4-0-3' into 'master' · 1b41b7c9
  Dmitriy Zaporozhets authored Feb 19, 2014
```
Rails 4.0.3

Blog post with more information http://weblog.rubyonrails.org/2014/2/18/Rails_3_2_17_4_0_3_and_4_1_0_beta2_have_been_released/
```
  1b41b7c9
- Refer to release docs. · 06fc7e31
  dosire authored Feb 19, 2014
  
  06fc7e31
- Fix readme h4 style · 2b8d2891
  Dmitriy Zaporozhets authored Feb 19, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  2b8d2891
- update readme to update to gitlab shell 1.7.9 · 0cd8024d
  Job van der Voort authored Feb 19, 2014
  
  0cd8024d
- More for changelog · 0bd0c814
  Dmitriy Zaporozhets authored Feb 19, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  0bd0c814
- Update rails to version 4.0.3 · c9befd3d
  Dmitriy Zaporozhets authored Feb 19, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c9befd3d
- Merge branch 'restyle/issue' into 'master' · 6a18fd98
  Dmitriy Zaporozhets authored Feb 19, 2014
```
Improve UI for Issue#show, MR#show pages
```
  6a18fd98
- Fix tests · ededfd2d
  Dmitriy Zaporozhets authored Feb 19, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ededfd2d
- Move assignee/milestone below description of Issue · ee750298
  Dmitriy Zaporozhets authored Feb 19, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ee750298
18 Feb, 2014 21 commits
- Merge branch 'add-apps' into 'master' · b09610b5
  Dmitriy Zaporozhets authored Feb 18, 2014
```
Add Apps
```
  b09610b5
- Move MR alert info out of issue-box · 83d35399
  Dmitriy Zaporozhets authored Feb 18, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  83d35399
- Improve UI for Issue/MR · 88b8b15d
  Dmitriy Zaporozhets authored Feb 18, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  88b8b15d
- Add apps to readme. · c0e29f25
  dosire authored Feb 18, 2014
  
  c0e29f25
- Move author/date info for Issue#show, MR#show pages to issue-box · 7e42084f
  Dmitriy Zaporozhets authored Feb 18, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  7e42084f
- Restyle labels filter to match common style · a718a9af
  Dmitriy Zaporozhets authored Feb 18, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a718a9af
- Hide labels filter for MRs and remove unnecessary padding · 638f8541
  Dmitriy Zaporozhets authored Feb 18, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  638f8541
- Merge pull request #6350 from tudorpavel/filter-by-multiple-labels · 25741c97
  Dmitriy Zaporozhets authored Feb 18, 2014
```
Add feature to filter issues by multiple labels
```
  25741c97
- Refactor MR code reload · 1c61ac1c
  Dmitriy Zaporozhets authored Feb 18, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1c61ac1c
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · e1c93a6b
  Dmitriy Zaporozhets authored Feb 18, 2014
  
  e1c93a6b
- Add close button to MR comment form · f0750b91
  Dmitriy Zaporozhets authored Feb 18, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f0750b91
- Merge branch 'request/branch_compare' into 'master' · 4eba8036
  Dmitriy Zaporozhets authored Feb 18, 2014
```
Fix for compare button within branches dialog

For the button Compare within the Branches screen ( https://gitlab.com/gitlab-org/gitlab-ce/branches ) beside a branch "foo"

Old behavior:
Will redirect to the compare page that is defaulted to comparison for branch "foo" <--> "foo"

New behavior:
Will redirect and trigger compare page of branch "default" <--> "foo"
Remove of button beside default branch
```
  4eba8036
- Fix random failing test · 555c25e6
  Dmitriy Zaporozhets authored Feb 18, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  555c25e6
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq · d169ae13
  Dmitriy Zaporozhets authored Feb 18, 2014
  
  d169ae13
- Merge branch 'namespace-api-doc' into 'master' · 99966b60
  Dmitriy Zaporozhets authored Feb 18, 2014
```
Namespace Api Doc
```
  99966b60
- Use same avatar size for all event rows · 0bf4e568
  Dmitriy Zaporozhets authored Feb 18, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  0bf4e568
- Doesn't exist for user endpoint. · 0007db83
  dosire authored Feb 18, 2014
  
  0007db83
- Merge branch 'feature/mr_context' into 'master' · ec8628fa
  Dmitriy Zaporozhets authored Feb 18, 2014
```
Allow change assignee/milestone from MergeRequest show page
```
  ec8628fa
- Allow change assignee/milestone from MergeRequest show page · 70212889
  Dmitriy Zaporozhets authored Feb 18, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  70212889
- Split merge request coffee · b05a67f4
  Dmitriy Zaporozhets authored Feb 18, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b05a67f4
- Fix tests · 9d637d57
  Dmitriy Zaporozhets authored Feb 18, 2014
  
  9d637d57