summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix order of steps to prevent PostgreSQL errors when running migration [ci skip]doc-update-8.5-to-8.6-fix-steps-orderRodrigo Manhães2016-03-221-21/+21
|
* 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]
* | | | | | Merge branch 'gitlab_intro_docs' into 'master' Achilleas Pipinellis2016-03-229-81/+163
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitLab intro docs Related to https://gitlab.com/gitlab-org/marketing_monthly_release/issues/1 --- Need refactor: - Create a new project - Create a new group - Create a new issue - Assign labels to issues - Use milestones as an overview of your project's tracker - Fork a project and contribute to it - Create a new merge request - Automatically close issues from merge requests (include GitLab.com pattern) - GitLab CI quick start guide (make it easier to follow) Moved to https://gitlab.com/gitlab-org/gitlab-ce/issues/8068 See merge request !3225
| * | | | | Remove redundant wordAchilleas Pipinellis2016-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Refactor award emoji doc a bitAchilleas Pipinellis2016-03-221-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Fix grammar in intro guideAchilleas Pipinellis2016-03-221-2/+2
| | | | | |
| * | | | | Merge Git basics into Start using GitAchilleas Pipinellis2016-03-223-59/+63
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Add award emoji docsAchilleas Pipinellis2016-03-226-1/+49
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Change titles to be more descriptiveAchilleas Pipinellis2016-03-221-3/+3
| | | | | |
| * | | | | Remove blockquotesAchilleas Pipinellis2016-03-211-5/+5
| | | | | |
| * | | | | Simplify install and update sectiongitlab_intro_docsAchilleas Pipinellis2016-03-191-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Add h1 headingAchilleas Pipinellis2016-03-191-0/+2
| | | | | |
| * | | | | Add more options and missing linksAchilleas Pipinellis2016-03-191-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Merge branch 'master' into gitlab_intro_docsAchilleas Pipinellis2016-03-19333-5274/+5171
| |\ \ \ \ \
| * | | | | | No newlines between list itemsAchilleas Pipinellis2016-03-181-23/+12
| | | | | | |
| * | | | | | First draft on GitLab intro docsAchilleas Pipinellis2016-03-151-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge branch 'feature-ci-only-except-trigger' into 'master' Kamil Trzciński2016-03-224-10/+66
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CI: Add 'triggers' keyword to 'only' and 'except' lists to allow control over when triggers cause builds to run Currently, the `only` and `except` keywords in `.gitlab-ci.yml` only accept ref names or the special `branches` and `tags` keywords. However, these are primarily useful when controlling how repository activity affects the creation of builds. In my case, instead of building on every commit, I'd like to use the following logic: - If the repository is tagged, do a build. - Any other normal commits should not cause a build. - If a build is triggered via the API, always create one for the specified ref. From what I can tell, this isn't possible via the existing YAML syntax. In this MR, I introduce a new keyword `triggers` that goes along with `branches` and `tags`. I can implement the logic above using the following job configuration: ```yaml only: - tags - triggers ``` I updated the tests and documentation to reflect this and everything seems to pass. See merge request !3230
| * | | | | | | make conditional a bit clearerJason Roehm2016-03-151-1/+1
| | | | | | | |
| * | | | | | | fixed missing argument in listJason Roehm2016-03-151-1/+1
| | | | | | | |
| * | | | | | | fix rubocop violationJason Roehm2016-03-151-1/+1
| | | | | | | |
| * | | | | | | add some documentation for `triggers` keyword [ci skip]Jason Roehm2016-03-151-1/+12
| | | | | | | |
| * | | | | | | add tests for only/except 'triggers' keywordJason Roehm2016-03-151-0/+44
| | | | | | | |
| * | | | | | | add 'triggers' keyword to gitlab-ci.yml 'only' and 'except' fields to allow ↵Jason Roehm2016-03-152-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | control over whether triggers will cause jobs to run
* | | | | | | | Merge branch 'issue_12658' into 'master' Robert Speicher2016-03-221-1/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check if index exists before adding it I got an error when updating GDK because it already exists. [ci skip] See merge request !3335