提交 · 5e01e1bb901c967e71d165a1e664b49538277c10 · 李少辉-开发者 / gitlab-foss

08 10月, 2015 7 次提交

R
Use `methods: :any` in our rack-cors configuration · 5e01e1bb
由 Robert Speicher 提交于 10月 07, 2015
```
This was added in rack-cors 0.4.0 and allows all types of CORS requests
to the API.
```
5e01e1bb
R

Update rack-cors to ~> 0.4.0 · f9744ea9
由 Robert Speicher 提交于 10月 07, 2015

f9744ea9

Merge branch 'clarify-postfix' into 'master' · c670f073

由 Robert Speicher 提交于 10月 07, 2015

Clarify Reply by email settings when using Postfix mail server

Fixes #2902.

[ci skip]

See merge request !1528

c670f073

D

Merge branch 'stanhu/gitlab-ce-improve-label-milestones-filter' · 1f11096c
由 Dmitriy Zaporozhets 提交于 10月 07, 2015

1f11096c

Merge branch 'rs-update-omniauth-gems' into 'master' · 81fb0a9c

由 Dmitriy Zaporozhets 提交于 10月 07, 2015

Update omniauth-* gem dependencies

- twitter to `~> 1.2.0` - closes #2763
- kerberos to `~> 0.3.0` - closes #2792
- google-oauth2 to `~> 0.2.0`
- shibboleth to `~> 1.2.0` - closes #2791

See merge request !1526

81fb0a9c

Merge branch 'cleanup-ci-pages' into 'master' · 030b5038

由 Dmitriy Zaporozhets 提交于 10月 07, 2015

Cleanup CI pages

- [x] Remove `ci/projects/:id` page
- [x] Remove Continuous integration from project menu
- [x] Remove unused css/js
- [x] Remove Ci::Commit and Ci::Build controllers
- [x] Move CI services to project settings area


cc @ayufan 

Part of #2594

See merge request !1529

030b5038

Merge branch 'new-project' into 'master' · 92c33a8e

由 Dmitriy Zaporozhets 提交于 10月 07, 2015

Create project and new merge request page

Create project

![Screen_Shot_2015-10-05_at_21.22.28](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2a3b0118b070f69460f693922bb37300/Screen_Shot_2015-10-05_at_21.22.28.png)

new merge request
![Screen_Shot_2015-10-06_at_21.37.35](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9b7b7ff7a979731a8bf20ceb3e32876b/Screen_Shot_2015-10-06_at_21.37.35.png)

See merge request !1514

92c33a8e

07 10月, 2015 28 次提交

D
Fix tests and few CI features · 7f63a878
由 Dmitriy Zaporozhets 提交于 10月 07, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
7f63a878
D
Refactor buttons · b8e4d6bd
由 Dmitriy Zaporozhets 提交于 10月 07, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
b8e4d6bd
D
Refactor button css and do some cleanup · 2acb030b
由 Dmitriy Zaporozhets 提交于 10月 07, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
2acb030b
A

Fixes to dropdown, font colors for new project and merge request · 7ad4521f
由 Andrey 提交于 10月 05, 2015

7ad4521f

Merge branch 'allow-remove-project-without-javascript' into 'master' · ac378e5b

由 Dmitriy Zaporozhets 提交于 10月 07, 2015

Allow removing of project without confirmation when JavaScript is disabled

Also fixes up some CSS errors in the `form`.

Closes #2485

See merge request !1527

ac378e5b

S
Support filtering by "Any" milestone or issue and fix "No Milestone" and "No Label" filters · dfbbc806
由 Stan Hu 提交于 10月 06, 2015
```
Closes #2619

Closes https://github.com/gitlabhq/gitlabhq/issues/9631
```
dfbbc806
D
Move CI services to project settings area · a30b68fe
由 Dmitriy Zaporozhets 提交于 10月 07, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
a30b68fe
S
Allow removing of project without confirmation when JavaScript is disabled · 75bb1087
由 Stan Hu 提交于 10月 06, 2015
```
Closes #2485
```
75bb1087
D
Remove Ci::Commit and Ci::Build controllers · 1e06cabf
由 Dmitriy Zaporozhets 提交于 10月 07, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
1e06cabf
D
Remove unused JS · 3fa2cb93
由 Dmitriy Zaporozhets 提交于 10月 07, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
3fa2cb93
D
Remove test for removed page and add menu highlight for build page · 7d220c1e
由 Dmitriy Zaporozhets 提交于 10月 07, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
7d220c1e

Merge branch 'add-directory-feature' into 'master' · cc8c91a1

由 Douwe Maan 提交于 10月 07, 2015

Add directory feature button

This MR adds the "Add directory" feature as described in #2557 and splits out the "Create file" and "Upload file" in a dropdown.

### Screenshots

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/098b77026508eef222e0f93ec78f34ec/image.png)

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/93588b0280ffa2bd44603193feac5bdf/image.png)

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9094a63d41d7cb33e103390545c9c146/image.png)

Added branch capability to upload file form:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9b3c012a3f2333a5db0e2ceb8e6711ec/image.png)

"Upload file" is no longer accessible from the "Create file" page. Users can now select a target branch in upload file as well.
   
Closes #2799: Fixes a bug where file modes were overwritten after a commit
    
Closes https://github.com/gitlabhq/gitlabhq/issues/8253: Existing files can no longer be overwritten in the "Create file" section.
    
Closes #2557 

See merge request !1453

cc8c91a1

D
Remove Continuous Integration from project menu · e52de677
由 Dmitriy Zaporozhets 提交于 10月 07, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
e52de677
D
Move no runners alert to project ci settings · c0b79a75
由 Dmitriy Zaporozhets 提交于 10月 07, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
c0b79a75
D
Move status badge helper to CI project settings for now · 6f609771
由 Dmitriy Zaporozhets 提交于 10月 07, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
6f609771

Add directory feature button · 0ab6ca93

由 Stan Hu 提交于 9月 16, 2015

Change "+" icon under "Files" section to have three options:

* Create file
* Upload file
* New directory

Upload file is no longer accessible from the "Create file" page.
Users can now select a target branch in upload file as well.

Closes #2799: Fixes a bug where file modes were overwritten after a commit

Closes https://github.com/gitlabhq/gitlabhq/issues/8253: Existing files
can no longer be overwritten in the "Create file" section.

Closes #2557

0ab6ca93

D

Clarify Reply by email settings when using Postfix mail server · f9aab3fb
由 Douwe Maan 提交于 10月 07, 2015

f9aab3fb

Merge branch 'ci-build-page' into 'master' · 0611a189

由 Dmitriy Zaporozhets 提交于 10月 07, 2015

Move CI build page to CE project

* move CI build page to project 
* cleanup unused code
* fix few 500 errors (build cancel and few CI admin pages)
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !1524

0611a189

D
Fix routing in CI mailer · 8dcc8e5d
由 Dmitriy Zaporozhets 提交于 10月 07, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
8dcc8e5d
R

Update omniauth-shibboleth to ~> 1.2.0 · 33222b57
由 Robert Speicher 提交于 10月 06, 2015

33222b57
R

Loosen omniauth-google-oauth2 to ~> 0.2.0 · 59abf498
由 Robert Speicher 提交于 10月 06, 2015

59abf498
R

Update omniauth-kerberos to ~> 0.3.0 · 25f77305
由 Robert Speicher 提交于 10月 06, 2015

25f77305
R

Update omniauth-twitter to ~> 1.2.0 · 0dd49560
由 Robert Speicher 提交于 10月 06, 2015

0dd49560
D
Fix ci build routing and few tests · 82b6a17c
由 Dmitriy Zaporozhets 提交于 10月 06, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
82b6a17c
D
Refactor commit/build tests and fix CI cancel · 27b75b2b
由 Dmitriy Zaporozhets 提交于 10月 06, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
27b75b2b
D
Cleanup CI code after refactoring and fix several 500 errors · 04c7dc2a
由 Dmitriy Zaporozhets 提交于 10月 06, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
04c7dc2a
D
Move CI build page to CE project · f6223ffb
由 Dmitriy Zaporozhets 提交于 10月 06, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
f6223ffb

Merge branch 'ci-commit-page' into 'master' · ad627e40

由 Dmitriy Zaporozhets 提交于 10月 06, 2015

Render CI statuses on commit page

This MR merges CI commit page into CE commit page.
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !1519

ad627e40

06 10月, 2015 5 次提交
- D
  Merge branch 'fix_search_in_file_tree' into 'master' · fcc39d55
  由 Dmitriy Zaporozhets 提交于 10月 06, 2015
```
Fix search in Files

https://gitlab.com/gitlab-org/gitlab-ce/issues/1873

See merge request !1511
```
  fcc39d55
- K
  
  Fix broken grouping sql clause when rendering commits for CI · 17de909a
  由 Kamil Trzcinski 提交于 10月 06, 2015
  
  17de909a
- D
  Link ci_status_path to new ci commit page · f509e3af
  由 Dmitriy Zaporozhets 提交于 10月 06, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f509e3af
- D
  Render CI statuses on commit page · 697b34d7
  由 Dmitriy Zaporozhets 提交于 10月 06, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  697b34d7
- K
  Merge branch 'fix-ci-bugs' into 'master' · 59058a25
  由 Kamil Trzciński 提交于 10月 06, 2015
```
Fix CI regressions introduced by ci_commit changes

/cc @dzaporozhets 

See merge request !1518
```
  59058a25