home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,564 Commits 48 Branches 340 Tags
dbf9ccbcfe788beb24cda34b0d86b7e12ecdf4bb
Commit Graph
19564 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Speicher dbf9ccbcfe Check originalEvent.repeat *and* event.repeat 
phantomjs < 2.0 doesn't support creating `KeyboardEvent` so the tests
were failing on CI
 2015-10-07 17:59:10 -04:00
Robert Speicher fcf99d0d09 Check originalEvent.repeat 2015-10-07 15:23:42 -04:00
Robert Speicher f96c6c43c4 Add CHANGELOG entry for "Quick Submit" 
[ci skip]
 2015-10-07 15:23:42 -04:00
Robert Speicher de3ff174e7 Quick Submit all the things! 
Adds quick submit behavior to the forms for:

- Blobs ("new file")
- Commit messages
- Issuables
- Notes
- Labels
- Milestones
- Wikis
 2015-10-07 15:23:42 -04:00
Robert Speicher 2ed5a5b70d Remove "quick submit" behavior specific to the Notes JS 2015-10-07 15:23:42 -04:00
Robert Speicher 01d0926bc1 Add "Quick Submit" JS behavior 2015-10-07 15:23:41 -04:00
Robert Speicher 38fbfb9fe6 Require jquery.turbolinks in all JS specs 
Side-effect: This simplifies the requiresInput handler
 2015-10-07 15:23:41 -04:00
Dmitriy Zaporozhets 1f11096c17 Merge branch 'stanhu/gitlab-ce-improve-label-milestones-filter' 2015-10-07 19:12:20 +02:00
Dmitriy Zaporozhets 81fb0a9c18 Merge branch 'rs-update-omniauth-gems' into 'master' 
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
 2015-10-07 17:09:43 +00:00
Dmitriy Zaporozhets 030b5038b1 Merge branch 'cleanup-ci-pages' into 'master' 
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
 2015-10-07 17:04:54 +00:00
Dmitriy Zaporozhets 92c33a8e71 Merge branch 'new-project' into 'master' 
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
 2015-10-07 17:03:14 +00:00
Dmitriy Zaporozhets 7f63a8787c Fix tests and few CI features 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-07 17:54:49 +02:00
Dmitriy Zaporozhets b8e4d6bdbe Refactor buttons 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-07 17:32:00 +02:00
Dmitriy Zaporozhets 2acb030bea Refactor button css and do some cleanup 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-07 17:21:15 +02:00
AndreyandDmitriy Zaporozhets 7ad4521f66 Fixes to dropdown, font colors for new project and merge request 2015-10-07 16:47:44 +02:00
Dmitriy Zaporozhets ac378e5b6a Merge branch 'allow-remove-project-without-javascript' into 'master' 
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
 2015-10-07 14:24:19 +00:00
Stan Hu dfbbc80611 Support filtering by "Any" milestone or issue and fix "No Milestone" and "No Label" filters 
Closes #2619

Closes https://github.com/gitlabhq/gitlabhq/issues/9631
 2015-10-07 07:21:50 -07:00
Dmitriy Zaporozhets a30b68fe1d Move CI services to project settings area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-07 16:20:31 +02:00
Stan Hu 75bb1087df Allow removing of project without confirmation when JavaScript is disabled 
Closes #2485
 2015-10-07 06:52:11 -07:00
Dmitriy Zaporozhets 1e06cabf4a Remove Ci::Commit and Ci::Build controllers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-07 15:24:32 +02:00
Dmitriy Zaporozhets 3fa2cb9335 Remove unused JS 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-07 14:59:37 +02:00
Dmitriy Zaporozhets 7d220c1e79 Remove test for removed page and add menu highlight for build page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-07 14:56:21 +02:00
Douwe Maan cc8c91a118 Merge branch 'add-directory-feature' into 'master' 
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
 2015-10-07 12:55:46 +00:00
Dmitriy Zaporozhets e52de6771f Remove Continuous Integration from project menu 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-07 14:43:58 +02:00
Dmitriy Zaporozhets c0b79a751c Move no runners alert to project ci settings 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-07 14:35:54 +02:00
Dmitriy Zaporozhets 6f6097713c Move status badge helper to CI project settings for now 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-07 14:26:07 +02:00
Stan Hu 0ab6ca93aa Add directory feature button 
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
 2015-10-07 04:22:55 -07:00
Dmitriy Zaporozhets 0611a18964 Merge branch 'ci-build-page' into 'master' 
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
 2015-10-07 09:13:38 +00:00
Dmitriy Zaporozhets 8dcc8e5db6 Fix routing in CI mailer 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-07 10:26:40 +02:00
Robert Speicher 33222b5756 Update omniauth-shibboleth to ~> 1.2.0 2015-10-06 22:03:42 -04:00
Robert Speicher 59abf498c6 Loosen omniauth-google-oauth2 to ~> 0.2.0 2015-10-06 21:57:10 -04:00
Robert Speicher 25f77305c3 Update omniauth-kerberos to ~> 0.3.0 2015-10-06 21:55:27 -04:00
Robert Speicher 0dd49560b9 Update omniauth-twitter to ~> 1.2.0 2015-10-06 21:55:27 -04:00
Dmitriy Zaporozhets 82b6a17ca7 Fix ci build routing and few tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-06 21:41:37 +02:00
Dmitriy Zaporozhets 27b75b2b2d Refactor commit/build tests and fix CI cancel 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-06 20:36:22 +02:00
Dmitriy Zaporozhets 04c7dc2a9e Cleanup CI code after refactoring and fix several 500 errors 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-06 20:15:06 +02:00
Dmitriy Zaporozhets f6223ffb31 Move CI build page to CE project 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-06 19:34:21 +02:00
Dmitriy Zaporozhets ad627e40dc Merge branch 'ci-commit-page' into 'master' 
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
 2015-10-06 17:31:54 +00:00
Dmitriy Zaporozhets fcc39d5519 Merge branch 'fix_search_in_file_tree' into 'master' 
Fix search in Files

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

See merge request !1511
 2015-10-06 15:25:05 +00:00
Kamil Trzcinski 17de909a42 Fix broken grouping sql clause when rendering commits for CI 2015-10-06 16:25:27 +02:00
Dmitriy Zaporozhets f509e3afeb Link ci_status_path to new ci commit page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-06 16:21:19 +02:00
Dmitriy Zaporozhets 697b34d786 Render CI statuses on commit page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-06 16:10:17 +02:00
Kamil Trzciński 59058a2543 Merge branch 'fix-ci-bugs' into 'master' 
Fix CI regressions introduced by ci_commit changes

/cc @dzaporozhets 

See merge request !1518
 2015-10-06 13:59:28 +00:00
Dmitriy Zaporozhets 4b8101dc47 Merge branch 'closer-ci-integration' into 'master' 
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
 2015-10-06 11:56:22 +00:00
Kamil Trzcinski 065fe557f7 Fixed failure reading .gitlab-ci.yml 2015-10-06 12:00:15 +02:00
Kamil Trzcinski a266752821 Latest builds always include builds with unique name and unique ref 2015-10-06 11:59:55 +02:00
Valery Sizov 1a86a00ca3 Fix search in Files 2015-10-06 11:43:32 +03:00
Dmitriy Zaporozhets e6ab50a754 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>
 2015-10-06 10:34:36 +02:00
Robert Speicher 10d7c367b0 Merge branch 'master' into 'master' 
Remove tmp/.gitkeep

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

See merge request !1506
 2015-10-06 01:46:13 +00:00
Kamil Trzcinski fc795d6ee2 Fix graphical glitches 2015-10-05 21:20:54 +02:00