Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Reduce risk of deadlocks17361-redirect-renamed-paths | Michael Kozono | 2017-05-05 | 1 | -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 discussions | Michael Kozono | 2017-05-05 | 2 | -7/+6 |
| | |||||
* | Resolve discussions | Michael Kozono | 2017-05-05 | 4 | -25/+20 |
| | |||||
* | Dry up routable lookups. Fixes #30317 | Michael Kozono | 2017-05-05 | 4 | -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 redirect | Michael Kozono | 2017-05-05 | 1 | -0/+1 |
| | |||||
* | Resolve discussions | Michael Kozono | 2017-05-05 | 3 | -20/+22 |
| | |||||
* | Refactor | Michael Kozono | 2017-05-05 | 2 | -9/+9 |
| | |||||
* | Delete conflicting redirects | Michael Kozono | 2017-05-05 | 2 | -7/+16 |
| | |||||
* | Create redirect routes on path change | Michael Kozono | 2017-05-05 | 1 | -7/+17 |
| | |||||
* | Redirect from redirect routes to canonical routes | Michael Kozono | 2017-05-05 | 9 | -27/+74 |
| | |||||
* | Merge branch 'issue-title-description-realtime' into 'master' | Phil Hughes | 2017-05-05 | 7 | -92/+232 |
|\ | | | | | | | | | | | | | Render Description Realtime :tada: Closes #25049 and #31355 See merge request !10865 | ||||
| * | make toggle switch for flags | Regis | 2017-05-05 | 1 | -8/+8 |
| | | |||||
| * | object in css not computed | Regis | 2017-05-05 | 1 | -27/+18 |
| | | |||||
| * | resolve discussionissue-title-description-realtime | Regis | 2017-05-05 | 4 | -16/+12 |
| | | |||||
| * | use more subtle datetime and title change for timeagoEl - use SCSS variable ↵ | Regis | 2017-05-04 | 2 | -5/+2 |
| | | | | | | | | for timing on animation | ||||
| * | use computed css class for animations | Regis | 2017-05-04 | 1 | -28/+30 |
| | | |||||
| * | change error handling for api callback - check length is not zero on jquery el | Regis | 2017-05-04 | 2 | -7/+2 |
| | | |||||
| * | fix js specs | Regis | 2017-05-04 | 1 | -12/+12 |
| | | |||||
| * | rename candescription to canUpdateIssue | Regis | 2017-05-04 | 3 | -5/+5 |
| | | |||||
| * | better name for zeroData - use insteaf importing Vue | Regis | 2017-05-04 | 2 | -9/+8 |
| | | |||||
| * | use nextTick and cache timeAgoEl | Regis | 2017-05-04 | 1 | -10/+10 |
| | | |||||
| * | use refs when possible - style changes - better initial title and ↵ | Regis | 2017-05-04 | 1 | -18/+34 |
| | | | | | | | | description data types | ||||
| * | fix tasks list spec in rspec | Regis | 2017-05-03 | 1 | -0/+8 |
| | | |||||
| * | remove curr and previous states - extract tasks logic to tasks action | Regis | 2017-05-02 | 4 | -52/+48 |
| | | |||||
| * | fix rubocop offenses | Regis | 2017-05-01 | 1 | -2/+1 |
| | | |||||
| * | use indexOf instead of includes | Regis | 2017-05-01 | 1 | -1/+1 |
| | | |||||
| * | formatting | Regis | 2017-05-01 | 1 | -3/+2 |
| | | |||||
| * | handle tasks and fix some specs | Regis | 2017-05-01 | 1 | -13/+23 |
| | | |||||
| * | previous and current description | Regis | 2017-05-01 | 1 | -21/+53 |
| | | |||||
| * | make tab title legit | Regis | 2017-05-01 | 2 | -2/+14 |
| | | |||||
| * | resolve conflict | Regis | 2017-05-01 | 155 | -726/+1603 |
| |\ | |||||
| * | | change 'body' to 'data' after 'JSON.parse' | Regis | 2017-04-26 | 1 | -8/+8 |
| | | | |||||
| * | | update task_list n/n | Regis | 2017-04-26 | 2 | -25/+40 |
| | | | |||||
| * | | check if description changed prior to binding TaskLists and calling renderGFM | Regis | 2017-04-26 | 1 | -10/+23 |
| | | | |||||
| * | | fix merge conflict with issue_show haml | Regis | 2017-04-25 | 64 | -328/+923 |
| |\ \ | |||||
| * | | | update comment explaining visual change check | Regis | 2017-04-25 | 1 | -1/+1 |
| | | | | |||||
| * | | | change comp timeout to 0ms and test timeout to 10ms | Regis | 2017-04-25 | 1 | -1/+1 |
| | | | | |||||
| * | | | test async nature of issue show | Regis | 2017-04-25 | 1 | -1/+1 |
| | | | | |||||
| * | | | fix a few tests (not all) - update title in tab with new issue | Regis | 2017-04-24 | 1 | -2/+6 |
| | | | | |||||
| * | | | render description - tasks work - gfm is juicy | Regis | 2017-04-21 | 6 | -93/+148 |
| | | | | |||||
* | | | | Merge branch 'balsalmiq-support' into 'master' | Phil Hughes | 2017-05-05 | 6 | -0/+149 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Initial balsamiq support See merge request !10564 | ||||
| * \ \ \ | Merge remote-tracking branch 'origin/master' into balsalmiq-support | Luke "Jared" Bennett | 2017-05-02 | 62 | -415/+611 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into 'balsalmiq-support' | Luke "Jared" Bennett | 2017-05-02 | 30 | -121/+451 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # spec/features/projects/commit/cherry_pick_spec.rb # spec/features/projects/environments/environment_spec.rb | ||||
| * \ \ \ \ \ | Merge branch 'master' into balsalmiq-support | Luke "Jared" Bennett | 2017-04-30 | 32 | -51/+118 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Fixed specs | Luke "Jared" Bennett | 2017-04-28 | 2 | -25/+35 |
| | | | | | | | | |||||
| * | | | | | | | Removed Spinner usage | Luke "Jared" Bennett | 2017-04-28 | 1 | -2/+0 |
| | | | | | | | | |||||
| * | | | | | | | Deleted spinner and spec | Luke "Jared" Bennett | 2017-04-28 | 1 | -29/+0 |
| | | | | | | | | |||||
| * | | | | | | | Corrected styling, less hacky | Luke "Jared" Bennett | 2017-04-28 | 1 | -23/+6 |
| | | | | | | | | |||||
| * | | | | | | | Moved partial | Luke "Jared" Bennett | 2017-04-28 | 2 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | added balsamiq blobviewer class | Luke "Jared" Bennett | 2017-04-28 | 1 | -0/+12 |
| | | | | | | | |