home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 08:36:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,641 Commits 48 Branches 340 Tags
cde076c5259b4d24dfe85cd542f73de02ecfc20d
Commit Graph
9663 Commits
Author SHA1 Message Date
Robert Speicher 5b0be0621d Merge branch 'master' into 'master' 
Persist filters when sorting on user admin page

Closes #2806

See merge request !1543
 2015-10-10 18:22:16 +00:00
Jerry LukinsandJerry Lukins 78de79d779 Persist filters when sorting on user admin page 2015-10-10 09:04:45 -04:00
Dmitriy Zaporozhets c99e9edce7 Merge branch 'fix-remove-button-alignment' into 'master' 
In SSH key detailed view, align the "Remove" button with the right container

Also fixes a bootlint warning.

Before:

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/d6d8765ed9dceb6a31a6b4475b2166e1/image.png)

After:

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/8252211125ace212335aa6bf2ba78549/image.png)


See merge request !1555
 2015-10-10 11:23:36 +00:00
Dmitriy Zaporozhets 19fd34d9ef Merge branch 'make-diff-css-better-for-mobile' into 'master' 
Make diff file view easier to use on mobile screens

Viewing diffs on a mobile screen is a bit of an awkward experience at the moment. Here are a few issues (by no means complete):

## Before

### Tabs are scrunched

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/45924e36cfb107dc56795a7dcdfbc5b5/image.png)

### Filenames take too much room, buttons cluttered

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/a5e5611271fe26dfd3922aa0b8780458/image.png)

## After

This MR makes a few tweaks to make this a bit better. It just addresses a few issues, but there is plenty of room for improvement (e.g. shrink fonts, etc.):

### Eliminate padding to make tabs fit

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

### Make filenames, buttons more readable

This screenshot allows the filename to use the whole row, omits the file mode changes, and puts the buttons centered in the view:

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

Towards a better mobile experience: #2787 

See merge request !1449
 2015-10-10 08:21:04 +00:00
Dmitriy Zaporozhets 1a881a71f5 Merge branch 'fix-issue-filter-dropdown-labels' into 'master' 
Restore placeholders in issue filters from "Any" to "Milestone" and "Label"

1f11096c included new filters but made it hard to determine which dropdown did
what. This patch restores the original placeholders.

### Before

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/2326b836e364275341ea0ad8c0a0926b/image.png)

### After

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/b0e519f9cf8d1a3c0f054286e3b809cb/image.png)


See merge request !1554
 2015-10-09 12:59:37 +00:00
Stan Hu 972b637081 In SSH key detailed view, align the "Remove" button with the right container 2015-10-09 05:30:42 -07:00
Stan Hu b5d9a613d9 Make diff file view easier to use on mobile screens 2015-10-09 05:01:27 -07:00
Douwe Maan 192dd58d03 Merge branch 'rs-mr-tab-loader' into 'master' 
Make the loading spinner toggle more explicit

Occasionally the loading spinner would stay visible after the tab
finished loading. This change makes the toggle explicit so that it's
always shown on `beforeSend`, and always hidden on `complete`.

Plus a bonus semi-colon eradication! 💥

See merge request !1553
 2015-10-09 11:36:15 +00:00
Dmitriy Zaporozhets 6ba1e17c44 Merge branch 'improve_empty_fork' into 'master' 
Show message if user tries to fork and has no available namespaces

This merge request improves the UX when users try to fork a project and have no eligible namespaces. 

### Current behavior

![Screen_Shot_2015-09-25_at_1.39.45_PM](https://gitlab.com/dblessing/gitlab-ce/uploads/45a303703a0197e78f7f9bdbea8718b5/Screen_Shot_2015-09-25_at_1.39.45_PM.png)

### Proposed behavior

![Screen_Shot_2015-09-25_at_1.38.57_PM](https://gitlab.com/dblessing/gitlab-ce/uploads/613c53bcfb52d79fdf8bd1d09410c152/Screen_Shot_2015-09-25_at_1.38.57_PM.png)

### Things to check

I'm not exactly loving the wording I have here. I'm open to improvements.


See merge request !1441
 2015-10-09 07:44:21 +00:00
Stan Hu b60bc655f2 Restore placeholders in issue filters from "Any" to "Milestone" and "Label" 
1f11096c included new filters but made it hard to determine which dropdown did
what. This patch restores the original placeholders.
 2015-10-08 23:53:32 -07:00
Han Loong Liauw 95411f7151 fixed positioning of hamburger menu on header 
- Changed to margin for vertical allign as used in bootstrap 3 original
 - Also added an `active` state to show when the extra items are enabled
 2015-10-09 14:05:55 +11:00
Robert Speicher 29fe488b0c Make the loading spinner toggle more explicit 
Occasionally the loading spinner would stay visible after the tab
finished loading. This change makes the toggle explicit so that it's
always shown on `beforeSend`, and always hidden on `complete`.

Plus a bonus semi-colon eradication! 💥
 2015-10-08 20:53:29 -04:00
Drew Blessing fce4f13803 Show message if user tries to fork and has no available namespaces 2015-10-08 15:20:19 -05:00
Dmitriy Zaporozhets 0a8f90a040 Merge remote-tracking branch 'public/project-find-with-namespace-performance' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-08 17:42:14 +02:00
Dmitriy Zaporozhets 69bcef32e1 Merge remote-tracking branch 'public/trending-projects-performance' 2015-10-08 16:22:43 +02:00
Dmitriy Zaporozhets a2374758e3 Merge branch 'implement-new-gitlab-colors' into 'master' 
Add new GitLab colors

After this merge request all css must use variables for colours.

![7Od6vP7usJ__1_](https://gitlab.com/gitlab-org/gitlab-ce/uploads/01dd327770f25c76448a5860a76e34c9/7Od6vP7usJ__1_.png)
 
cc @skyruler 

See merge request !1542
 2015-10-08 13:38:10 +00:00
Yorick Peterse 03417456f0 Revamp finding projects by namespaces 
By using a JOIN we can remove the need for using 2 separate queries to
find a project by its namespace. Combined with an index (only needed for
PostgreSQL) this reduces the query time from ~245 ms (~520 ms for the
first call) down to roughly 10 ms (~15 ms for the first call).
 2015-10-08 14:35:32 +02:00
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
Stan Hu c789452134 Merge branch 'XenGi/gitlab-ce-master' 2015-10-08 03:41:07 -07: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
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 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
Yorick Peterse 1190d0ab3d Added concern for case-insensitive WHERE queries 
On PostgreSQL these queries use LOWER(...) to compare columns and
values. For MySQL a regular WHERE is performed as MySQL is already
case-insensitive.
 2015-10-07 23:32:14 +02:00
Robert Speicher fcf99d0d09 Check originalEvent.repeat 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 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
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
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 8dcc8e5db6 Fix routing in CI mailer 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-07 10:26:40 +02: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