home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-25 04:26:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,606 Commits 48 Branches 340 Tags
63adaacdc85bbde4e51f612012249c1d499ca181
Commit Graph
19606 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 63adaacdc8 Merge branch 'fix-header-hamburger-positioning' into 'master' 
Fixed positioning of hamburger menu on header

Hey guys just noticed the hamburger menu for the top navigation was mis-aligned on 
`gitlab-ce:master` and `gitlab.com`.
I was not able to find an open issue or merge request directly referencing this issue so thought I would add a quick fix.

### Changes

This MR changes the vertical positioning from `top` to vertical margins (Like in bootstrap itself).
 - Also added a minor fix to remove `border-top` from the collapse menu so its the same height as the navigation.
 - finally added an active class to the hamburger toggle so you can see when its open.

This changes an element in `app/views/layouts/header/_default.html.haml` and thus would impact most pages behind login.

## Screenshots

### Before

![before](https://gitlab.com/hanloong/gitlab-ce/uploads/e3d4631dd0420ec0e9048c435a2f734b/before.png)

### After

![after](https://gitlab.com/hanloong/gitlab-ce/uploads/7c93c3ef1b01fbefc39c5a1ed61c2d1b/after.png)

Happy to discuss any changes/suggestions.

Thanks

See merge request !1541
 2015-10-09 07:40:09 +00: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
Stan Hu 680b6d88a5 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-10-08 10:39:37 -07:00
Stan Hu 9440589197 Merge pull request #9693 from bbodenmiller/patch-1 
allow crawling of commit page but not patch/diffs
 2015-10-08 10:37:23 -07:00
Douwe Maan 6db238dee9 Merge branch 'workaround-seed-fu-issue' into 'master' 
Fixes GDK issue where repos would not be imported properly

Seed-Fu runs this entire fixture in a transaction, so the `after_commit`
hook won't run until after the fixture is loaded. That is too late
since the Sidekiq::Testing block has already exited. Force clearing
the `after_commit` queue to ensure the job is run now.

See: gitlab-org/gitlab-development-kit#58

See merge request !1513
 2015-10-08 16:10:14 +00:00
Dmitriy Zaporozhets 1115caf8e3 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-10-08 17:42:42 +02: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
Stan Hu fb7922a8d5 Merge branch 'update-upgrade-guide-for-redis-2.4.0' into 'master' 
Update upgrade guide for Redis >= 2.4.0 requirement

[ci skip]

Closes #2837

See merge request !1468
 2015-10-08 15:00:20 +00: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 2d779f70ae Added changelog for project namespace performance 2015-10-08 14:35:37 +02:00
Yorick Peterse c8f18fc562 Added dedicated Rake task for setting up Postgres 
This ensures any PostgreSQL specific schema changes (e.g. expression
indexes) are created when setting up the database.
 2015-10-08 14:35:36 +02: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 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
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
Yorick Peterse 85c6a3743a Added methods for detecting MySQL/PostgreSQL 
These two methods remove the need for manually going into
ActiveRecord::Base.connection all over the place.
 2015-10-07 23:32:14 +02: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