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,580 Commits 48 Branches 340 Tags
dc400a7414e5b26893d002ce42bfaf15c0ccae79
Commit Graph
19580 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets dc400a7414 Improve help/ui page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-08 13:47:59 +02:00
Dmitriy Zaporozhets 057b1c317b Add new GitLab colors 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-08 13:29:14 +02:00
Dmitriy Zaporozhets d4892e4144 Merge branch 'rs-update-slack-notifier' into 'master' 
Update slack-notifier to ~> 1.2.0

Closes #2826 

See merge request !1533
 2015-10-08 09:33:48 +00:00
Dmitriy Zaporozhets cb00c15532 Merge branch 'rs-update-tinder' into 'master' 
Update tinder to ~> 1.10.0

Closes #2823 

See merge request !1534
 2015-10-08 09:26:44 +00:00
Dmitriy Zaporozhets 2272e1d419 Merge branch 'rs-update-rack-cors' into 'master' 
Update rack-cors to ~> 0.4.0

Closes #2800 

See merge request !1536
 2015-10-08 09:25:33 +00:00
Dmitriy Zaporozhets 978b433cdb Merge branch 'rs-update-haml-rails' into 'master' 
Update haml-rails to ~> 0.9.0

Closes #2804 

See merge request !1535
 2015-10-08 09:24:45 +00:00
Dmitriy Zaporozhets 2bccc13df8 Merge branch 'fix-build-highlight' into 'master' 
Fix build highlight

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

cc @ayufan 

See merge request !1539
 2015-10-08 09:11:53 +00:00
Douwe Maan 1912e9d0a8 Merge branch 'rs-quick-submit' into 'master' 
Add "Quick Submit" JS behavior

This takes the "Command+Enter" (or "Ctrl+Enter") quick-post behavior from the discussion field and expands it to fields throughout the application, most notably the issuable forms (e.g., New Issue, Edit Merge Request).

See merge request !1516
 2015-10-08 09:02:49 +00:00
Dmitriy Zaporozhets 63f2510740 Fix build highlight 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-08 11:00:10 +02:00
Robert Speicher 5e01e1bb90 Use methods: :any in our rack-cors configuration 
This was added in rack-cors 0.4.0 and allows all types of CORS requests
to the API.
 2015-10-07 22:08:37 -04:00
Robert Speicher f9744ea9a4 Update rack-cors to ~> 0.4.0 2015-10-07 22:08:30 -04:00
Robert Speicher 53f43910ad Update haml-rails to ~> 0.9.0 2015-10-07 21:59:16 -04:00
Robert Speicher a40cd65d3b Update tinder to ~> 1.10.0 2015-10-07 21:54:15 -04:00
Robert Speicher 511fb3ff2a Update slack-notifier to ~> 1.2.0 2015-10-07 21:51:05 -04:00
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 c670f07366 Merge branch 'clarify-postfix' into 'master' 
Clarify Reply by email settings when using Postfix mail server

Fixes #2902.

[ci skip]

See merge request !1528
 2015-10-07 19:59:57 +00: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
Douwe Maan f9aab3fb58 Clarify Reply by email settings when using Postfix mail server 2015-10-07 11:43:38 +02: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