summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use the new Gitaly CommitDiff RPCfix/use-new-gitaly-commit-diff-rpcAhmad Sherif2017-06-0210-24/+166
|
* Merge branch 'zj-drop-fk-if-exists' into 'master'Yorick Peterse2017-06-012-1/+15
|\ | | | | | | | | Only remove FK if it exists See merge request !11828
| * Only remove FK if it existszj-drop-fk-if-existsZ.J. van de Weg2017-06-012-1/+15
| |
* | Merge branch ↵Rémy Coutable2017-06-012-0/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '31602-display-whether-shared-runner-is-enabled-in-the-admin-dashboard' into 'master' Display Shared Runner status in Admin Dashboard Closes #31602 See merge request !11783
| * | 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: A diff comment on a change at last line of a file shows as two comments in discussion Closes #32353 See merge request !11802
| * | | 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
| | | | | | | | | | | | | | | | in discussion
* | | | Merge branch '33142-pipeline-schedule-documentation-fix' into 'master'Grzegorz Bizon2017-06-011-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix pipeline schedule value name in documentation, fixes #33142 Closes #33142 See merge request !11840
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes multi-line math in notebooks Closes #30900 and #33074 See merge request !11789
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | Closes #30900
* | | | | | Merge branch 'dm-collapsed-blob' into 'master'Sean McGivern2017-06-0132-199/+161
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consistent diff and blob size limit names See merge request !11776
| * | | | | | 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 references See merge request !11837
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve N+1 query issue with discussions Closes #33013 See merge request !11775
| * | | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add GitLab Resources to University See merge request !11832
| * | | | | | | Add GitLab Resources to UniversityTim Anglade2017-05-311-0/+1
| | | | | | | |
* | | | | | | | Merge branch 'trigger-source' into 'master'Grzegorz Bizon2017-05-3130-35/+116
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce source to pipeline entity See merge request !11682
| * \ \ \ \ \ \ \ Merge branch 'master' into 'trigger-source'Grzegorz Bizon2017-05-31182-851/+3528
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | | | | | | Introduce source to pipeline entitytrigger-sourceKamil Trzcinski2017-05-3130-35/+116
| | | | | | | | | |
* | | | | | | | | | Revert "Update GITLAB_SHELL_VERSION"Alejandro Rodríguez2017-05-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0d55def4d3cf8f976fe09a05301afce828b95a96.
* | | | | | | | | | Update GITLAB_SHELL_VERSIONAlejandro Rodríguez2017-05-311-1/+1
| |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change continues with the plan to change the parameters passed around GitLab components to allow for independence of mount points. See https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/130#note_28747613
* | | | | | | | | Merge branch 'feature-flags-flipper' into 'master'Dmitriy Zaporozhets2017-05-3117-5/+483
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Add feature toggles through Flipper See merge request !11747
| * | | | | | | | Add feature toggles through FlipperAlejandro Rodríguez2017-05-3117-5/+483
|/ / / / / / / /
* | | | | | | | Merge branch 'dm-gitmodules-parsing' into 'master'Grzegorz Bizon2017-05-313-17/+47
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make .gitmodules parsing more resilient to syntax errors Closes #26009 See merge request !11803
| * | | | | | | Remove entry variabledm-gitmodules-parsingDouwe Maan2017-05-311-10/+9
| | | | | | | |
| * | | | | | | Make .gitmodules parsing more resilient to syntax errorsDouwe Maan2017-05-303-16/+47
| | | | | | | |
* | | | | | | | Merge branch 'rename-builds-controller' into 'master'Kamil Trzciński2017-05-3169-337/+637
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename BuildsController to JobsController Closes #30699 See merge request !11407
| * | | | | | | Rename the other jobsrename-builds-controllerLin Jen-Shin2017-05-311-8/+8
| | | | | | | |
| * | | | | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-3147-125/+1011
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (63 commits) Update docs related to protected actions Add changelog for protected branches abilities fix Ask for an example project for bug reports Center loading spinner in issuable filters Fix chat commands specs related to protected actions Fix builds controller specs related to protected actions Fix pipeline retry specs related to protected actions Fix environment model specs related to protected actions Fix build factory specs related to protected actions Fix job play service specs related to protected actions Fix play status specs related to protected actions Fix deploy chat command specs for protected actions Fix environment specs related to protected actions Fix pipeline processing specs related to protected actions Fix build entity specs related to protected actions Check only a merge ability for protected actions Add tag_list param to project api Allow PostReceivePack to be enabled with Gitaly Remove some deprecated methods Add :owned param to ProjectFinder ...
| * | | | | | | | Update jobs_spec for changes from builds_specLin Jen-Shin2017-05-312-496/+18
| | | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-31315-1972/+4730
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (116 commits) Revert "Merge branch 'grpc-1.3.4' into 'master'" Return nil when looking up config for unknown LDAP provider Avoid crash when trying to parse string with invalid UTF-8 sequence Enable Gitaly by default in GitLab 9.3 Don’t create comment on JIRA if link already exists Disable sub_group_issuables_spec.rb for mysql Fix math rendering on blob pages Add changelog Don't allow to pass a user to ProjectWiki#http_url_to_repo Revert "Merge branch '1937-https-clone-url-username' into 'master' " Fix bottom padding for build page Fix /unsubscribe slash command creating extra todos Fix omniauth-google-oauth2 dependencies in Gemfile.lock Update looks job log 'New issue'/'New merge request' dropdowns should show only projects with issues/merge requests feature enabled Fix spec for Members::AuthorizedDestroyService 31616-add-uptime-of-gitlab-instance-in-admin-area Set head pipeline when creating merge requests Create a separate helper to check if we show particular tab on a search page Add performance deltas between app deployments on Merge Request widget ...
| * | | | | | | | | Use another scope to add the - prefix, feedback:Lin Jen-Shin2017-05-311-25/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11407#note_30922591
| * | | | | | | | | Update changelog to reflect the new schemeLin Jen-Shin2017-05-271-1/+1
| | | | | | | | | |
| * | | | | | | | | Should escape the routes because we added -Lin Jen-Shin2017-05-271-1/+1
| | | | | | | | | |
| * | | | | | | | | Use - as the prefix so we don't conflict with namespacesLin Jen-Shin2017-05-2611-26/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The decision was made around: https://gitlab.com/gitlab-org/gitlab-ce/issues/26407#note_30624641
View Lorry Controller Status