summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* [skip ci] Replace hidden-smClement Ho2018-04-0926-30/+30
|
* [skip ci] Replace hidden-mdClement Ho2018-04-091-1/+1
|
* [Skip ci] replace .hidden-lgClement Ho2018-04-095-12/+12
|
* [skip ci] Replace .visible-lg-* with .d-block.d-xl-noneClement Ho2018-04-092-2/+2
|
* [skip ci] Replace .visible-md-* with .d-block.d-lg-noneClement Ho2018-04-092-2/+2
|
* [skip ci] Replace .visible-sm-* with .d-block.d-md-noneClement Ho2018-04-098-11/+11
|
* [skip ci] Fix mistake of d-block instead of d-inline-blockClement Ho2018-04-091-1/+1
|
* [skip ci] Replace .visible-xs-* with .d-block.d-sm-noneClement Ho2018-04-0917-21/+21
|
* [skip ci] Rename .progress-bar- to .bg-Clement Ho2018-04-091-1/+1
|
* [skip ci] Replace .success with .table-successClement Ho2018-04-091-1/+1
|
* [skip ci] rename .info to .table-infoClement Ho2018-04-092-2/+2
|
* [skip ci] Update .warning to .table-warningClement Ho2018-04-091-1/+1
|
* [skip ci] Rename .hide to .d-noneClement Ho2018-04-0921-35/+35
|
* [skip ci] Replace .pull-right with .float-rightClement Ho2018-04-09123-181/+181
|
* Replace .pull-left with .float-leftClement Ho2018-04-0941-56/+56
|
* Add .breadcrumb-item for breadcrumb > liClement Ho2018-04-096-13/+13
|
* Fix bad merge conflictClement Ho2018-04-092-2/+2
|
* Merge branch 'master' into 'bootstrap4'Clement Ho2018-04-09206-1098/+3539
|\ | | | | | | | | | | # Conflicts: # app/helpers/issuables_helper.rb # app/views/projects/_home_panel.html.haml # app/views/projects/commits/_commit.html.haml
| * Merge branch ↵Yorick Peterse2018-04-0915-41/+41
| |\ | | | | | | | | | | | | | | | | | | 'fix-n-plus-one-when-getting-notification-settings-for-recipients' into 'master' Use Goldiloader for handling N+1 queries See merge request gitlab-org/gitlab-ce!18217
| | * Add cop for has_many :through without disabled autoloadingfix-n-plus-one-when-getting-notification-settings-for-recipientsSean McGivern2018-04-099-28/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Goldiloader is great, but has several issues with has_many :through relations: * https://github.com/salsify/goldiloader/issues/12 * https://github.com/salsify/goldiloader/issues/14 * https://github.com/salsify/goldiloader/issues/18 Rather than try to figure out which applies in each case, we should just do the drudge work of manually disabling autoloading for all relations of this type. We can always use regular preloading for specific cases, but this way we avoid generating invalid queries through Goldiloader's magic.
| | * Use Goldiloader for handling N+1 queriesYorick Peterse2018-04-098-13/+13
| | | | | | | | | | | | | | | | | | | | | Goldiloader (https://github.com/salsify/goldiloader) can eager load associations automatically. This removes the need for adding "includes" calls in a variety of different places. This also comes with the added benefit of not having to eager load data if it's not used.
| * | Merge branch 'sh-bump-ruby-and-git-image-ci' into 'master'Rémy Coutable2018-04-091-0/+8
| |\ \ | | | | | | | | | | | | | | | | Bump Ruby to 2.3.7 and git to 2.17.0 in CI image See merge request gitlab-org/gitlab-ce!18244
| | * | Work around Ruby 2.3.7 bug by defining prepended class methods needed for testsStan Hu2018-04-091-0/+8
| | | |
| * | | Merge branch '44296-commit-path' into 'master'Phil Hughes2018-04-091-49/+58
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Cannot read property 'commit_path' of null" Closes #44296 See merge request gitlab-org/gitlab-ce!18231
| | * | | Checks if commit information exists before trying to render it44296-commit-pathFilipa Lacerda2018-04-061-49/+58
| | | | |
| * | | | Merge branch 'blackst0ne-rails5-fix-frozen-array' into 'master'Sean McGivern2018-04-091-2/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [Rails5] Fix `can't modify frozen Array` errors See merge request gitlab-org/gitlab-ce!18239
| | * | | | Refactor `add_recipients`blackst0ne-rails5-fix-frozen-arrayblackst0ne2018-04-091-3/+2
| | | | | |
| | * | | | [Rails5] Fix spec/requests/projects/cycle_analytics_events_spec.rbblackst0ne2018-04-071-1/+1
| | | | | |
| * | | | | Merge branch '41981-allow-group-owner-to-enable-runners-from-subgroups' into ↵Yorick Peterse2018-04-091-10/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Group owner cannot enable/disable specific-runners which was registered in a project under a subgroup" Closes #41981 See merge request gitlab-org/gitlab-ce!18009
| | * | | | | Remove unused User#manageable_group_projects (#41981)Dylan Griffith2018-04-091-4/+0
| | | | | | |
| | * | | | | Use project_authorizations instead of members to calculate manageable CI ↵Dylan Griffith2018-04-091-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | projects to speed up query (#41981)
| | * | | | | Allow group owner to enable runners from subgroups (#41981)Dylan Griffith2018-04-091-5/+12
| | | | | | |
| * | | | | | Merge branch 'move-board-blank-state-vue-component' into 'master'Filipa Lacerda2018-04-092-34/+41
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Move BoardBlankState vue component See merge request gitlab-org/gitlab-ce!17666
| | * | | | | Move BoardBlankState vue componentGeorge Tsiolis2018-04-072-34/+41
| | | | | | |
| * | | | | | Merge branch 'sh-fix-issue-45152' into 'master'Grzegorz Bizon2018-04-092-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix undefined method `one?` when pushing to an existing merge request Closes #45152 See merge request gitlab-org/gitlab-ce!18243
| | * | | | | | Fix undefined method `one?` when pushing to an existing merge requestsh-fix-issue-45152Stan Hu2018-04-072-2/+2
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An untested code path was triggering an Exception because Fixnum doesn't have `one?` implemented in Rails, while arrays and collections do. Closes #45152
| * | | | | | Merge branch '44224-remove-gl' into 'master'Phil Hughes2018-04-0913-31/+27
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove modal boards code from global namepsace See merge request gitlab-org/gitlab-ce!18222
| | * | | | | | Remove modal store and mixins from global scope44224-remove-glFilipa Lacerda2018-04-0613-31/+27
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'blackst0ne-rails5-replace-true-values-with-false-values' into ↵Sean McGivern2018-04-091-1/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' [Rails5] Add FALSE_VALUES constant to Service#boolean_accessor See merge request gitlab-org/gitlab-ce!18240
| | * | | | | | [Rails5] Add FALSE_VALUES constant to Service#boolean_accessorblackst0ne-rails5-replace-true-values-with-false-valuesblackst0ne2018-04-081-1/+5
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Rails 5.0 the `ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES` constant has been removed [1] and the remaining `FALSE_VALUES` constant has been moved to `ActiveModel::Type::Boolean` [2] [1]: https://github.com/rails/rails/commit/a502703c3d2151d4d3b421b29fefdac5ad05df61 [2]: https://github.com/rails/rails/commit/9cc8c6f3730df3d94c81a55be9ee1b7b4ffd29f6
| * | | | | | Merge branch '32617-fix-template-selector-menu-visibility' into 'master'Phil Hughes2018-04-092-1/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Template selectors menu title mistakenly shown after toggling previewed changes" Closes #32617 See merge request gitlab-org/gitlab-ce!18118
| | * | | | | | Fix template selector menu visibilityFabian Schneider2018-04-082-1/+5
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'sh-handle-legacy-archive-requests' into 'master'Douwe Maan2018-04-091-2/+7
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle legacy repository archive requests with no ref given Closes #45154 See merge request gitlab-org/gitlab-ce!18246
| | * | | | | Handle legacy repository archive requests with no ref givensh-handle-legacy-archive-requestsStan Hu2018-04-081-2/+7
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The legacy endpoint requires no reference and defaults to the root ref. Closes #45154
| * | | | | Projects and groups badges settings UIFrancisco Javier López2018-04-0826-9/+1050
| |/ / / /
| * | | | Handle limit for datetime attributes on MySQLMayra Cabrera2018-04-067-40/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The TIMESTAMP data type is used for values that contain both date and time parts. TIMESTAMP has a range of '1970-01-01 00:00:01' UTC to '2038-01-19 03:14:07' UTC. A Forever lib class was included to handle future dates for PostgreSQL and MySQL, also changes were made to DeployToken to enforce Forever.date Also removes extra conditional from JwtController
| * | | | Handles default expires_at date directly into DeployToken modelMayra Cabrera2018-04-063-4/+6
| | | | |
| * | | | Removes deploy tokens presenterMayra Cabrera2018-04-063-21/+2
| | | | |
| * | | | Addresses database commentsMayra Cabrera2018-04-067-15/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Adds a default on expires_at datetime - Modifies deploy tokens views to handle default expires at value - Use datetime_with_timezone where possible - Remove unused scopes
| * | | | Fix form javascriptKamil Trzciński2018-04-063-18/+24
| | | | |
View Lorry Controller Status