Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | redirect to keys index instead of user index after a key is deletedjouve/gitlab-ce-admin_keys | Cyril Jouve | 2017-06-01 | 2 | -2/+7 |
* | Merge branch 'dm-comment-on-mr-commit-discussion' into 'master' | Grzegorz Bizon | 2017-06-01 | 4 | -2/+51 |
|\ | |||||
| * | Fix replying to a commit discussion displayed in the context of an MR | Douwe Maan | 2017-06-01 | 4 | -2/+51 |
* | | Merge branch 'dm-fix-jump-button' into 'master' | Fatih Acet | 2017-06-01 | 3 | -2/+13 |
|\ \ | |||||
| * | | Fix title of discussion jump button at top of pagedm-fix-jump-button | Douwe Maan | 2017-05-26 | 3 | -2/+13 |
* | | | Merge branch 'migrate-old-artifacts' into 'master' | Grzegorz Bizon | 2017-06-01 | 14 | -81/+323 |
|\ \ \ | |||||
| * | | | Add missing specs | Kamil Trzcinski | 2017-06-01 | 14 | -57/+132 |
| * | | | Fix data inconsistency issue for old artifacts by moving them to a currently ... | Kamil Trzcinski | 2017-06-01 | 14 | -58/+225 |
| | |/ | |/| | |||||
* | | | Merge branch '31644-make-cookie-sessions-unique' into 'master' | Douwe Maan | 2017-06-01 | 2 | -1/+11 |
|\ \ \ | |||||
| * | | | Update session cookie key name to be unique to instance in development31644-make-cookie-sessions-unique | Eric Eastwood | 2017-06-01 | 2 | -1/+11 |
* | | | | Merge branch 'dm-update-discussion-diff-position' into 'master' | Grzegorz Bizon | 2017-06-01 | 8 | -93/+87 |
|\ \ \ \ | |||||
| * | | | | Update diff discussion position per discussion instead of per notedm-update-discussion-diff-position | Douwe Maan | 2017-05-31 | 8 | -93/+87 |
* | | | | | Merge branch 'bugfix/deploy_keys__can_push__usage_in_api' into 'master' | Rémy Coutable | 2017-06-01 | 3 | -0/+14 |
|\ \ \ \ \ | |||||
| * | | | | | Extend spec tests for deploy_key can_push | Richard Clamp | 2017-05-23 | 1 | -0/+9 |
| * | | | | | Add changelog entry | Richard Clamp | 2017-05-22 | 1 | -0/+4 |
| * | | | | | Add missing `can_push` parameter to POST /v3/deploy_keys | Richard Clamp | 2017-05-22 | 1 | -0/+1 |
* | | | | | | Merge branch 'document-not-using-serialize' into 'master' | Douwe Maan | 2017-06-01 | 20 | -27/+170 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Added Cop to blacklist the use of serializedocument-not-using-serialize | Yorick Peterse | 2017-05-31 | 18 | -27/+85 |
| * | | | | | Document not storing serialized data | Yorick Peterse | 2017-05-31 | 2 | -0/+85 |
* | | | | | | Merge branch 'fix-n-plus-one-queries-for-user-access' into 'master' | Yorick Peterse | 2017-06-01 | 3 | -54/+110 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix N+1 queries for non-members in comment threadsfix-n-plus-one-queries-for-user-access | Sean McGivern | 2017-06-01 | 3 | -54/+110 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'zj-drop-fk-if-exists' into 'master' | Yorick Peterse | 2017-06-01 | 2 | -1/+15 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Only remove FK if it existszj-drop-fk-if-exists | Z.J. van de Weg | 2017-06-01 | 2 | -1/+15 |
* | | | | | | | Merge branch '31602-display-whether-shared-runner-is-enabled-in-the-admin-das... | Rémy Coutable | 2017-06-01 | 2 | -0/+10 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Display Shared Runner status in Admin Dashboard | vanadium23 | 2017-05-31 | 2 | -0/+10 |
* | | | | | | | | Merge branch 'fix_diff_line_comments' into 'master' | Sean McGivern | 2017-06-01 | 5 | -3/+39 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix rubocop in spec/helpers/diff_helper_spec.rb | Valery Sizov | 2017-06-01 | 1 | -6/+7 |
| * | | | | | | | | update changelogfix_diff_line_comments | Valery Sizov | 2017-05-31 | 1 | -0/+5 |
| * | | | | | | | | Fix: A diff comment on a change at last line of a file shows as two comments ... | Valery Sizov | 2017-05-31 | 4 | -3/+33 |
* | | | | | | | | | Merge branch '33142-pipeline-schedule-documentation-fix' into 'master' | Grzegorz Bizon | 2017-06-01 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix pipeline schedule value name in documentation | Andre Ippisch | 2017-06-01 | 1 | -1/+1 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'notebook-katex-fixes' into 'master' | Filipa Lacerda | 2017-06-01 | 4 | -8/+81 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | added testsnotebook-katex-fixes | Phil Hughes | 2017-05-30 | 3 | -1/+64 |
| * | | | | | | | | | fixed inline math | Phil Hughes | 2017-05-30 | 1 | -1/+2 |
| * | | | | | | | | | fixed spacing before inline math | Phil Hughes | 2017-05-30 | 1 | -1/+2 |
| * | | | | | | | | | fixed spacing because of removed & | Phil Hughes | 2017-05-30 | 1 | -1/+2 |
| * | | | | | | | | | fixed & being rendered | Phil Hughes | 2017-05-30 | 1 | -3/+2 |
| * | | | | | | | | | Fixes multi-line math in notebooks | Phil Hughes | 2017-05-30 | 1 | -7/+15 |
* | | | | | | | | | | Merge branch 'dm-collapsed-blob' into 'master' | Sean McGivern | 2017-06-01 | 32 | -199/+161 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Change no_limits to limitsdm-collapsed-blob | Douwe Maan | 2017-05-31 | 7 | -20/+20 |
| * | | | | | | | | | | Fix Diff#too_large? and specs | Douwe Maan | 2017-05-30 | 4 | -53/+25 |
| * | | | | | | | | | | Fix Diff#to_hash and #init_from_hash | Douwe Maan | 2017-05-30 | 1 | -0/+3 |
| * | | | | | | | | | | Consistent diff and blob size limit names | Douwe Maan | 2017-05-29 | 32 | -166/+153 |
* | | | | | | | | | | | Merge branch 'dm-emails-are-not-user-references' into 'master' | Sean McGivern | 2017-06-01 | 3 | -0/+10 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Don't match email addresses or foo@bar as user referencesdm-emails-are-not-user-references | Douwe Maan | 2017-05-31 | 3 | -0/+10 |
* | | | | | | | | | | | | Merge branch 'dm-discussions-n-plus-1' into 'master' | Sean McGivern | 2017-06-01 | 6 | -3/+28 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Move includes call to scopedm-discussions-n-plus-1 | Douwe Maan | 2017-05-31 | 2 | -2/+2 |
| * | | | | | | | | | | | Do not try to preload Commits when using Note.includes(:noteable) | Douwe Maan | 2017-05-31 | 2 | -0/+15 |
| * | | | | | | | | | | | Resolve N+1 query issue with discussions | Douwe Maan | 2017-05-29 | 3 | -2/+12 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'patch-23' into 'master' | Sid Sijbrandij | 2017-05-31 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ |