summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Return nil as coverage instead of a File objectzj-fix-coverage-bugZ.J. van de Weg2017-04-121-2/+1
| | | | | | | | | Given a valid pipeline job, and a regex which wouldn't match to a jobs trace, the stream of the trace would return the File object. This was not the case when it matched a value, as that would have been return from the block. Now the `extract_coverage` method returns `nil` if no match was found.
* Merge branch 'rs-remove-open-for-scope' into 'master' test-branch-nameDouwe Maan2017-04-113-7/+0
|\ | | | | | | | | Remove unused scopes See merge request !10609
| * Remove an unused `cared` scope from Issue and MergeRequestrs-remove-open-for-scopeRobert Speicher2017-04-103-6/+0
| |
| * Remove an unused `Issue.open_for` scopeRobert Speicher2017-04-101-1/+0
| |
* | Merge branch 'zj-fk-ci-triggers' into 'master' Yorick Peterse2017-04-111-1/+1
|\ \ | | | | | | | | | | | | Add foreign key on trigger requests See merge request !10537
| * | Add foreign key on trigger requestszj-fk-ci-triggersZ.J. van de Weg2017-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | I started out as I missed the foreign key on ci_triggers and projects. However, it seemed Yorick caught this already on gitlab-org/gitlab-ce!9388. Still I found a missing foreign key, between the trigger requests and triggers. This commit adds it, and removes the depend: :destroy on the Rails model Ci::Triggers
* | | Merge branch 'dz-fix-project-view' into 'master' Annabel Dunstone Gray2017-04-112-2/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change project view default for existing users and anonymous visitors to files+readme Closes #29926 See merge request !10498
| * | | Change project view default for existing users and anonymous visitors to ↔dz-fix-project-viewDmitriy Zaporozhets2017-04-102-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | files+readme Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'signed-out-menu-shortcuts' into 'master' Jacob Schatz2017-04-111-3/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Added keyboard shortcuts to signed out menu See merge request !10526
| * | | | Added keyboard shortcuts to signed out menusigned-out-menu-shortcutsPhil Hughes2017-04-101-3/+16
| | | | |
* | | | | Merge branch 'mr-widget-bug-fix' into 'master' Stan Hu2017-04-111-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the MR widget that merged any MR when choosing the option "Merge when pipeline succeeds" from the dropdown Closes #29568 See merge request !10611
| * | | | | Added tests and fixed a typoJose Ivan Vargas2017-04-101-1/+1
| | | | | |
| * | | | | Fix typo on the class merge-when-pipeline_succeedsJose Ivan Vargas2017-04-101-1/+1
| | | | | |
* | | | | | Merge branch 'fix/gb/improve-container-registry-clipboard-links' into 'master' Kamil TrzciƄski2017-04-113-2/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix container repository/tag location text copied into the clipboard Closes #30695 See merge request !10587
| * | | | | | Add container registry repositories view specsfix/gb/improve-container-registry-clipboard-linksGrzegorz Bizon2017-04-102-2/+2
| | | | | | |
| * | | | | | Add method that returns a registry repository locationGrzegorz Bizon2017-04-101-0/+4
| | | | | | |
* | | | | | | Merge branch 'boards-done-add-tooltip' into 'master' Filipa Lacerda2017-04-111-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue 22424: Add tooltip to header of Done list Closes #22424 See merge request !10574
| * | | | | | | Issue 22424: Add tooltip to header of Done listandrew brown2017-04-091-0/+1
| | | | | | | |
* | | | | | | | Merge branch 'double-border' into 'master' Filipa Lacerda2017-04-111-1/+0
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Remove double border on MR tab See merge request !10593
| * | | | | | | Remove double border on MR tabdouble-borderAnnabel Dunstone Gray2017-04-101-1/+0
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'fix_cache_expiration_in_repository' into 'master' Robert Speicher2017-04-101-2/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix redundant cache expiration in Repository Closes #30146 See merge request !10575
| * | | | | | | Fix redundant cache expiration in Repositoryblackst0ne2017-04-101-2/+0
| | |_|/ / / / | |/| | | | |
* | | | | | | Don't show 'Copy content' button on text files that are not rendered as textDouwe Maan2017-04-109-40/+58
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'document-polling-interval' into 'master' Stan Hu2017-04-101-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document how polling interval multiplier is used Closes #30686 See merge request !10592
| * | | | | | Document how polling interval is useddocument-polling-intervalAdam Niedzielski2017-04-101-0/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'add-vue-loader' into 'master' Filipa Lacerda2017-04-108-80/+86
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add vue loader Closes #29519 See merge request !10517
| * | | | | fix closing tags of async_button componentMike Greiling2017-04-091-4/+5
| | | | | |
| * | | | | convert pipeline async_button component to vue templateMike Greiling2017-04-092-24/+26
| | | | | |
| * | | | | convert pipeline error state to vue templateMike Greiling2017-04-094-21/+23
| | | | | |
| * | | | | convert pipeline empty state to vue templateMike Greiling2017-04-094-35/+36
| | | | | |
* | | | | | Merge branch 'ci-favicon-back-in' into 'master' Filipa Lacerda2017-04-101-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added back in the CI status favicon See merge request !10534
| * | | | | | Added back in the CI status faviconPhil Hughes2017-04-101-0/+2
| | |/ / / / | |/| | | | | | | | | | | | | | | | Looks like it was removed with a bad merge conflict resolution
* | | | | | Merge branch 'file-view-container' into 'master' Jacob Schatz2017-04-101-3/+3
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Remove limited container on file view See merge request !10542
| * | | | | Remove limited container on file viewfile-view-containerAnnabel Dunstone Gray2017-04-071-3/+3
| | | | | |
* | | | | | Merge branch '30676-project-export-email' into 'master' Sean McGivern2017-04-101-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix email not being sent after project export Closes #30676 See merge request !10578
| * | | | | Fix email not being sent after project exportmhasbini2017-04-091-1/+1
| | |_|/ / | |/| | |
* | | | | Periodically clean up temporary upload files to recover storage spaceblackst0ne2017-04-101-4/+0
| | | | |
* | | | | Merge branch 'refactor-behaviors' into 'master' Alfredo Sumaran2017-04-097-205/+185
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Refactor javascript behaviors directory See merge request !10439
| * | | | consolidate all behavior imports into an index.js filerefactor-behaviorsMike Greiling2017-04-042-8/+10
| | | | |
| * | | | refactor and fix eslint violations in behaviors directoryMike Greiling2017-04-045-197/+175
| | | | |
* | | | | Merge branch 'remove_is_admin' into 'master' Robert Speicher2017-04-097-12/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the `User#is_admin?` method Closes #30584 See merge request !10520
| * | | | | Remove the User#is_admin? methodblackst0ne2017-04-097-12/+8
| | |/ / / | |/| | |
* | | | | Add a name field to the group edit formadd-field-for-group-nameDouglas Lovell2017-04-093-9/+36
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables user specification of group name vs. name inferred from group path. Cause new group form to copy name from path Adds some new page-specific javascript that copies entry from the group path field to the group name field when the group name field is initially empty. Remove duplicate group name entry field on group edit form This corrects the duplicated name entry field and tests that the JavaScript does not update the group name field if the user edits the group path. (Editing the group path is not recommended in any case, but it is possible.) Address eslint errors in group.js Enable group name copy with dispatch and explore group creation The dispatch and explore group creation forms require the group.js asset, and their tests now require testing against poltergeist Update workflow new group instruction Update the gitlab basics group creation document Add a change log entry Remove unused variable for eslint
* | | | Merge branch 'master' into new-resolvable-discussionDouwe Maan2017-04-079-6/+11
|\ \ \ \
| * \ \ \ Merge branch 'dm-remove-copy-link-on-blame-page' into 'master' Douwe Maan2017-04-082-3/+4
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | Don't show Copy contents button on Blame page See merge request !10560
| | * | | Rename displaying_blame to blamedm-remove-copy-link-on-blame-pageDouwe Maan2017-04-072-4/+4
| | | | |
| | * | | Don't show Copy contents button on Blame pageDouwe Maan2017-04-072-3/+4
| | | | |
| * | | | Merge branch 'safari-svg-bug' into 'master' Jacob Schatz2017-04-072-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Give explicit height to SVG icons for Safari See merge request !10550
| | * | | | Give explicit height to SVG icons for SafariAnnabel Dunstone Gray2017-04-072-2/+2
| | |/ / /
| * | | | Merge branch 'activity-feed-user-name' into 'master' Annabel Dunstone Gray2017-04-074-0/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Put back usernames in activity and profile feed See merge request !10539
View Lorry Controller Status