summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* redirect to keys index instead of user index after a key is deletedjouve/gitlab-ce-admin_keysCyril Jouve2017-06-012-2/+7
* Merge branch 'dm-comment-on-mr-commit-discussion' into 'master'Grzegorz Bizon2017-06-014-2/+51
|\
| * Fix replying to a commit discussion displayed in the context of an MRDouwe Maan2017-06-014-2/+51
* | Merge branch 'dm-fix-jump-button' into 'master'Fatih Acet2017-06-013-2/+13
|\ \
| * | Fix title of discussion jump button at top of pagedm-fix-jump-buttonDouwe Maan2017-05-263-2/+13
* | | Merge branch 'migrate-old-artifacts' into 'master'Grzegorz Bizon2017-06-0114-81/+323
|\ \ \
| * | | Add missing specsKamil Trzcinski2017-06-0114-57/+132
| * | | Fix data inconsistency issue for old artifacts by moving them to a currently ...Kamil Trzcinski2017-06-0114-58/+225
| | |/ | |/|
* | | Merge branch '31644-make-cookie-sessions-unique' into 'master'Douwe Maan2017-06-012-1/+11
|\ \ \
| * | | Update session cookie key name to be unique to instance in development31644-make-cookie-sessions-uniqueEric Eastwood2017-06-012-1/+11
* | | | Merge branch 'dm-update-discussion-diff-position' into 'master'Grzegorz Bizon2017-06-018-93/+87
|\ \ \ \
| * | | | Update diff discussion position per discussion instead of per notedm-update-discussion-diff-positionDouwe Maan2017-05-318-93/+87
* | | | | Merge branch 'bugfix/deploy_keys__can_push__usage_in_api' into 'master'Rémy Coutable2017-06-013-0/+14
|\ \ \ \ \
| * | | | | Extend spec tests for deploy_key can_pushRichard Clamp2017-05-231-0/+9
| * | | | | Add changelog entryRichard Clamp2017-05-221-0/+4
| * | | | | Add missing `can_push` parameter to POST /v3/deploy_keysRichard Clamp2017-05-221-0/+1
* | | | | | Merge branch 'document-not-using-serialize' into 'master'Douwe Maan2017-06-0120-27/+170
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Added Cop to blacklist the use of serializedocument-not-using-serializeYorick Peterse2017-05-3118-27/+85
| * | | | | Document not storing serialized dataYorick Peterse2017-05-312-0/+85
* | | | | | Merge branch 'fix-n-plus-one-queries-for-user-access' into 'master'Yorick Peterse2017-06-013-54/+110
|\ \ \ \ \ \
| * | | | | | Fix N+1 queries for non-members in comment threadsfix-n-plus-one-queries-for-user-accessSean McGivern2017-06-013-54/+110
| |/ / / / /
* | | | | | Merge branch 'zj-drop-fk-if-exists' into 'master'Yorick Peterse2017-06-012-1/+15
|\ \ \ \ \ \
| * | | | | | Only remove FK if it existszj-drop-fk-if-existsZ.J. van de Weg2017-06-012-1/+15
* | | | | | | Merge branch '31602-display-whether-shared-runner-is-enabled-in-the-admin-das...Rémy Coutable2017-06-012-0/+10
|\ \ \ \ \ \ \
| * | | | | | | Display Shared Runner status in Admin Dashboardvanadium232017-05-312-0/+10
* | | | | | | | Merge branch 'fix_diff_line_comments' into 'master'Sean McGivern2017-06-015-3/+39
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix rubocop in spec/helpers/diff_helper_spec.rbValery Sizov2017-06-011-6/+7
| * | | | | | | | update changelogfix_diff_line_commentsValery Sizov2017-05-311-0/+5
| * | | | | | | | Fix: A diff comment on a change at last line of a file shows as two comments ...Valery Sizov2017-05-314-3/+33
* | | | | | | | | Merge branch '33142-pipeline-schedule-documentation-fix' into 'master'Grzegorz Bizon2017-06-011-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix pipeline schedule value name in documentationAndre Ippisch2017-06-011-1/+1
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'notebook-katex-fixes' into 'master'Filipa Lacerda2017-06-014-8/+81
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | added testsnotebook-katex-fixesPhil Hughes2017-05-303-1/+64
| * | | | | | | | | fixed inline mathPhil Hughes2017-05-301-1/+2
| * | | | | | | | | fixed spacing before inline mathPhil Hughes2017-05-301-1/+2
| * | | | | | | | | fixed spacing because of removed &Phil Hughes2017-05-301-1/+2
| * | | | | | | | | fixed & being renderedPhil Hughes2017-05-301-3/+2
| * | | | | | | | | Fixes multi-line math in notebooksPhil Hughes2017-05-301-7/+15
* | | | | | | | | | Merge branch 'dm-collapsed-blob' into 'master'Sean McGivern2017-06-0132-199/+161
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Change no_limits to limitsdm-collapsed-blobDouwe Maan2017-05-317-20/+20
| * | | | | | | | | | Fix Diff#too_large? and specsDouwe Maan2017-05-304-53/+25
| * | | | | | | | | | Fix Diff#to_hash and #init_from_hashDouwe Maan2017-05-301-0/+3
| * | | | | | | | | | Consistent diff and blob size limit namesDouwe Maan2017-05-2932-166/+153
* | | | | | | | | | | Merge branch 'dm-emails-are-not-user-references' into 'master'Sean McGivern2017-06-013-0/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Don't match email addresses or foo@bar as user referencesdm-emails-are-not-user-referencesDouwe Maan2017-05-313-0/+10
* | | | | | | | | | | | Merge branch 'dm-discussions-n-plus-1' into 'master'Sean McGivern2017-06-016-3/+28
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Move includes call to scopedm-discussions-n-plus-1Douwe Maan2017-05-312-2/+2
| * | | | | | | | | | | Do not try to preload Commits when using Note.includes(:noteable)Douwe Maan2017-05-312-0/+15
| * | | | | | | | | | | Resolve N+1 query issue with discussionsDouwe Maan2017-05-293-2/+12
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'patch-23' into 'master'Sid Sijbrandij2017-05-311-0/+1
|\ \ \ \ \ \ \ \ \ \ \