summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fixed error with applications delete enonymous token formfix-application-settingsPhil Hughes2016-03-231-1/+1
| | | | Closes #14509
* Merge branch 'fix/issue-move-preserve-update-time' into 'master' Douwe Maan2016-03-233-3/+22
|\ | | | | | | | | | | | | Preserve time notes has been updated at when moving issue Closes #14490 See merge request !3356
| * Add Changelog entry for preserving timestamps when moving issueGrzegorz Bizon2016-03-231-0/+1
| |
| * Preserve time notes has been updated at when moving issueGrzegorz Bizon2016-03-232-3/+21
| |
* | Merge branch 'fix-build-dependencies' into 'master' Rémy Coutable2016-03-233-4/+11
|\ \ | | | | | | | | | | | | | | | | | | Fix build dependencies, when the dependency is a string Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14485 See merge request !3344
| * | Update CHANGELOGKamil Trzcinski2016-03-231-1/+1
| | |
| * | Test dependencies defined as symbolsKamil Trzcinski2016-03-231-0/+6
| | |
| * | Fix build dependencies, when the dependency is a stringKamil Trzcinski2016-03-233-5/+6
|/ /
* | Merge branch 'fix/14505' into 'master' Rémy Coutable2016-03-2311-41/+62
|\ \ | |/ |/| | | | | | | | | Fix an issue causing the Dashboard/Milestones page to be blank Fixes #14505 and #14514. See merge request !3348
| * Add CHANGELOG itemRémy Coutable2016-03-231-0/+1
| |
| * Add missing Dashboard::LabelsControllerRémy Coutable2016-03-232-0/+38
| |
| * Use respond_to instead of a conditional to paginate milestonesRémy Coutable2016-03-233-8/+9
| |
| * Fix an issue causing the Dashboard/Milestones page to be blankRémy Coutable2016-03-237-39/+20
|/
* Merge branch 'fix-sorting-by-votes-on-groups-page' into 'master' Douwe Maan2016-03-233-3/+59
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix sorting issues/mrs by votes on the groups page Closes #14394 The `non_archived` scope applied here https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/controllers/concerns/issues_action.rb#L5 overrides the previous `ORDER BY` applied inside the IssuesFinder, with the default scope of the Project model, resulting in SQL errors. ```ruby Issue.reorder(created_at: :desc).joins(:project).to_sql => "SELECT issues.* FROM issues INNER JOIN projects ON projects.id = issues.project_id ORDER BY issues.created_at DESC" Issue.reorder(created_at: :desc).joins(:project).merge(Project.non_archived).to_sql => "SELECT issues.* FROM issues INNER JOIN projects ON projects.id = issues.project_id WHERE projects.archived = 'f' ORDER BY projects.id DESC" Issue.reorder(created_at: :desc).joins(:project).merge(Project.non_archived.only(:where)).to_sql => "SELECT issues.* FROM issues INNER JOIN projects ON projects.id = issues.project_id WHERE projects.archived = 'f' ORDER BY issues.created_at DESC" ``` /cc @yorickpeterse See merge request !3333
| * Fix sorting issues/mrs by votes on the groups pagefix-sorting-by-votes-on-groups-pageDouglas Barbosa Alexandre2016-03-213-3/+59
| | | | | | | | | | | | | | | | The `non_archived` scope applied here https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/controllers/conc erns/issues_action.rb#L5 overrides the previous `ORDER BY` applied inside the IssuesFinder, with the default scope of the Project model, resulting in SQL errors.
* | Merge branch 'notifications-for-subscribers-confidential-issue-labels' into ↵Douwe Maan2016-03-235-7/+110
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Restrict notifications for confidential issues Closes #14468 /cc @rymai See merge request !3334
| * | Fix issues count on labels pagenotifications-for-subscribers-confidential-issue-labelsDouglas Barbosa Alexandre2016-03-222-5/+5
| | |
| * | Restrict notifications for confidential issuesDouglas Barbosa Alexandre2016-03-223-2/+105
| | |
* | | Merge branch ↵Douwe Maan2016-03-235-2/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'move-issue-section-should-not-be-displayed-in-the-new-issue-form-14489' into 'master' Moving of issuables only when the record already exists Closes #14489 See merge request !3340
| * | | Do not allow to move issue if it has not been persistedmove-issue-section-should-not-be-displayed-in-the-new-issue-form-14489Grzegorz Bizon2016-03-236-3/+17
| | | |
| * | | Moving of issuables only when the record already existsZeger-Jan van de Weg2016-03-231-1/+1
|/ / /
* | | Merge branch 'scss-lint-enable' into 'master' Robert Speicher2016-03-236-22/+29
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes last remaining lints and enables scss-lint test for GitLab CI. With this, builds will now fail if they break the SCSS style guide (at least, the parts enabled by the linter). Discussed in #14299. See merge request !3353
| * | | Fixes last remaining lints and enables scss-lint test for GitLab CI.connorshea2016-03-226-22/+29
|/ / / | | | | | | | | | | | | | | | | | | With this, builds will now fail if they break the SCSS style guide (at least, the parts enabled by the linter). Discussed in #14299.
* | | Merge branch 'css-selector-format' into 'master' Robert Speicher2016-03-221-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disabled SelectorFormat rule for SCSS Lint in order to get the Rake task passing sooner. SelectorFormat enforces that CSS classes and IDs use lowercase hyphenated style, `like-this`, but a not-insignificant amount of selectors in the codebase are `like_this`. Fixing the selectors that break this rule would require changing HTML as well, and potentially break JavaScript hooks, among other things. So I decided to disable this rule for the time being, hopefully making it easier to fix all the remaining warnings SCSS Lint is giving by removing the most problematic rule. Discussed in #14299. See merge request !3309
| * | | Disabled SelectorFormat rule for SCSS Lint in order to get the Rake task ↵connorshea2016-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | passing sooner. Discussed in #14299. [ci skip]
* | | | Merge branch 'merge-request-sidebar' into 'master' Jacob Schatz2016-03-224-31/+30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed bug where participants would not work correctly on merge requests Also fixed alignment bug with can't merge badge Closes #14478, #14494 See merge request !3329
| * | | | Fixed bug where participants would not work correctly on merge requestsmerge-request-sidebarPhil Hughes2016-03-214-31/+30
| | | | | | | | | | | | | | | | | | | | Also fixed alignment bug with can't merge badge
* | | | | Merge branch 'header-mobile-overflow' into 'master' Jacob Schatz2016-03-223-4/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes issue with signin button overflowing on mobile Closes #14477 ![Screen_Shot_2016-03-22_at_13.52.51](/uploads/7c9b2c38be7d497c690a7d17ae0ca76d/Screen_Shot_2016-03-22_at_13.52.51.png) ![Screen_Shot_2016-03-22_at_13.52.43](/uploads/8b2432aeb4afec455286fced11c5490c/Screen_Shot_2016-03-22_at_13.52.43.png) See merge request !3342
| * | | | | Fixes issue with signin button overflowing on mobileheader-mobile-overflowPhil Hughes2016-03-223-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | Closes #14477
* | | | | | Merge branch 'auto-collapse-nav' into 'master' Jacob Schatz2016-03-221-2/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto collapses the navigation when resizing Closes #14475 ![auto-collapse](/uploads/332c6261acb6bc30d7d30cbdfafe92eb/auto-collapse.gif) See merge request !3343
| * | | | | | Auto collapses the navigation when resizingauto-collapse-navPhil Hughes2016-03-221-2/+9
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Closes #14475
* | | | | | Merge branch 'issue_13885' into 'master' Jacob Schatz2016-03-227-4/+50
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display nav controls on mobile Set inputs inside .nav-controls to full-width on viewports below 600px Fixes #13885 **Affected pages** /dashboard/groups /admin/builds /dashboard/projects /dashboard/issues /dashboard/merge_requests /dashboard/milestones /dashboard/todos /explore /groups/{group-name}/issues /groups/{group-name} /groups/{group-name}/milestones /{group-name}/{project-name}/builds /{group-name}/{project-name}/forks /{group-name}/{project-name}/issues /{group-name}/{project-name}/labels /{group-name}/{project-name}/merge_requests /{group-name}/{project-name}/milestones /{group-name}/{project-name}/wikis/home /{group-name}/{project-name}/wikis/pages Some Screenshots **Groups** ![Screen_Shot_2016-03-15_at_2.22.23_PM](/uploads/b55348676693cc3ff67cddc4528f7f6c/Screen_Shot_2016-03-15_at_2.22.23_PM.png) **Admin > Builds** ![admin-builds](/uploads/2e84119660f4895a1530883412c4b728/admin-builds.png) **TODOs** ![todos](/uploads/84344c43011e22f902701038932d3eaa/todos.png) **Dashboard > Projects** ![dashboards-projects](/uploads/f508d9107598038798aa10485d3d5cfe/dashboards-projects.png) **Project Issues** ![issues](/uploads/d6c69a8f81ee07da95b2a3b99b81cf51/issues.png) **Project Merge Requests** ![merge_requests](/uploads/b3c1a537f28931bd38077c36627a0d7a/merge_requests.png) See merge request !3214
| * | | | | | Adjust CSSissue_13885Alfredo Sumaran2016-03-181-2/+2
| | | | | | |
| * | | | | | Add missing labelAlfredo Sumaran2016-03-181-0/+2
| | | | | | |
| * | | | | | Fixes inputs width inside .nav-controlsAlfredo Sumaran2016-03-184-3/+26
| | | | | | |
| * | | | | | Sidebar should be on top of dropdownsAlfredo Sumaran2016-03-181-1/+1
| | | | | | |
| * | | | | | Display nav controls on mobileAlfredo Sumaran2016-03-182-3/+24
| | | | | | |
* | | | | | | Merge branch 'label-dropdown-errors' into 'master' Jacob Schatz2016-03-224-1/+21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shows error messages when trying to create label in dropdown menu Closes #14495 ![Screen_Shot_2016-03-22_at_14.46.10](/uploads/cdcaa51f4d41237f8027efbd0f894bcd/Screen_Shot_2016-03-22_at_14.46.10.png) See merge request !3345
| * | | | | | | Shows error messages when trying to create label in dropdown menulabel-dropdown-errorsPhil Hughes2016-03-224-1/+21
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Closes #14495
* | | | | | | Merge branch 'fix-milestone-assign' into 'master' Jacob Schatz2016-03-221-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes issue with assign milestone not loading milestone list cc. @jschatz1 See merge request !3346
| * | | | | | | Fixes issue with assign milestone not loading milestone listfix-milestone-assignPhil Hughes2016-03-221-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'grafana_documentation' into 'master' Drew Blessing2016-03-227-1/+120
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grafana installation and configuration documentation Adding documentation for installing and configuring Grafana. This also includes providing dashboards users can import. Fixes gitlab-org/omnibus-gitlab#1008 cc/ @axil See merge request !3015
| * | | | | | | Grafana installation and configuration documentation. [ci skip]Drew Blessing2016-03-227-1/+120
| | | | | | | |
* | | | | | | | Merge branch 'drop_db_before_restore' into 'master' Robert Speicher2016-03-227-26/+171
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reload the schema before restoring a database backup If a user tries to downgrade and restore after a failed upgrade, the database may still contain newer tables. Reload the older schema before restoring the database to avoid future upgrade problems. Also, add a rake task to help users add migration versions to the database so it's easier to recover from these errors if they do occur. Fixes #13419 See merge request !2807
| * | | | | | | | Reload the schema before restoring a database backupDrew Blessing2016-03-217-26/+171
| | | | | | | | |
* | | | | | | | | Merge branch 'delete-button-on-edit-issue-has-no-confirmation-14474' into ↵Douwe Maan2016-03-221-1/+2
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' User has to confirm deletion of issuables Closes #14474 See merge request !3341
| * | | | | | | | User has to confirm deletion of issuablesZeger-Jan van de Weg2016-03-221-1/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Update CHANGELOGRémy Coutable2016-03-221-2/+9
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge branch 'doc_group_visibility' into 'master' Achilleas Pipinellis2016-03-221-8/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs on group visibility Accompanying https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3323 See merge request !3338
| * | | | | | | Add docs on group visibilityAchilleas Pipinellis2016-03-221-8/+15
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | [ci skip]