Commits · 81fb0a9c18ce80c9a3b8f024abc8a905fc1b5a52 · iv / gitlab-ce

07 Oct, 2015 24 commits

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

Dmitriy Zaporozhets authored Oct 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 authored Oct 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 authored Oct 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

Fix tests and few CI features · 7f63a878
Dmitriy Zaporozhets authored Oct 07, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
7f63a878
Refactor buttons · b8e4d6bd
Dmitriy Zaporozhets authored Oct 07, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
b8e4d6bd
Refactor button css and do some cleanup · 2acb030b
Dmitriy Zaporozhets authored Oct 07, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
2acb030b
Fixes to dropdown, font colors for new project and merge request · 7ad4521f
Andrey authored Oct 05, 2015

7ad4521f

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

Dmitriy Zaporozhets authored Oct 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

Move CI services to project settings area · a30b68fe
Dmitriy Zaporozhets authored Oct 07, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
a30b68fe
Allow removing of project without confirmation when JavaScript is disabled · 75bb1087
Stan Hu authored Oct 06, 2015
```
Closes #2485
```
75bb1087
Remove Ci::Commit and Ci::Build controllers · 1e06cabf
Dmitriy Zaporozhets authored Oct 07, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
1e06cabf
Remove unused JS · 3fa2cb93
Dmitriy Zaporozhets authored Oct 07, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
3fa2cb93
Remove test for removed page and add menu highlight for build page · 7d220c1e
Dmitriy Zaporozhets authored Oct 07, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
7d220c1e

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

Douwe Maan authored Oct 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

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

Add directory feature button · 0ab6ca93

Stan Hu authored Sep 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

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

Dmitriy Zaporozhets authored Oct 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: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !1524

0611a189

Fix routing in CI mailer · 8dcc8e5d
Dmitriy Zaporozhets authored Oct 07, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
8dcc8e5d
Update omniauth-shibboleth to ~> 1.2.0 · 33222b57
Robert Speicher authored Oct 06, 2015

33222b57
Loosen omniauth-google-oauth2 to ~> 0.2.0 · 59abf498
Robert Speicher authored Oct 06, 2015

59abf498
Update omniauth-kerberos to ~> 0.3.0 · 25f77305
Robert Speicher authored Oct 06, 2015

25f77305
Update omniauth-twitter to ~> 1.2.0 · 0dd49560
Robert Speicher authored Oct 06, 2015

0dd49560

06 Oct, 2015 16 commits
- Fix ci build routing and few tests · 82b6a17c
  Dmitriy Zaporozhets authored Oct 06, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  82b6a17c
- Refactor commit/build tests and fix CI cancel · 27b75b2b
  Dmitriy Zaporozhets authored Oct 06, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  27b75b2b
- Cleanup CI code after refactoring and fix several 500 errors · 04c7dc2a
  Dmitriy Zaporozhets authored Oct 06, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  04c7dc2a
- Move CI build page to CE project · f6223ffb
  Dmitriy Zaporozhets authored Oct 06, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f6223ffb
- Merge branch 'ci-commit-page' into 'master' · ad627e40
  Dmitriy Zaporozhets authored Oct 06, 2015
```
Render CI statuses on commit page

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

See merge request !1519
```
  ad627e40
- Merge branch 'fix_search_in_file_tree' into 'master' · fcc39d55
  Dmitriy Zaporozhets authored Oct 06, 2015
```
Fix search in Files

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

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

/cc @dzaporozhets 

See merge request !1518
```
  59058a25
- Merge branch 'closer-ci-integration' into 'master' · 4b8101dc
  Dmitriy Zaporozhets authored Oct 06, 2015
```
Use CI commit status for merge request widget

For temporary compatibility with other services like Jenkins we ask for
CI status via AJAX request if there is no commit status in GitLab
database
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>


cc @ayufan 

See merge request !1517
```
  4b8101dc
- Fixed failure reading .gitlab-ci.yml · 065fe557
  Kamil Trzcinski authored Oct 06, 2015
  
  065fe557
- Latest builds always include builds with unique name and unique ref · a2667528
  Kamil Trzcinski authored Oct 06, 2015
  
  a2667528
- Fix search in Files · 1a86a00c
  Valery Sizov authored Oct 05, 2015
  
  1a86a00c
- Use CI commit status for merge request widget · e6ab50a7
  Dmitriy Zaporozhets authored Oct 06, 2015
```
For temporary compatibility with other services like Jenkins we ask for
CI status via AJAX request if there is no commit status in GitLab
database
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e6ab50a7
- Merge branch 'master' into 'master' · 10d7c367
  Robert Speicher authored Oct 06, 2015
```
Remove tmp/.gitkeep

This file is obsolete since 5b4aba5f as it exists
solely for the directory to exist.

See merge request !1506
```
  10d7c367