summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'use-common-vue-for-merge-request-widget' into 'master' Fatih Acet2017-05-161-1/+2
|\ | | | | | | | | Ensure vue_merge_request_widget utilizes common_vue bundle See merge request !11269
| * ensure merge-request-widget utilizes common_vue bundleuse-common-vue-for-merge-request-widgetMike Greiling2017-05-151-1/+2
| |
* | Merge branch '32326-scrollable-tabs-overflow' into 'master' Annabel Dunstone Gray2017-05-162-2/+6
|\ \ | | | | | | | | | | | | | | | | | | prevent dropdowns from being cut-off by scrollable tab container Closes #32328 and #32326 See merge request !11399
| * | prevent dropdowns from being cut-off by scrollable tab container32326-scrollable-tabs-overflowSimon Knox2017-05-162-2/+6
| | | | | | | | | | | | rerender scrollable-tab area after Resolve Discussions button is rendered
* | | Make `gfm_auto_complete` into a module and fix up tech debtEric Eastwood2017-05-168-241/+258
|/ /
* | Merge branch 'disable-css-and-jquery-animations-for-capybara' into 'master' Douwe Maan2017-05-163-0/+20
|\ \ | | | | | | | | | | | | | | | | | | disable animations for tests Closes #32194 See merge request !11324
| * | Add test.js and test.css to disable animations during testing and include ↵disable-css-and-jquery-animations-for-capybaraLuke "Jared" Bennett2017-05-153-0/+20
| | | | | | | | | | | | these in _head when testing
* | | Removes nicescroll from issuable sidebarPhil Hughes2017-05-163-13/+9
| | |
* | | Only renders empty state for pipelines table if no pipelines are received ↵Filipa Lacerda2017-05-162-16/+36
| | | | | | | | | | | | when request is made
* | | Merge branch 'environments-button-open-same-tab' into 'master' Annabel Dunstone Gray2017-05-161-1/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Removed the target=_blank from the monitoring component Closes #32243 See merge request !11386
| * | | Removed the target=_blank from the monitoring componentenvironments-button-open-same-tabJose Ivan Vargas2017-05-151-1/+0
| | | |
* | | | Merge branch 'cherry-pick-0663458c' into 'master' Douwe Maan2017-05-167-11/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename `build_events` to `job_events`, take 2. Closes #31620 See merge request !11403
| * | | | Merge branch 'bvl-rename-build-events-to-job-events' into 'master' cherry-pick-0663458cDouwe Maan2017-05-167-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename `build_events` to `job_events` Closes #31620 See merge request !11287
* | | | | Merge branch '31386-profile-fix-externallinks' into 'master' Douwe Maan2017-05-162-2/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Make Twitter Link on Profile page useable by fixing wrong target URL's" Closes #31386 See merge request !10931
| * | | | | Fixed Regex(es)Tim Zallmann2017-05-111-2/+2
| | | | | |
| * | | | | Fixing Static Analysis Fail with IndentationTim Zallmann2017-05-081-2/+1
| | | | | |
| * | | | | Created Application Helpers based on suggestion for easier parsingTim Zallmann2017-05-082-2/+21
| | | | | |
| * | | | | Doing the commit again with the correct E-Mail address setupTim Zallmann2017-05-081-2/+2
| | | | | |
| * | | | | Replacing Base URL's if they have been entered into the profileTim Zallmann2017-05-081-2/+2
| | | | | |
* | | | | | Rename Personal Audit LogTim Zallmann2017-05-164-5/+6
| | | | | |
* | | | | | Merge branch 'add-right-margin-to-ci-error-icon' into 'master' Fatih Acet2017-05-162-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added ci-error class and applied a right margin to the ci error widget state See merge request !11353
| * | | | | | Added ci-error class and applied a right margin to the ci error widget stateadd-right-margin-to-ci-error-iconLuke "Jared" Bennett2017-05-132-1/+5
| | | | | | |
* | | | | | | Resolve ""Username or email" label on login form does not point to its ↵Tim Zallmann2017-05-162-3/+3
| |_|/ / / / |/| | | | | | | | | | | | | | | | | corresponding input field"
* | | | | | Replace broken autocomplete field for new tags with dropdownWinnie Hellmann2017-05-164-53/+61
| | | | | |
* | | | | | Merge branch '32303-nav-z-index' into 'master' Fatih Acet2017-05-161-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add higher z-index to fixed nav Closes #32303 See merge request !11393
| * | | | | | Add higher z-index to fixed nav32303-nav-z-indexAnnabel Dunstone Gray2017-05-151-0/+1
| | | | | | |
* | | | | | | Merge branch '32125-fix-link-to-note-in-diff' into 'master' Fatih Acet2017-05-164-62/+91
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix linking to resolved note in diff Closes #32125 See merge request !11327
| * | | | | | | Fix linking to resolved note in diff32125-fix-link-to-note-in-diffEric Eastwood2017-05-124-62/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32125
* | | | | | | | Merge branch 'zj-pipeline-schedule-owner' into 'master' Kamil Trzciński2017-05-162-1/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Foreign key for Pipeline schedule owner Closes #31932 See merge request !11233
| * | | | | | | | Do not schedule pipelines if the user can'tZ.J. van de Weg2017-05-152-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the owner of a pipelines schedule was either blocked or was removed from the project, the pipeline schedular would still schedule the pipeline. This would than fail however, given the user had no access to the project and it contents. However, a better way to handle it would be to not schedule it at all. Furthermore, from now on, such schedules will be deactivated so the schedule worker can ignore it on the next runs.
* | | | | | | | | Merge branch '24373-warning-message-go-away' into 'master' Phil Hughes2017-05-161-3/+16
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notes warning message should go away once resolved Closes #24373 See merge request !10823
| * | | | | | | | | Notes: Warning message should go away once resolvedJacopo2017-05-151-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Flash error messages disappear(`fadeOut`) automatically after any successful request
* | | | | | | | | | Merge branch 'issue-boards-label-filtering' into 'master' Filipa Lacerda2017-05-161-1/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue boards not filtering when URL params are encoded Closes #32084 See merge request !11320
| * | | | | | | | | | Fixed tests with params being wrongissue-boards-label-filteringPhil Hughes2017-05-151-1/+4
| | | | | | | | | | |
| * | | | | | | | | | Fixed issue boards not filtering when URL params are encodedPhil Hughes2017-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #32084
* | | | | | | | | | | Merge branch '31898-pipeline-table-alignment' into 'master' Filipa Lacerda2017-05-161-2/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove extra pipeline margin Closes #31898 See merge request !11255
| * | | | | | | | | | | Remove extra pipeline margin31898-pipeline-table-alignmentAnnabel Dunstone Gray2017-05-101-2/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'omega-submodules' into 'master'Robert Speicher2017-05-151-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Omega submodules See merge request !10797
| * | | | | | | | | | | | submodule_links: Handle in-repository submodule urlsDavid Turner2017-05-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes it is useful to store submodules in the same repository which contains links to them. Make the UI support this. See https://github.com/twosigma/git-meta/wiki/The-Omega-Repo for information about this strategy Signed-off-by: David Turner <novalis@novalis.org>
* | | | | | | | | | | | | Merge branch '31902-namespace-recent-searches-to-project' into 'master' Annabel Dunstone Gray2017-05-153-4/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scope recent searches to project Closes #31902 See merge request !11142
| * | | | | | | | | | | | | Scope recent searches to projectEric Eastwood2017-05-153-4/+9
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/31902
* | | | | | | | | | | | | Revert "Merge branch 'bvl-rename-build-events-to-job-events' into 'master'"Douwe Maan2017-05-157-11/+11
| |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !11287
* | | | | | | | | | | | Merge branch '31106-tabs-alignment' into 'master' Annabel Dunstone Gray2017-05-155-54/+77
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix Resolved Discussions counter wrapping to next line Closes #31106 See merge request !10775
| * | | | | | | | | | | fix Resolved Discussions counter wrapping to next lineSimon Knox2017-05-135-54/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change all .nav-links to use flex place Resolve Discussions above tabs on small screens, and to the right on large
* | | | | | | | | | | | Merge branch 'rename-rendered_title' into 'master' Rémy Coutable2017-05-153-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename all references to rendered_title to realtime_changes See merge request !11359
| * | | | | | | | | | | | Rename all references to rendered_title to realtime_changesrename-rendered_titleLuke "Jared" Bennett2017-05-133-5/+5
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'bvl-rename-build-events-to-job-events' into 'master' Douwe Maan2017-05-157-11/+11
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename `build_events` to `job_events` Closes #31620 See merge request !11287
| * | | | | | | | | | | | Rename `build_events` to `job_events` in codeBob Van Landuyt2017-05-157-11/+11
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Improve slash command stripping, escape temporary note contentsKushal Pandya2017-05-151-2/+3
| |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
* | | | | | | | | | | Merge branch '32184-retried-jobs' into 'master' Phil Hughes2017-05-152-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use fa-refresh on retried jobs Closes #32184 See merge request !11337