summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge branch '27343-autocomplete-post-to-wrong-url-when-not-hosting-in-root' ↵Filipa Lacerda2017-02-075-11/+61
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix filtered search user autocomplete for gitlab instances that are hosted on a subdirectory Closes #27343 See merge request !8891
| * | | | | | | Fix filtered search user autocomplete for gitlab instances that are hosted ↵27343-autocomplete-post-to-wrong-url-when-not-hosting-in-rootClement Ho2017-02-065-11/+61
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | on a subdirectory
* | | | | | | Merge branch 'commit-description-border' into 'master' Alfredo Sumaran2017-02-061-1/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove lighter colored commit description border See merge request !9005
| * | | | | | | Remove lighter colored commit description bordercommit-description-borderAnnabel Dunstone Gray2017-02-061-1/+0
| |/ / / / / /
* | | | | | | Merge branch 'fe-commit-mr-pipelines' into 'master' Fatih Acet2017-02-0644-278/+1087
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use vue.js Pipelines table in commit and merge request view Closes #27141 See merge request !8844
| * | | | | | Merge branch 'master' into fe-commit-mr-pipelinesfe-commit-mr-pipelinesFilipa Lacerda2017-02-062-1/+13
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | * master: Add index to labels for `type` and project_id`
| * | | | | | Use webpack to require filesFilipa Lacerda2017-02-0512-44/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes after review
| * | | | | | Use webpack to require filesFilipa Lacerda2017-02-059-32/+28
| | | | | | |
| * | | | | | Merge branch 'master' into fe-commit-mr-pipelinesFilipa Lacerda2017-02-053-3/+7
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | * master: fix rack-proxy dependency in production Fixed typo
| * | | | | | Move interceptor to common interceptors filesFilipa Lacerda2017-02-051-0/+8
| | | | | | |
| * | | | | | Use webpackFilipa Lacerda2017-02-054-74/+55
| | | | | | |
| * | | | | | Move repeated function to utilitiesFilipa Lacerda2017-02-051-0/+8
| | | | | | |
| * | | | | | Fix broken path to fileFilipa Lacerda2017-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken path to file
| * | | | | | Merge branch 'master' into fe-commit-mr-pipelinesFilipa Lacerda2017-02-04296-2926/+4807
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (76 commits) fix failing test fix Vue warnings for missing element [ci skip] UX Guide: Button placement in groups Change window size before visiting page, to get correct scroll position Fix slash commands spec error Move project services to new location under Integrations Move webhooks to new a location under Integrations Fixed redirection from http://someproject.git to http://someproject consistently use single quotes allow application.js to require other scripts which start with application* DRY with Gitlab.config.webpack.dev_server references disable webpack proxy in rspec environment due to conflicts with webmock gem remove changes to Procfile configure webpack dev server port via environment variable add rack middleware to proxy webpack dev server remove dev-server config from development environment Document that the retro and kickoff notes are public add CHAGELOG.md entry for webpack branch fix failing rspec build fix test failure for merge request widget ...
| * \ \ \ \ \ \ Merge branch 'master' into fe-commit-mr-pipelinesFilipa Lacerda2017-02-03136-645/+2205
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (65 commits) Fixed eslint test failure Fixed adding to list bug Remove unnecessary queries for .atom and .json in Dashboard::ProjectsController#index Fixed modal lists dropdown not updating when list is deleted Fixed remove btn error after creating new issue in list Removed duplicated test Removed Masonry, instead uses groups of data Uses mixins for repeated functions Fixed up specs Props use objects with required & type values Removes labels instead of closing issue when clicking remove button Fixed JS lint errors Fixed issue card spec Added webkit CSS properties Fixed bug with empty state showing after search Fixed users href path being incorrect Fixed bug where 2 un-selected issues would stay on selected tab Fixed DB schema Changed how components are added in objects Added remove button Add optional id property to the issue schema Fixed issue link href ...
| * | | | | | | | Fix broken testsFilipa Lacerda2017-02-032-1/+2
| | | | | | | | |
| * | | | | | | | Resolve conflict after mergeFilipa Lacerda2017-02-0358-221/+231
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into fe-commit-mr-pipelinesFilipa Lacerda2017-02-0352-78/+270
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Backport changes from EE squash replace `find_with_namespace` with `find_by_full_path` PlantUML support for Markdown Update api docs and minor changes Force new password after password reset via API Fixed protected branches dropdown Fixed up tests Fixed the active branch selected indicator Changed how the data is returned - we only care about the branch/tag name Uses take rather than Kaminari Use cloneNode instead of createElement Improved ref switcher dropdown performance
| * | | | | | | | | | Only load pipelines vue component when there are pipelines.Filipa Lacerda2017-02-034-33/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move Empty state to vue component
| * | | | | | | | | | Add time ago auto-update to the 2 newest tablesFilipa Lacerda2017-02-036-16/+43
| | | | | | | | | | |
| * | | | | | | | | | Adds changelog entryFilipa Lacerda2017-02-031-0/+4
| | | | | | | | | | |
| * | | | | | | | | | Add basic specs for new merge requests pipelines APIGrzegorz Bizon2017-02-031-11/+23
| | | | | | | | | | |
| * | | | | | | | | | Serialize pipelines in the new merge request actionGrzegorz Bizon2017-02-031-1/+8
| | | | | | | | | | |
| * | | | | | | | | | Fix syntax error in the new merge request viewGrzegorz Bizon2017-02-031-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Moves pagination to shared folderFilipa Lacerda2017-02-0322-174/+591
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document and remove unused code Declare components in a consistent way; Use " instead of ' to improve consistency; Update documentation; Fix commit author verification to match the use cases; Adds tests for the added components Fix paths in pagination spec Adds tests to pipelines table used in merge requests and commits Use same resource interceptor Fix eslint error
| * | | | | | | | | | Use new vue js pipelines table to render in merge request viewFilipa Lacerda2017-02-0317-223/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate data-toggle attributes. Reuse the same pipeline table Remove unneeded required resources Remove unused file; Fix mr pipelines loading Updates documentation
| * | | | | | | | | | Transform vue_pipelines index into a non-dependent table component.Filipa Lacerda2017-02-037-312/+306
| | | | | | | | | | |
| * | | | | | | | | | Use same folder structure in spec for vue shared resourcesFilipa Lacerda2017-02-036-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Use single source of truth for vue_resource_interceptorFilipa Lacerda2017-02-034-13/+6
| | | | | | | | | | |
| * | | | | | | | | | First iterationFilipa Lacerda2017-02-0312-19/+478
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create shared folder for vue common files Update paths Second iteration - refactor main component to be 100% reusable between the 3 tables
* | | | | | | | | | | Merge branch 'fix-deleting-project-again' into 'master' Douwe Maan2017-02-063-24/+50
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip or retain project while deleting the project: Closes #15005 See merge request !8960
| * | | | | | | | | | | Test both execute and async_executefix-deleting-project-againLin Jen-Shin2017-02-041-21/+29
| | | | | | | | | | | |
| * | | | | | | | | | | Move the tests to spec/services/projects/destroy_service_spec.rbLin Jen-Shin2017-02-032-16/+10
| | | | | | | | | | | |
| * | | | | | | | | | | Skip or retain project while deleting the project:Lin Jen-Shin2017-02-033-12/+36
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Skip Ci::Build#update_project_statistics whenever there's no project (i.e. we're deleting the project!) * Retain the unscoped_project before deleting the build, so that we could use the data to delete the artifacts. Note that carrierwave uses `after_commit` for this, so we need to retain it in the memory. Closes #15005
* | | | | | | | | | | Merge branch 'dont-delete-assigned-issuables' into 'master' Douwe Maan2017-02-063-4/+9
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't delete assigned MRs/issues when user is deleted See merge request !8634
| * | | | | | | | | | | Update specDouwe Maan2017-02-061-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Don't delete assigned MRs/issues when user is deletedDouwe Maan2017-02-062-2/+7
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '27240-make-progress-bars-consistent' into 'master' Annabel Dunstone Gray2017-02-062-0/+6
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 27240 Make progress bars consistent Closes #27240 See merge request !8913
| * | | | | | | | | | | 27240 Make progress bars consistent27240-make-progress-bars-consistenttauriedavis2017-02-032-0/+6
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'patch-12' into 'master' Achilleas Pipinellis2017-02-061-13/+13
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix markdown links in PROCESS.md See merge request !8947
| * | | | | | | | | | | | Fix markdown links in PROCESS.mdDavid2017-02-051-13/+13
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'fix-references-header-parsing' into 'master' Sean McGivern2017-02-066-6/+95
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix References header parser for Microsoft Exchange Closes #26567 See merge request !8620
| * | | | | | | | | | | | No strong reasons to freeze themLin Jen-Shin2017-02-071-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8620#note_22868713
| * | | | | | | | | | | | Freeze regexp and add a commentfix-references-header-parsingLin Jen-Shin2017-02-031-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8620#note_21590440
| * | | | | | | | | | | | Use references variableLin Jen-Shin2017-02-031-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8620#note_22020035
| * | | | | | | | | | | | Use message_id_regexp variable for the regexpLin Jen-Shin2017-02-031-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8620#note_22021001
| * | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-02-031201-4982/+13081
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-references-header-parsing * upstream/master: (574 commits) 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 redundant "data-toggle" attribute so Vue doesn't complain fix broken reference to formatDate in a CommonJS environment fix errors within gl_dropdown_spec.js when running in Karma fix intermittant errors in merge_commit_message_toggle_spec.rb Update installation docs to include Docker, others ignore node_modules in rubocop ...
| * | | | | | | | | | | | Add changelog entryLin Jen-Shin2017-01-201-0/+5
| | | | | | | | | | | | |
| * | | | | | | | | | | | Specify that iOS app would also do thisLin Jen-Shin2017-01-201-1/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix References header parser for Microsoft ExchangeLin Jen-Shin2017-01-205-6/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Microsoft Exchange would append a comma and another message id into the References header, therefore we'll need to fallback and parse the header by ourselves. Closes #26567