summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Move the personal snippet uploads from `system` to `-/system`bvl-rollback-renamed-system-namespaceBob Van Landuyt2017-08-114-4/+184
* Make sure uploads for personal snippets are correctly renderedBob Van Landuyt2017-08-118-22/+22
* Update migrations to move directly into the `-/system` folderBob Van Landuyt2017-08-1111-8/+146
* Don't update upload paths twiceBob Van Landuyt2017-08-112-110/+0
* Don't rename the system namespaceBob Van Landuyt2017-08-113-485/+4
* Merge branch 'dm-session-delete-challenge' into 'master'Robert Speicher2017-08-111-1/+1
|\
| * Delete correct key from `session` after authenticating using U2Fdm-session-delete-challengeDouwe Maan2017-08-111-1/+1
* | Merge branch 'split-events-into-push-events' into 'master'Sean McGivern2017-08-1151-173/+2042
|\ \
| * | Use a specialized class for querying eventsYorick Peterse2017-08-1012-17/+241
| * | Migrate events into a new formatYorick Peterse2017-08-1041-157/+1802
* | | Merge branch 'appearances-caching-and-schema' into 'master'Sean McGivern2017-08-117-6/+98
|\ \ \
| * | | Cache Appearance instances in Redisappearances-caching-and-schemaYorick Peterse2017-08-107-6/+98
* | | | Merge branch '36174-show-error-message-for-500-in-tests' into 'master'Rémy Coutable2017-08-112-1/+18
|\ \ \ \
| * | | | Show error message for API 500 error in tests, andLin Jen-Shin2017-08-112-1/+18
* | | | | Merge branch '35131-do-not-run-ee_compat_check-for-stableish-branches' into '...Rémy Coutable2017-08-111-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Do not run the `ee_compat_check` job for stableish branches35131-do-not-run-ee_compat_check-for-stableish-branchesRémy Coutable2017-08-111-1/+1
| | |_|/ | |/| |
* | | | Merge branch '36328-deserializemergerequestdiffsandcommits-fails-due-to-null-...Yorick Peterse2017-08-112-0/+13
|\ \ \ \
| * | | | Fix merge request diff deserialisation when too_large was absentSean McGivern2017-08-112-0/+13
| |/ / /
* | | | Merge branch 'rs-rspec-hook-argument-cop' into 'master'Rémy Coutable2017-08-1159-92/+85
|\ \ \ \
| * | | | Remove documentation about rules that are now enforced by RuboCoprs-rspec-hook-argument-copRobert Speicher2017-08-101-6/+0
| * | | | Enable the RSpec/HookArgument cop and auto-correct offensesRobert Speicher2017-08-1058-86/+85
* | | | | Merge branch 'fix-36308' into 'master'Rémy Coutable2017-08-111-5/+4
|\ \ \ \ \
| * | | | | Remove an unnecessary `let` in spec/features/projects/user_edits_files_spec.rbMehdi Lahmam2017-08-111-5/+4
* | | | | | Merge branch 'bump-omniauth-ldap-gem-version-2-0-4' into 'master'Douwe Maan2017-08-113-3/+7
|\ \ \ \ \ \
| * | | | | | Bumps omniauth-ldap gem version to 2.0.4bump-omniauth-ldap-gem-version-2-0-4Tiago Botelho2017-08-113-3/+7
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'zj-ref-path-monospace' into 'master'Douwe Maan2017-08-112-1/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix 404 on link pathzj-ref-path-monospaceZ.J. van de Weg2017-08-102-1/+5
* | | | | | Merge branch 'master' into 'master'Rémy Coutable2017-08-111-1/+1
|\ \ \ \ \ \
| * | | | | | Update gitlab.po: Missing 'r' in "Fouché" that comes from "Fourcher" verb.Olivier DOSSMANN2017-08-111-1/+1
* | | | | | | Merge branch 'gitlab-git-expose-raw-log' into 'master'Sean McGivern2017-08-111-16/+17
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Expose the raw_log methodgitlab-git-expose-raw-logJacob Vosmaer2017-08-091-16/+17
* | | | | | | Merge branch '36270-collapsed-sidebar-scroll' into 'master'Phil Hughes2017-08-111-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Hide overflow-x on collapsed sidebar36270-collapsed-sidebar-scrollAnnabel Dunstone Gray2017-08-101-0/+1
* | | | | | | | Merge branch 'fix-typos' into 'master'36327-tooltipRémy Coutable2017-08-113-4/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix minor typos in viewsMehdi Lahmam2017-08-113-4/+4
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'docs-update-docs' into 'master'Achilleas Pipinellis2017-08-112-59/+33
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Docs: update user docs indexMarcia Ramos2017-08-112-59/+33
|/ / / / / / /
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceJose Ivan Vargas2017-08-10170-696/+1246
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '36192-change-ha-docs-to-update-using-efs-as-nfs' into 'master'Stan Hu2017-08-101-0/+4
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Update nfs.md with information on AWS EFS and Burst Credit usage and how to i...36192-change-ha-docs-to-update-using-efs-as-nfsJohn Woods2017-08-081-0/+4
| * | | | | | | Fix Layout/SpaceBeforeBlockBraces violation in bin/changelog_specRobert Speicher2017-08-101-1/+1
| * | | | | | | Merge branch 'jej/security-release-2017-08-10' into 'master'Stan Hu2017-08-106-1/+61
| |\ \ \ \ \ \ \
| | * | | | | | | Merge branch 'rs-alphanumeric-ssh-params' into 'security-9-4'jej/security-release-2017-08-10James Edwards-Jones2017-08-103-0/+47
| | * | | | | | | Merge branch 'import-symlinks-9-3' into 'security-9-3'James Edwards-Jones2017-08-103-1/+14
| * | | | | | | | Merge branch 'filter-nginx-access-logs' into 'master'Robert Speicher2017-08-102-3/+71
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Filter sensitive query string parameters from NGINX access logsNick Thomas2017-08-102-3/+71
| | |/ / / / / / /
| * | | | | | | | Merge branch '21949-add-type-to-changelog' into 'master'Robert Speicher2017-08-104-75/+215
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Let's start labeling our CHANGELOG entriesJacopo2017-07-224-75/+215
| * | | | | | | | | Merge branch 'rc/improve-projects-factory' into 'master'Robert Speicher2017-08-106-196/+130
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix and improve spec/controllers/autocomplete_controller_spec.rbrc/improve-projects-factoryRémy Coutable2017-08-101-77/+56
View Lorry Controller Status