Commit Graph
28124 Commits
Author SHA1 Message Date
Phil Hughes fac08c3bcd Fixed up JS comments 2016-05-20 09:20:35 +01:00
Phil Hughes 7df4b16b56 Fixed issue with not being able to search text & filter 2016-05-16 10:30:59 +01:00
Phil Hughes 31b1dc3c31 Fixed failing rubocop tests
Fixed issue with issuable checkboxs not being init'd
2016-05-16 10:29:47 +01:00
Phil Hughes 7eb97ef402 Added issue_search parameter 2016-05-16 10:29:47 +01:00
Phil Hughes 1a086745fc Fixed tests 2016-05-16 10:29:47 +01:00
Phil Hughes fdc949073c Fixed issue with not being able to sort and filter 2016-05-16 10:29:47 +01:00
Phil Hughes 471d7a5b32 Added tests 2016-05-16 10:29:47 +01:00
Phil Hughes 3a76cc5c41 Fixed Ruby issues 2016-05-16 10:29:47 +01:00
Phil Hughes 832d7fa3ce Issuable filtering improvements
This improves the filtering of issues and merge requests by creating a single file that encapsulates all the filtering. Previously this was done with a file for issues and a file for merge requests.

Created the ability for the text search to be done alongside other filterables. Previously because this was outside the filterable form, this wasn't possible and would instead do either filter dropdown or text filter - not both.
2016-05-16 10:29:47 +01:00
Yorick Peterse 78a67fc48d Merge branch 'add-cache-count-metrics' into 'master'
Add cache count metrics to rails cache

See merge request !4157
2016-05-16 03:34:07 +00:00
Pablo Carranza b9306c2e82 Add cache count metrics to rails cache 2016-05-15 19:47:41 +01:00
Dmitriy Zaporozhets c3f68b1091 Merge branch 'dz-change-sidebar-colors' into 'master'
Change colors for charcoal and graphite sidebar themes

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

cc @skyruler @jschatz1 

See merge request !4149
2016-05-14 14:38:19 +00:00
Dmitriy Zaporozhets cf6d4e9db5 Change colors for charcoal and graphite sidebar themes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-14 00:48:49 -05:00
Douwe Maan c3acc8222e Merge branch 'refactor-diff-notes' into 'master'
Refactor diff notes

Related to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4101

/cc @rspeicher 

See merge request !4110
2016-05-13 23:20:16 +00:00
Douwe Maan 876dc7bacb Rename diff_with_notes partial. 2016-05-13 17:31:59 -05:00
Douwe Maan e5ce166806 Satisfy Rubocop 2016-05-13 17:31:58 -05:00
Douwe Maan e0bb169ae3 "the outdated diff" -> "an outdated diff" 2016-05-13 17:31:58 -05:00
Douwe Maan c452fa8124 Update specs 2016-05-13 17:31:58 -05:00
Douwe Maan 7848d54f5b Clean up LegacyDiffNote somewhat 2016-05-13 17:31:58 -05:00
Douwe Maan 9a3ed265e9 Use @diff_notes_disabled instead of @comments_allowed 2016-05-13 17:31:58 -05:00
Douwe Maan 99d3e21f19 Extract LegacyDiffNote out of Note 2016-05-13 17:31:43 -05:00
Achilleas Pipinellis 61756ecca9 Merge branch 'doc_to_docs' into 'master'
Change all occurrences of doc.gitlab.com to docs.gitlab.com

Now that https://gitlab.com/gitlab-com/operations/issues/233 kicked in.

See merge request !4148
2016-05-13 21:29:56 +00:00
Achilleas Pipinellis 9eb4569ed9 Change all occurrences of doc.gitlab.com to docs.gitlab.com
[ci skip]
2016-05-13 16:26:56 -05:00
Achilleas Pipinellis d7a28f3c12 Merge branch 'revert-3955' into 'master'
Revert "Merge branch 'doc-fix-db-gem-install-instructions' into 'master'"

This reverts commit 66d8ef1ad9, reversing
changes made to 6a8359f3d3.

The `--with` option was added in Bundler 1.10 but in this case it
shouldn't even be needed: I've tested the original command locally and
the pg gem was installed, so I believe the user that opened the original
MR ran the wrong command (i.e. `sudo -u git -H bundle install --without
development test postgres --deployment` instead of `sudo -u git -H bundle
install --without development test mysql --deployment`.

See discussion at
https://gitlab.com/gitlab-org/gitlab-ce/commit/66d8ef1ad9d5952b7e7f026658f71aafc861950e
for more context.

See merge request !4144
2016-05-13 20:51:06 +00:00
Douwe Maan 710ebf164f Merge branch 'remove-deprecated-finders' into 'master'
Remove activerecord-deprecated_finders gem

We don’t use any of the deprecated finders, so it should be safe to remove.

See https://github.com/rails/activerecord-deprecated_finders#active-record-deprecated-finders for more information.

Resolves #17015.

See merge request !3981
2016-05-13 20:49:38 +00:00
Robert Speicher 5e130c3e39 Merge branch 'rubocop/space-around-operators' into 'master'
Rubocop: require space round operators

This enables rubocop to require space around opertators and fix offenses in the codebase.
There is another merge-request to solve remaining offenses in EE codebase, merge it first: gitlab-org/gitlab-ee!388

Fixes #17398 

See merge request !4112
2016-05-13 19:22:14 +00:00
Dmitriy Zaporozhets 7a83f2c35c Merge branch '17338-sidebar-width' into 'master'
Reduce width of side nav

Closes #17338    
Part of #14838    
Left: old; Right: new    
<img src="/uploads/7dba5f22d6bdf1249bab5166addb25b5/Screen_Shot_2016-05-10_at_4.34.07_PM.png" width="500px">

See merge request !4109
2016-05-13 18:16:16 +00:00
Dmitriy Zaporozhets 8ece393a16 Merge branch '17501-dropdown-bug' into 'master'
Fix mobile dropdown bug

Closes #17501     
![dropdown](/uploads/d0cc6d9472bd8aa1aaf392d5c4eb3791/dropdown.gif)



See merge request !4142
2016-05-13 17:16:04 +00:00
Dmitriy Zaporozhets 0808a87f46 Merge branch 'dz-fix-issue-sidebar' into 'master'
Fix UI issues caused by header height decrease to 50px

- fix blank spacing for issue sidebar
- fix login btn alignment for non logged in users

See merge request !4143
2016-05-13 17:13:56 +00:00
Robert Speicher 76d16c26d2 Merge branch 'dz-update-changelog' into 'master'
Add UI changes in 8.8 to changelog

For !3824 and !3980

[ci skip]

See merge request !4140
2016-05-13 17:08:55 +00:00
Rémy Coutable 935c684ad3 Revert "Merge branch 'doc-fix-db-gem-install-instructions' into 'master' "
This reverts commit 66d8ef1ad9, reversing
changes made to 6a8359f3d3.

The `--with` option was added in Bundler 1.10 but in this case it
shouldn't even be needed: I've tested the original command locally and
the pg gem was installed, so I believe the user that opened the original
MR ran the wrong command (i.e. `sudo -u git -H bundle install --without
development test postgres --deployment` instead of `sudo -u git -H bundle
install --without development test mysql --deployment`.

See discussion at
https://gitlab.com/gitlab-org/gitlab-ce/commit/66d8ef1ad9d5952b7e7f026658f71aafc861950e
for more context.
2016-05-13 18:39:32 +02:00
Dmitriy Zaporozhets 9a7a041553 Fix login btn vertical align
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-13 11:24:00 -05:00
Dmitriy Zaporozhets 2148566b3d Fix issue sidebar top position after header height change
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-13 11:21:31 -05:00
Annabel Dunstone 16b1d3a34f Fix mobile dropdown bug 2016-05-13 11:12:49 -05:00
Dmitriy Zaporozhets 22ff0d3421 Merge branch 'dz-improve-sidebar-design' into 'master'
Remove background color differentiation from gitlab logo/text in sidebar

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

cc @annabeldunstone @skyruler 

See merge request !4139
2016-05-13 15:44:11 +00:00
Dmitriy Zaporozhets 6da2405603 Add UI changes in 8.8 to changelog
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-13 10:05:52 -05:00
Dmitriy Zaporozhets ae89161db5 Remove background color differentiation from gitlab logo/text in sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-13 09:25:38 -05:00
Dmitriy Zaporozhets c37006fa4f Merge branch '17485-broadcast-msg' into 'master'
Move broadcast msg into content-wrapper

Closes #17485  

<img src="/uploads/ab365f471209c55d2ee876cf558d4032/Screen_Shot_2016-05-12_at_4.21.22_PM.png" width="800px">

See merge request !4132
2016-05-13 13:04:36 +00:00
Gabriel Mazetto 8d58e691c6 remove extra space to fix codestyle 2016-05-13 04:51:13 -03:00
Gabriel Mazetto f5a0ac0fc1 Codestyle: make sure we have space around operators 2016-05-13 04:46:56 -03:00
Gabriel Mazetto 311fb58c44 Require space around operators 2016-05-13 04:45:52 -03:00
Douwe Maan 6aef256733 Merge branch 'fix_health_check_type' into 'master'
Fix minor typos in admin health check page

Fix minor typos from gitlab-org/gitlab-ce!3888

cc/ @DouweM @twk3 

See merge request !4134
2016-05-12 23:03:36 +00:00
Douwe Maan d2fb451c8f Merge branch 'rs-cleanup-events_helper_spec' into 'master'
Clean up EventsHelper spec

Extracted from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4090

See merge request !4133
2016-05-12 22:41:19 +00:00
Robert Speicher 4735a75340 Merge branch 'deprecated-class-methods-cop' into 'master'
Enable the Rubocop DeprecatedClassMethods cop

This reports uses of `File.exists?` and `Dir.exists?`, which were both
deprecated in Ruby and will eventually be removed in favor of `.exist?`.
Also fixes all existing uses of the deprecated methods.

See merge request !4087
2016-05-12 22:41:01 +00:00
Drew Blessing 4fea5cda0b Fix minor typos in admin health check page 2016-05-12 17:11:37 -05:00
Annabel Dunstone 7bc594735b Undo changes; reduce sidebar internal width 2016-05-12 17:06:47 -05:00
Robert Speicher 5186f6e3bd Merge branch 'default-scope-on-builds-page' into 'master'
Fix a description for default scope on builds

Should be "**All* builds (from this project)" for the {project,admin}
builds page without scope.

Fix a regression on !2243 (#4240).

See merge request !4118
2016-05-12 22:01:40 +00:00
Robert Speicher 05bbad5817 Clean up EventsHelper spec 2016-05-12 16:52:56 -05:00
Douwe Maan 850234ebd2 Merge branch 'feature/label-subscription-api' into 'master'
Add API endpoints for un/subscribing from/to a label



See merge request !4051
2016-05-12 21:51:21 +00:00
Douwe Maan 7fc51d1908 Merge branch 'health-check-route'
# Conflicts:
#	db/schema.rb
2016-05-12 16:39:03 -05:00