summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Reduce risk of deadlocks17361-redirect-renamed-pathsMichael Kozono2017-05-051-7/+17
| | | | | | | We’ve seen a deadlock in CI here https://gitlab.com/mkozono/gitlab-ce/builds/15644492#down-build-trace. This commit should not fix that particular failure, but perhaps it will avoid others. * Don’t call delete_conflicting_redirects after update if the path wasn’t changed * Rename descendants without using recursion again, so we can run delete_conflicting_redirects exactly once.
* Resolve discussionsMichael Kozono2017-05-052-7/+6
|
* Resolve discussionsMichael Kozono2017-05-054-25/+20
|
* Dry up routable lookups. Fixes #30317Michael Kozono2017-05-054-51/+54
| | | | Note: This changes the behavior of user lookups (see the spec change) so it acts the same way as groups and projects. Unauthenticated clients attempting to access a user page will be redirected to login whether the user exists and is publicly restricted, or does not exist at all.
* Add “project moved” flash message on redirectMichael Kozono2017-05-051-0/+1
|
* Resolve discussionsMichael Kozono2017-05-053-20/+22
|
* RefactorMichael Kozono2017-05-052-9/+9
|
* Delete conflicting redirectsMichael Kozono2017-05-052-7/+16
|
* Create redirect routes on path changeMichael Kozono2017-05-051-7/+17
|
* Redirect from redirect routes to canonical routesMichael Kozono2017-05-059-27/+74
|
* Merge branch 'issue-title-description-realtime' into 'master' Phil Hughes2017-05-057-92/+232
|\ | | | | | | | | | | | | Render Description Realtime :tada: Closes #25049 and #31355 See merge request !10865
| * make toggle switch for flagsRegis2017-05-051-8/+8
| |
| * object in css not computedRegis2017-05-051-27/+18
| |
| * resolve discussionissue-title-description-realtimeRegis2017-05-054-16/+12
| |
| * use more subtle datetime and title change for timeagoEl - use SCSS variable ↵Regis2017-05-042-5/+2
| | | | | | | | for timing on animation
| * use computed css class for animationsRegis2017-05-041-28/+30
| |
| * change error handling for api callback - check length is not zero on jquery elRegis2017-05-042-7/+2
| |
| * fix js specsRegis2017-05-041-12/+12
| |
| * rename candescription to canUpdateIssueRegis2017-05-043-5/+5
| |
| * better name for zeroData - use insteaf importing VueRegis2017-05-042-9/+8
| |
| * use nextTick and cache timeAgoElRegis2017-05-041-10/+10
| |
| * use refs when possible - style changes - better initial title and ↵Regis2017-05-041-18/+34
| | | | | | | | description data types
| * fix tasks list spec in rspecRegis2017-05-031-0/+8
| |
| * remove curr and previous states - extract tasks logic to tasks actionRegis2017-05-024-52/+48
| |
| * fix rubocop offensesRegis2017-05-011-2/+1
| |
| * use indexOf instead of includesRegis2017-05-011-1/+1
| |
| * formattingRegis2017-05-011-3/+2
| |
| * handle tasks and fix some specsRegis2017-05-011-13/+23
| |
| * previous and current descriptionRegis2017-05-011-21/+53
| |
| * make tab title legitRegis2017-05-012-2/+14
| |
| * resolve conflictRegis2017-05-01155-726/+1603
| |\
| * | change 'body' to 'data' after 'JSON.parse'Regis2017-04-261-8/+8
| | |
| * | update task_list n/nRegis2017-04-262-25/+40
| | |
| * | check if description changed prior to binding TaskLists and calling renderGFMRegis2017-04-261-10/+23
| | |
| * | fix merge conflict with issue_show hamlRegis2017-04-2564-328/+923
| |\ \
| * | | update comment explaining visual change checkRegis2017-04-251-1/+1
| | | |
| * | | change comp timeout to 0ms and test timeout to 10msRegis2017-04-251-1/+1
| | | |
| * | | test async nature of issue showRegis2017-04-251-1/+1
| | | |
| * | | fix a few tests (not all) - update title in tab with new issueRegis2017-04-241-2/+6
| | | |
| * | | render description - tasks work - gfm is juicyRegis2017-04-216-93/+148
| | | |
* | | | Merge branch 'balsalmiq-support' into 'master' Phil Hughes2017-05-056-0/+149
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Initial balsamiq support See merge request !10564
| * \ \ \ Merge remote-tracking branch 'origin/master' into balsalmiq-supportLuke "Jared" Bennett2017-05-0262-415/+611
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into 'balsalmiq-support'Luke "Jared" Bennett2017-05-0230-121/+451
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # spec/features/projects/commit/cherry_pick_spec.rb # spec/features/projects/environments/environment_spec.rb
| * \ \ \ \ \ Merge branch 'master' into balsalmiq-supportLuke "Jared" Bennett2017-04-3032-51/+118
| |\ \ \ \ \ \
| * | | | | | | Fixed specsLuke "Jared" Bennett2017-04-282-25/+35
| | | | | | | |
| * | | | | | | Removed Spinner usageLuke "Jared" Bennett2017-04-281-2/+0
| | | | | | | |
| * | | | | | | Deleted spinner and specLuke "Jared" Bennett2017-04-281-29/+0
| | | | | | | |
| * | | | | | | Corrected styling, less hackyLuke "Jared" Bennett2017-04-281-23/+6
| | | | | | | |
| * | | | | | | Moved partialLuke "Jared" Bennett2017-04-282-1/+1
| | | | | | | |
| * | | | | | | added balsamiq blobviewer classLuke "Jared" Bennett2017-04-281-0/+12
| | | | | | | |
View Lorry Controller Status