summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '44036-someone-edited-the-issue-at-the-same-time-is-regularly-se...docs-4453-external-exportersFilipa Lacerda2019-08-123-48/+73
|\
| * Fix conflict warning being incorrectly displayed44036-someone-edited-the-issue-at-the-same-time-is-regularly-seen-despite-that-being-a-filthy-lieHeinrich Lee Yu2019-08-123-48/+73
* | Merge branch 'sh-break-out-invited-group-members' into 'master'Ash McKenzie2019-08-1215-54/+163
|\ \
| * | Improve spec description in member_spec.rbsh-break-out-invited-group-membersStan Hu2019-08-111-1/+1
| * | Use snake case for tag placeholdersMartin Wortschack2019-08-092-6/+6
| * | Fixing missing html_safe calls for pending listStan Hu2019-08-091-1/+1
| * | Revert "Change 'data-toggle' => 'tab' to data-toggle: 'tab'"Stan Hu2019-08-091-2/+2
| * | Change 'data-toggle' => 'tab' to data-toggle: 'tab'Stan Hu2019-08-091-2/+2
| * | Fix typo in causing failing to test in sorting_spec.rbStan Hu2019-08-091-1/+1
| * | Fix highlighting of group name not workingStan Hu2019-08-091-2/+2
| * | Merge branch 'master' into sh-break-out-invited-group-membersStan Hu2019-08-09624-2666/+6688
| |\ \
| * | | Resolve more discussionMartin Wortschack2019-08-092-5/+5
| * | | Apply suggestion to app/views/groups/group_members/index.html.hamlMartin Wortschack2019-08-091-1/+1
| * | | Rename search_invited to search_invite_emailStan Hu2019-08-093-4/+6
| * | | Resolve first round of discussionsMartin Wortschack2019-08-083-14/+11
| * | | Merge branch 'master' into sh-break-out-invited-group-membersStan Hu2019-08-07307-1608/+4305
| |\ \ \
| * | | | Remove local varMartin Wortschack2019-08-061-2/+0
| * | | | Fix broken specsMartin Wortschack2019-08-066-27/+23
| * | | | Fix CSS for mobileMartin Wortschack2019-08-064-20/+32
| * | | | Replace some flex propertiesGeorge Tsiolis2019-08-053-8/+8
| * | | | Remove card borderGeorge Tsiolis2019-08-051-2/+2
| * | | | Fix CSS for pending listStan Hu2019-08-051-1/+1
| * | | | Minor UX tweaks based on feedbackStan Hu2019-08-053-12/+12
| * | | | Fix spec for inviting membersStan Hu2019-08-051-0/+2
| * | | | Show total member countStan Hu2019-08-051-5/+13
| * | | | Add tabs to switch between current/invited membersStan Hu2019-08-051-41/+46
| * | | | Make it easier to find invited group membersStan Hu2019-08-058-5/+90
* | | | | Merge branch '13330-gdk-error-on-non-unique-graphql-fragment-pageinfo' into '...Kushal Pandya2019-08-122-5/+6
|\ \ \ \ \
| * | | | | Resolve "GDK error on non-unique GraphQL fragment 'PageInfo'"Natalia Tepluhina2019-08-122-5/+6
|/ / / / /
* | | | | Merge branch 'fe-fix-diffs-specs-leaking-store' into 'master'Kushal Pandya2019-08-1213-25/+29
|\ \ \ \ \
| * | | | | CE - FE fix diffs specs leaking storefe-fix-diffs-specs-leaking-storePaul Slaughter2019-08-1113-25/+29
* | | | | | Merge branch 'docs-rename-tfs' into 'master'Achilleas Pipinellis2019-08-123-42/+51
|\ \ \ \ \ \
| * | | | | | Rename tfs.md to tfvc.md and updateMarcel Amirault2019-08-123-42/+51
|/ / / / / /
* | | | | | Merge branch 'patch-72' into 'master'Evan Read2019-08-121-1/+1
|\ \ \ \ \ \
| * | | | | | Fix typo when enumerating GOSEC levelsTomKriek2019-07-251-1/+1
* | | | | | | Merge branch 'docs/disqus-identifier' into 'master'Evan Read2019-08-127-8/+8
|\ \ \ \ \ \ \
| * | | | | | | Replace redirect_from with disqus_identifier in docsdocs/disqus-identifierAchilleas Pipinellis2019-08-087-8/+8
* | | | | | | | Merge branch '59590-keyboard-shortcut-for-jump-to-next-unresolved-discussion'...Paul Slaughter2019-08-1211-11/+223
|\ \ \ \ \ \ \ \
| * | | | | | | | Add kbd shortcuts for discussion navigationSam Bigelow2019-08-1211-11/+223
|/ / / / / / / /
* | | | | | | | Merge branch 'qa-unquarantine-diff-patch-test' into 'master'Ramya Authappan2019-08-121-2/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Remove test from quarantineqa-unquarantine-diff-patch-testMark Lapierre2019-08-121-2/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'docs-chatops-version' into 'master'Evan Read2019-08-121-5/+5
|\ \ \ \ \ \ \
| * | | | | | | Fix introduced section in chatops docMarcel Amirault2019-08-121-5/+5
|/ / / / / / /
* | | | | | | Merge branch 'docs-mdl-rules-update-2' into 'master'Evan Read2019-08-1218-250/+186
|\ \ \ \ \ \ \
| * | | | | | | Add more rules to markdown lint checkMarcel Amirault2019-08-1218-250/+186
|/ / / / / / /
* | | | | | | Merge branch 'bump-nokogiri-1.10.4' into 'master'Stan Hu2019-08-124-7/+7
|\ \ \ \ \ \ \
| * | | | | | | Bump nokogiri to 1.10.4bump-nokogiri-1.10.4Thong Kuah2019-08-124-7/+7
| |/ / / / / /
* | | | | | | Merge branch 'valexieva-subgroups-CA' into 'master'Evan Read2019-08-121-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | adding subgroups to docsVirjinia Alexieva2019-08-121-1/+2
|/ / / / / /
* | | | | | Merge branch '13439-fix-broken-karma-test-on-ee-side' into 'master'Paul Slaughter2019-08-112-5/+13
|\ \ \ \ \ \
View Lorry Controller Status