summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into 'zj-improve-performance-user-agent-details'zj-improve-performance-user-agent-detailsZeger-Jan van de Weg2017-02-17607-6660/+13421
|\ | | | | | | # Conflicts: # db/schema.rb
| * Merge branch '28303-change-development-tanuki-favicon-colors-to-match-logo' ↵Annabel Dunstone Gray2017-02-172-0/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Change development tanuki favicon colors to match logo color order Closes #28303 See merge request !9329
| | * Change development tanuki favicon colors to match logo color order28303-change-development-tanuki-favicon-colors-to-match-logodimitrieh2017-02-172-0/+4
| | |
| * | Merge branch 'move-spinach-dashboard-issues-test-to-rspec' into 'master'Rémy Coutable2017-02-173-112/+48
| |\ \ | | | | | | | | | | | | | | | | Move dashboard issues spinach test to Rspec See merge request !8955
| | * | Move dashboard issues spinach test to RspecSemyon Pupkov2017-02-103-112/+48
| | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
| * | | Merge branch 'issue_26714' into 'master' Rémy Coutable2017-02-171-2/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 'reset-email' link spec Closes #26714 See merge request !9317
| | * | | Fix 'reset-email' link specissue_26714Felipe Artur2017-02-161-2/+4
| | | | |
| * | | | Merge branch '27605-research-proposal-template' into 'master'Annabel Dunstone Gray2017-02-171-0/+17
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 27605-research-proposal-template Closes #27605 See merge request !9047
| | * | | | 27605 Add research proposal to issue templates27605-research-proposal-templatetauriedavis2017-02-161-0/+17
| | | | | |
| * | | | | Merge branch 'paginate-all-the-things' into 'master' Rémy Coutable2017-02-1766-87/+1194
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Paginate all the things Closes #8099 See merge request !8606
| | * | | | | Backport API to v3paginate-all-the-thingsRobert Schilling2017-02-1717-1/+807
| | | | | | |
| | * | | | | Add a custom pagination matcherRobert Schilling2017-02-1633-36/+274
| | | | | | |
| | * | | | | Paginate all endpoints that return an arrayRobert Schilling2017-02-1621-51/+114
| | | | | | |
| * | | | | | Merge branch 'fix/gb/remove-gitlab-ci-module' into 'master' Kamil Trzciński2017-02-171-8/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove legacy GitlabCi module from initializers See merge request !9279
| | * | | | | | Remove legacy GitlabCi module from initializersfix/gb/remove-gitlab-ci-moduleGrzegorz Bizon2017-02-151-8/+0
| | | | | | | |
| * | | | | | | Merge branch 'fix/gb/pipeline-retry-cancel-buttons-consistency' into 'master' Kamil Trzciński2017-02-172-2/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix pipeline retry and cancel buttons on pipeline details page See merge request !9225
| | * | | | | | | Add Changelog entry for pipeline buttons fixfix/gb/pipeline-retry-cancel-buttons-consistencyGrzegorz Bizon2017-02-141-0/+4
| | | | | | | | |
| | * | | | | | | Reuse pipeline methods to preserve Law of DemeterGrzegorz Bizon2017-02-141-2/+2
| | | | | | | | |
| * | | | | | | | Merge branch '26500-informative-slack-notifications' into 'master' Kamil Trzciński2017-02-1711-17/+122
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding links to user & build stage in a Build message Closes #26500 See merge request !8641
| | * | | | | | | | Adding links to user & build in Chat NotificationsPoornima M2017-01-2511-17/+122
| | | | | | | | | |
| * | | | | | | | | Merge branch 'use-update-runner-service' into 'master' Kamil Trzciński2017-02-1710-16/+259
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prefer service object over after_save hook Closes #26921 See merge request !8664
| | * | | | | | | | | Use expect { }.to change { }use-update-runner-serviceLin Jen-Shin2017-02-152-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8664#note_23427575
| | * | | | | | | | | Add some tests for admin/project runners pageLin Jen-Shin2017-02-152-0/+160
| | | | | | | | | | |
| | * | | | | | | | | Merge remote-tracking branch 'upstream/master' into use-update-runner-serviceLin Jen-Shin2017-02-15855-15237/+17772
| | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (488 commits) Remove duplicate CHANGELOG.md entries for 8.16.5 Update CHANGELOG.md for 8.14.9 Update CHANGELOG.md for 8.15.6 #27631: Add missing top-area div to activity header page Update CHANGELOG.md for 8.16.5 Update CHANGELOG.md for 8.16.5 Update CHANGELOG.md for 8.16.5 Fix yarn lock and package.json mismatch caused by MR 9133 sync yarn.lock with recent changes to package.json Add changelog Fix z index bugs Add Links to Branches in Calendar Activity SidekiqStatus need to be qualified in some cases Replace static fixture for behaviors/requires_input_spec.js (!9162) API: Consolidate /projects endpoint Add MySQL info in install requirements Fix timezone on issue boards due date Use Gitlab::Database.with_connection_pool from !9192 Disconnect the pool after done Use threads directly, introduce pool later: ...
| | * | | | | | | | | Add a test to make sure the queue ticks when updating runnersLin Jen-Shin2017-02-131-0/+7
| | | | | | | | | | |
| | * | | | | | | | | Use UpdateRunnerService to update runner in API:Lin Jen-Shin2017-02-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TODO: Add tests to make sure controllers and API would tick the queue.
| | * | | | | | | | | Only tick queue if anything is updatedLin Jen-Shin2017-02-072-6/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8664#note_22853522
| | * | | | | | | | | Just pass :services, feedback:Lin Jen-Shin2017-02-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8664#note_22853463
| | * | | | | | | | | Merge remote-tracking branch 'upstream/master' into use-update-runner-serviceLin Jen-Shin2017-02-07581-4174/+15766
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (379 commits) Fixed failing tests because list doens't exist Add changelog file Update system_note_service_spec.rb Remove noteable object in time tracking system notes [ci-skip] Make all system notes lowercase Fixed eslint Don't render snippet actions for logged-out users Remove deprecated MR and Issue endpoints and preserve V3 namespace Removed additional dropdown list animations Improve docs on CI/CD code coverage regexp setting Improve Changelog entry for CI config compatibility fix Refine docs on code coverage regexp on job level Introduce maximum session time for terminal websocket connection Add Changelog entry for CI config compatibility fix Map configuration to directory locations and add defaults to NFS HA doc. Update docs on setting up a CI/CD coverage regexp Fix Rubocop offense in legacy CI/CD config specs add CHANGELOG entry for !8988 transpile all javascript files with babel add npm run webpack command ...
| | * | | | | | | | | | No need to tick the queue when creating the runnerLin Jen-Shin2017-02-041-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8664/diffs#note_22190504
| | * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into use-update-runner-serviceLin Jen-Shin2017-02-041274-5272/+13562
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (589 commits) Backport changes from EE squash Fix broken tests Rename Build to Job Adds changelog entry Change "Build" to "Job" in builds show page header and sidebar replace `find_with_namespace` with `find_by_full_path` PlantUML support for Markdown remove dateFormat global exception fix relative paths to xterm.js within fit.js use setFixtures instead of fixture.set prevent u2f tests from triggering a form submission while testing simplify test for focus state preload projects.json fixture preload projects.json fixture rework tests which rely on teaspoon-specific behavior Only render hr when user can't archive project. use setFixtures instead of fixture.set ensure helper classes and constants are exposed globally preload projects.json fixture fix fixture references in environments_spec allow console.xxx in tests, reorder eslint rules alphabetically ...
| | * | | | | | | | | | | Remove the key from the queue when runner is deletedLin Jen-Shin2017-01-212-0/+27
| | | | | | | | | | | | |
| | * | | | | | | | | | | Prefer service object over after_save hookLin Jen-Shin2017-01-217-23/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #26921
| * | | | | | | | | | | | Merge branch '22018-api-milestone-merge-requests' into 'master' Rémy Coutable2017-02-174-0/+75
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add API endpoint to get all milestone merge requests Closes #22018 See merge request !9298
| | * | | | | | | | | | | | Add API endpoint to get all milestone merge requestsJoren De Groof2017-02-174-0/+75
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch '28329-allow-slash-in-slash-command-args' into 'master'Sean McGivern2017-02-173-1/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow slashes in slash command arguments Closes #28329 See merge request !9327
| | * | | | | | | | | | | | | Allow slashes in slash command argumentsRémy Coutable2017-02-173-1/+13
| | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | | | Merge branch 'only-yield-valid-reference-matches' into 'master'Sean McGivern2017-02-173-2/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only yield valid references in ReferenceFilter.references_in Closes #27648 See merge request !9318
| | * | | | | | | | | | | | | Only yield valid references in ReferenceFilter.references_inonly-yield-valid-reference-matchesDouwe Maan2017-02-163-2/+33
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch '26200-convert-sidebar-to-dropdown' into 'master'Sean McGivern2017-02-1751-1053/+146
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Update global sidebar to dropdown" Closes #26200 See merge request !9199
| | * | | | | | | | | | | | | | Cache js selectors; fix css26200-convert-sidebar-to-dropdownAnnabel Dunstone Gray2017-02-163-12/+16
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Remove comments in migrationAnnabel Dunstone Gray2017-02-162-21/+1
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Move necessary sidebar code to right_sidebar.js; delete sidebar.jsAnnabel Dunstone Gray2017-02-153-22/+12
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Fix borked db stuffAnnabel Dunstone Gray2017-02-152-2/+2
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Change iteration strategy to make PhantomJS happyAlfredo Sumaran2017-02-151-2/+4
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Delete labels spinach test bc covered by rspecAnnabel Dunstone Gray2017-02-152-47/+0
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Delete sidebar specs and fixtures; update shortcuts_spec to check page titleAnnabel Dunstone Gray2017-02-154-174/+5
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Move migration to post_migrate; fix shortcuts_specAnnabel Dunstone Gray2017-02-152-2/+3
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Fix active_tab and issuables_counter specsAnnabel Dunstone Gray2017-02-152-4/+6
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Make active links bold; fix badge stylingAnnabel Dunstone Gray2017-02-152-18/+33
| | | | | | | | | | | | | | | |