Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix data inconsistency issue for old artifacts by moving them to a currently ... | Kamil Trzcinski | 2017-06-01 | 14 | -58/+225 |
* | 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 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add GitLab Resources to University | Tim Anglade | 2017-05-31 | 1 | -0/+1 |
* | | | | | | | | | Merge branch 'trigger-source' into 'master' | Grzegorz Bizon | 2017-05-31 | 30 | -35/+116 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into 'trigger-source' | Grzegorz Bizon | 2017-05-31 | 182 | -851/+3528 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Introduce source to pipeline entitytrigger-source | Kamil Trzcinski | 2017-05-31 | 30 | -35/+116 |
* | | | | | | | | | | | Revert "Update GITLAB_SHELL_VERSION" | Alejandro Rodríguez | 2017-05-31 | 1 | -1/+1 |
* | | | | | | | | | | | Update GITLAB_SHELL_VERSION | Alejandro Rodríguez | 2017-05-31 | 1 | -1/+1 |
| |/ / / / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'feature-flags-flipper' into 'master' | Dmitriy Zaporozhets | 2017-05-31 | 17 | -5/+483 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Add feature toggles through Flipper | Alejandro Rodríguez | 2017-05-31 | 17 | -5/+483 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge branch 'dm-gitmodules-parsing' into 'master' | Grzegorz Bizon | 2017-05-31 | 3 | -17/+47 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | |||||
| * | | | | | | | | Remove entry variabledm-gitmodules-parsing | Douwe Maan | 2017-05-31 | 1 | -10/+9 |
| * | | | | | | | | Make .gitmodules parsing more resilient to syntax errors | Douwe Maan | 2017-05-30 | 3 | -16/+47 |
* | | | | | | | | | Merge branch 'rename-builds-controller' into 'master' | Kamil Trzciński | 2017-05-31 | 69 | -337/+637 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Rename the other jobsrename-builds-controller | Lin Jen-Shin | 2017-05-31 | 1 | -8/+8 |
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controller | Lin Jen-Shin | 2017-05-31 | 47 | -125/+1011 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Update jobs_spec for changes from builds_spec | Lin Jen-Shin | 2017-05-31 | 2 | -496/+18 |
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controller | Lin Jen-Shin | 2017-05-31 | 315 | -1972/+4730 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| * | | | | | | | | | Use another scope to add the - prefix, feedback: | Lin Jen-Shin | 2017-05-31 | 1 | -25/+27 |
| * | | | | | | | | | Update changelog to reflect the new scheme | Lin Jen-Shin | 2017-05-27 | 1 | -1/+1 |