summaryrefslogtreecommitdiff
path: root/app/models/concerns
Commit message (Expand)AuthorAgeFilesLines
* Autofixed some untranslated stringsi18n-copLuke Bennett2019-01-317-11/+11
* Merge branch '26375-markdown-footnotes-not-working' into 'master'Lin Jen-Shin2019-01-171-1/+1
|\
| * Bumping the CACHE_COMMONMARK_VERSION26375-markdown-footnotes-not-workingBrett Walker2019-01-171-1/+1
* | Fix deprecation: Passing an argument to force an association to reload is now...Jasper Maes2019-01-111-2/+2
|/
* Merge branch 'ccr/49289_milestone_link' into 'master'Mike Greiling2019-01-021-1/+1
|\
| * Add project milestone link to dashboard milestonesccr/49289_milestone_linkFatih Acet2018-12-201-1/+1
* | Merge branch 'security-master-secret-ci-variables-exposed' into 'master'John Jarvis2019-01-021-0/+17
|\ \
| * | Make HasRef#git_ref publicMatija Čupić2018-12-081-4/+0
| * | Use full ref when possible to avoid ambiguityMatija Čupić2018-12-081-0/+21
* | | Fixing image lfs bug and also displaying text lfsFrancisco Javier López2018-12-271-1/+1
* | | Merge branch 'osw-cache-discussions-diff-highlighting' into 'master'Douwe Maan2018-12-272-1/+23
|\ \ \
| * | | Cache diff highlight in discussionsOswaldo Ferreira2018-12-212-1/+23
* | | | Merge remote-tracking branch 'upstream/master' into 54953-error-500-viewing-m...Lin Jen-Shin2018-12-263-1/+24
|\ \ \ \ | |/ / /
| * | | Merge branch 'dm-note-email-image-diff-discussion' into 'master'Sean McGivern2018-12-211-0/+1
| |\ \ \
| | * | | Allow truncated_diff_lines to be called on image diff discussionDouwe Maan2018-12-201-0/+1
| | | |/ | | |/|
| * | | Merge branch 'ce-8333-add-related-epics-support' into 'master'Dmitriy Zaporozhets2018-12-201-0/+11
| |\ \ \ | | |/ / | |/| |
| | * | Rename GroupHierarchy into ObjectHierarchyJarka Košanová2018-12-191-0/+11
| * | | Cache avatar URLs and paths within a requestStan Hu2018-12-191-1/+12
| |/ /
* | | Move schema aware defaults to build_from_defaultsLin Jen-Shin2018-12-191-1/+6
|/ /
* | Remove rails4 specific codeJasper Maes2018-12-162-7/+2
* | Allow suggesting single line changes in diffsOswaldo Ferreira2018-12-131-0/+4
* | Merge branch 'sh-remove-gitlab-shell-include' into 'master'Rémy Coutable2018-12-101-0/+2
|\ \ | |/ |/|
| * Remove unnecessary includes of ShellAdapterStan Hu2018-12-051-0/+2
* | Backports changes made to One notification per code reviewTiago Botelho2018-12-071-2/+3
* | Fixed before_destroy callbackJan Provaznik2018-12-061-1/+1
* | Allow pass additional options to use_fast_destroyJan Provaznik2018-12-062-8/+4
* | Enabled feature flag for fast deletionsJan Provaznik2018-12-061-1/+34
* | Use FastDestroy for deleting uploadsJan Provaznik2018-12-062-11/+4
* | Sort issues and merge requests in ascending and descending orderFatih Acet2018-12-062-17/+24
|/
* Merge branch '34758-deployment-cluster' into 'master'Kamil Trzciński2018-12-051-0/+13
|\
| * Unify into :group_clusters feature flagThong Kuah2018-12-051-1/+1
| * Various improvements to hierarchy sortingThong Kuah2018-12-051-2/+2
| * Deploy to clusters for a project's groupsThong Kuah2018-12-051-0/+13
* | Add custom validation message for chronic duration attributeGrzegorz Bizon2018-12-051-1/+1
|/
* Merge branch 'fix/gb/encrypt-runners-tokens' into 'master'Nick Thomas2018-12-043-15/+145
|\
| * Fix typo in encrypted token authenticatable strategyGrzegorz Bizon2018-12-041-1/+1
| * Merge commit '83f0798e7dc588f0e4cb6816daadeef7dbfc8b81' into fix/gb/encrypt-r...Grzegorz Bizon2018-12-041-0/+18
| |\
| * | Fix token_set? method by checking migration statusGrzegorz Bizon2018-12-041-1/+4
| * | Use plaintext token when migration is not completeGrzegorz Bizon2018-12-031-4/+6
| * | Refactor encrypted token strategy classGrzegorz Bizon2018-12-031-26/+31
| * | Fix token encrypted strategy when migrating dataGrzegorz Bizon2018-12-031-1/+7
| * | Implement migration strategy for token authenticatableGrzegorz Bizon2018-12-032-4/+25
| * | Merge commit '6852680584a1b22788f451457a6042eabf862a73' into fix/gb/encrypt-r...Grzegorz Bizon2018-11-291-1/+1
| |\ \
| * \ \ Merge branch 'master' into fix/gb/encrypt-runners-tokensGrzegorz Bizon2018-11-283-15/+34
| |\ \ \
| * | | | Expire application settings after encrypting tokensGrzegorz Bizon2018-11-281-0/+3
| * | | | Fix resetting old token when fallback strategy is providedGrzegorz Bizon2018-11-271-1/+1
| * | | | Improve token authenticable tests and exceptionsGrzegorz Bizon2018-11-272-5/+5
| * | | | Improve test cases description in token-related specsGrzegorz Bizon2018-11-231-5/+3
| * | | | Only allow valid options when configuring tokensGrzegorz Bizon2018-11-231-0/+4
| * | | | Improve token strategy fallback and add more specsGrzegorz Bizon2018-11-231-0/+4
View Lorry Controller Status