summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | rename the test fileArinde Eniola2016-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | fix labels button dropdown not showing how many labels clickedArinde Eniola2016-04-141-3/+13
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | fix failing testsArinde Eniola2016-04-143-4/+9
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Fix issue with labels not showing initially.Jacob Schatz2016-04-132-2/+4
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Removes dup dropdownJacob Schatz2016-04-131-1/+0
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Return unique issues when using multiple labelsYorick Peterse2016-04-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that IssuableFinder returns a collection of unique issues, even when filtering issues using multiple labels.
| * | | | | | | | | | | | | | | | | | | | Filter by multiple labels with little animation.Jacob Schatz2016-04-137-21/+79
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Move functionality to label[]Jacob Schatz2016-04-132-45/+16
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Proper selecting multiple labels.Jacob Schatz2016-04-134-10/+62
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | storing multiple values for comma seperationJacob Schatz2016-04-132-9/+13
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Initial mutli label filterJacob Schatz2016-04-133-1/+13
| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'remove-duplicate-ids' into 'master' Jacob Schatz2016-04-201-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed duplicate ID's from the HTML See merge request !3818
| * | | | | | | | | | | | | | | | | | | | | Removed duplicate ID's from the HTMLremove-duplicate-idsPhil Hughes2016-04-191-2/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'fix_infinite_scroll_breaks_on_back_button_activity_feed' into ↵Jacob Schatz2016-04-201-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' fix bug causing the infinite scrolling in activity feeds to break when you click a link and navigate back ![arrg_](/uploads/53b2a01d3b55938cc12c805e1a81ff6b/arrg_.gif) See merge request !3835
| * | | | | | | | | | | | | | | | | | | | | fix bug causing the infinite scrolling in activity feeds to break when you ↵fix_infinite_scroll_breaks_on_back_button_activity_feedArinde Eniola2016-04-201-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | click a link and navigate back
* | | | | | | | | | | | | | | | | | | | | | Merge branch '15104-mobile-comment-bug' into 'master' Jacob Schatz2016-04-202-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Discussion note icon shows up when you click on diff on touch screen Fixes #15104 * Fix bug that stopped discussion note button from showing up on iOS * Shifted button a few `px` to fix slight cutoff <div> <img src="/uploads/9d507091f33aa69ef68323386bf3a5c2/Screen_Shot_2016-04-15_at_12.08.46_PM.png" width="300px"> <img src="/uploads/a964a2a46636cbe4593abf272b5796f7/Screen_Shot_2016-04-15_at_12.11.40_PM.png" width="300px"> </div> See merge request !3755
| * | | | | | | | | | | | | | | | | | | | | Discussion note icon shows up when you click on diff on touch screen15104-mobile-comment-bugAnnabel Dunstone2016-04-152-1/+2
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'backport_changes_from_ee' into 'master' Dmitriy Zaporozhets2016-04-201-14/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport select_helper from EE See merge request !3825
| * | | | | | | | | | | | | | | | | | | | | Backport select_helper from EEbackport_changes_from_eeValery Sizov2016-04-201-14/+11
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'edit-link-anchor-stop' into 'master' Jacob Schatz2016-04-201-15/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with sidebar edit links toggling anchor This caused an issue with the page scrolling from the bottom to the top. Also stopped the dropdown links doing the same. See merge request !3819
| * | | | | | | | | | | | | | | | | | | | | Fixed issue with sidebar edit links toggling anchoredit-link-anchor-stopPhil Hughes2016-04-191-15/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This caused an issue with the page scrolling from the bottom to the top. Also stopped the dropdown links doing the same.
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'issue_15366' into 'master' Jacob Schatz2016-04-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Render relative timestamps for all commits in projects commit list fixes #15366 See merge request !3821
| * | | | | | | | | | | | | | | | | | | | | Render relative timestamps for all commits in projects commit listissue_15366Felipe Artur2016-04-191-1/+1
| | |_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'system-note-commented' into 'master' Jacob Schatz2016-04-201-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed commented text from system notes ![Screen_Shot_2016-04-20_at_14.49.22](/uploads/b1617af49cc35595afd6dfcf761a775c/Screen_Shot_2016-04-20_at_14.49.22.png) See merge request !3836
| * | | | | | | | | | | | | | | | | | | | | Removed commented text from system notesPhil Hughes2016-04-201-1/+3
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'new-mr-layout-fix' into 'master' Jacob Schatz2016-04-201-8/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with new MR form layout Currently it is all over the place: ![Screen_Shot_2016-04-20_at_14.59.48](/uploads/09c3dffc2138140e3b009ab2564f0aca/Screen_Shot_2016-04-20_at_14.59.48.png) Now: ![Screen_Shot_2016-04-20_at_14.59.44](/uploads/ef5ba8b7393253ecb732c57ba37dd0cf/Screen_Shot_2016-04-20_at_14.59.44.png) See merge request !3837
| * | | | | | | | | | | | | | | | | | | | | Fixed issue with new MR form layoutPhil Hughes2016-04-201-8/+12
| |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'note-form-text-color' into 'master' Jacob Schatz2016-04-201-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes issue with note form inheriting text color It was only really noticeable on dark themed diffs ![Screen_Shot_2016-04-20_at_14.44.58](/uploads/4f32b487de7e4c09a494dc3c8c767ece/Screen_Shot_2016-04-20_at_14.44.58.png) See merge request !3834
| * | | | | | | | | | | | | | | | | | | | | Fixes issue with note form inheriting text colornote-form-text-colorPhil Hughes2016-04-201-0/+1
| |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Also show Revert and Cherry-pick when the source branch can't be removedDouwe Maan2016-04-201-0/+5
| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Verify the MR being displayed question has a merge commit set and can be ↵Douwe Maan2016-04-203-7/+13
|/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cherry-picked
* | | | | | | | | | | | | | | | | | | | Fix Build#append_trace method usage when trace file doesn't exists yetTomasz Maczukin2016-04-201-1/+1
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Make sure that appending is done on a valid lengthTomasz Maczukin2016-04-201-4/+5
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Add range checkingTomasz Maczukin2016-04-201-0/+8
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Add incremental build trace update APITomasz Maczukin2016-04-201-1/+13
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'slack_wiki_notifications' into 'master' Rémy Coutable2016-04-2011-17/+128
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add slack notifications for wiki pages ## What does this MR do? Lets the Slack service be configured to send notifications when wiki pages are created or edited. ## Are there points in the code the reviewer needs to double check? I'm just starting to get familiar with the Gitlab codebase and I was unsure on how to get the wiki page url to pass it to the slack message, on whether or not I needed to refactor the create/update methods for wiki pages from the controller to a service (but seemed necessary to test it better), and if I needed to add a column to the web hooks table or if the services table would have been enough. Please let me know if I should change anything and I will improve the MR, thanks for checking :) ## Why was this MR needed? Related to #563 and fixes #4233. See merge request !2998
| * | | | | | | | | | | | | | | | | | | | Fix wiki testsSebastian Klier2016-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | formatting and test structureSebastian Klier2016-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | add wiki_page helper to url_builderSebastian Klier2016-04-201-1/+2
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | improve check if wiki page is persistedSebastian Klier2016-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | remove unnecessary methodsSebastian Klier2016-04-201-11/+0
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | add slack notifications for wiki pagesSebastian Klier2016-04-2011-6/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update changelog
* | | | | | | | | | | | | | | | | | | | | Merge branch 'feature/raw-trace-output' into 'master' Rémy Coutable2016-04-202-2/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add raw build trace output Closes #15308, #15147 Changes in the UI: - on finished build: ![raw-on-finished-build](/uploads/0e0904940db5b381ae064d49343c6508/raw-on-finished-build.png) - on running build: ![raw-on-running-build](/uploads/0e4c800b68c12bdd0cbd2eea732b22ff/raw-on-running-build.png) See merge request !3767
| * | | | | | | | | | | | | | | | | | | | | Use Rails-way to send file by X-SendfileTomasz Maczukin2016-04-191-5/+2
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Add feature specs for raw traceTomasz Maczukin2016-04-192-2/+2
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Switch raw trace to use X-Sendfile headerTomasz Maczukin2016-04-191-3/+6
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Add raw trace output for GitLab WorkhorseTomasz Maczukin2016-04-192-1/+12
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'license-templates-and-api-12804' into 'master' Robert Speicher2016-04-2013-122/+150
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | License templates when creating/editing a LICENSE file Closes #12804 See merge request !3660
| * | | | | | | | | | | | | | | | | | | | | Continue implementation of the license template selector and /licenses API ↵Rémy Coutable2016-04-1813-160/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | endpoint Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | | | | | | | | | | | Initial implementation if license template selector and /licenses/:key API ↵Anton Davydov2016-04-187-3/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | endpoint